TiledInputFile only supports regular TILEDIMAGE types, not DEEPTILE o…

…r unknown tiled types. Enforce for both InputFile and InputPart API. Fixes #266, Related to #70
AcademySoftwareFoundation · Jul 16, 2019 · ece5552 · ece5552
1 parent 849c616
commit ece5552
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/OpenEXR/IlmImf/ImfInputFile.cpp b/OpenEXR/IlmImf/ImfInputFile.cpp
@@ -530,7 +530,7 @@ InputFile::initialize ()
             _data->compositor->addSource(_data->dsFile);
         }
 
-        else if (isTiled (_data->version))
+        else if (isTiled (_data->version) && !isNonImage(_data->version)) 
         {
             _data->isTiled = true;
             _data->lineOrder = _data->header.lineOrder();
@@ -573,7 +573,7 @@ InputFile::initialize ()
             _data->compositor = new CompositeDeepScanLine;
             _data->compositor->addSource(_data->dsFile);
         }
-        else if (isTiled (_data->header.type()))
+        else if (_data->header.hasType() && _data->header.type()==TILEDIMAGE)
         {
             _data->isTiled = true;
             _data->lineOrder = _data->header.lineOrder();