Feature/1187 Read EXR files from memory

testing/data/DATA_LICENSES.md

@@ -54,6 +54,7 @@
 - 16bits.*: @bisechen: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
 - (ノಠ益ಠ )ノ.vtp: VTK Data: BSD-3-Clause
 - Rec709.exr: [Copyright 2006 Industrial Light & Magic](https://github.com/AcademySoftwareFoundation/openexr/blob/370db2835843ac75f85e1386c05455f26a6ff58c/website/test_images/Chromaticities/Rec709.rst): BSD-3-Clause
+- small.usdz: Copyright USD contributors: CC-BY 4.0
 
 All other datasets are licensed under the BSD-3-Clause F3D license.
 

vtkext/private/module/vtkF3DEXRReader.cxx

@@ -25,7 +25,6 @@
     : Imf::IStream(name)
     , buffer(static_cast<const char*>(buff))
     , bufflen(static_cast<size_t>(bufferLen))
-    , pos(0)
   {
   }
 
@@ -37,16 +36,16 @@
       pos += n;
       return true;
     }
     return false;
   }
 
   /**
    * returns the current reading position, in bytes, from the beginning of the file.
    * The next read() call will begin reading at the indicated position
    */
   uint64_t tellg() override
   {
     return pos;
   }
 
   /**
@@ -86,13 +85,10 @@
 
   // Setup filename to read the header
   this->ComputeInternalFileName(this->DataExtent[4]);
-  if (this->InternalFileName == nullptr || this->InternalFileName[0] == '\0')
+  if ((this->InternalFileName == nullptr || this->InternalFileName[0] == '\0') &&
+    !this->MemoryBuffer)
   {
-    // If we have no file then maybe we have the file in memory
-    if (!this->MemoryBuffer)
-    {
-      return;
-    }
+    return;
   }
 
   auto execute = [&](Imf::RgbaInputFile& file)
@@ -201,7 +197,6 @@
 
   try
   {
-    assert(this->InternalFileName);
     Imf::setGlobalThreadCount(std::thread::hardware_concurrency());
 
     if (this->MemoryBuffer)
@@ -212,6 +207,10 @@
     }
     else
     {
+      if (!(this->InternalFileName))
+      {
+        throw std::invalid_argument("Not filename in EXR Reader when no Memory Buffer is set.");
+      }
       Imf::RgbaInputFile file(this->InternalFileName);
       execute(file);
     }
@@ -223,24 +222,6 @@
   }
 }
 
-//------------------------------------------------------------------------------
-/**
- * Read from memory instead of file
- */
-void vtkF3DEXRReader::SetMemoryBuffer(const void* buff)
-{
-  MemoryBuffer = buff;
-}
-
-//------------------------------------------------------------------------------
-/**
- * Specify the in memory image buffer length.
- */
-void vtkF3DEXRReader::SetMemoryBufferLength(vtkIdType bufferLen)
-{
-  MemoryBufferLength = bufferLen;
-}
-
 //------------------------------------------------------------------------------
 int vtkF3DEXRReader::GetWidth() const
 {

vtkext/private/module/vtkF3DEXRReader.h

@@ -31,16 +31,6 @@ class vtkF3DEXRReader : public vtkImageReader
     return "OpenEXR";
   }
 
-  /**
-   * Read from memory instead of file
-   */
-  void SetMemoryBuffer(const void* buff) override;
-
-  /**
-   * Specify the in memory image buffer length.
-   */
-  void SetMemoryBufferLength(vtkIdType buflen) override;
-
 protected:
   vtkF3DEXRReader();
   ~vtkF3DEXRReader() override;