detect when to RGBA interface for EXR writing

Author: michaeldsmith

Dockerfile

@@ -1,6 +1,6 @@
-#in noble, apt-get installs OpenEXR v3
+#in ubuntu:noble, apt-get installs OpenEXR v3
 FROM ubuntu:noble 
-#in jammy, apt-get installs OpenEXR v2
+#in ubuntu:jammy, apt-get installs OpenEXR v2
 #FROM ubuntu:jammy 
 
 RUN apt-get update

src/apps/CMakeLists.txt

@@ -9,7 +9,7 @@ if( OJPH_ENABLE_TIFF_SUPPORT )
     set(USE_TIFF TRUE CACHE BOOL "Add TIFF support")
     include_directories( ${TIFF_INCLUDE_DIR} ) 
     add_definitions(-DOJPH_ENABLE_TIFF_SUPPORT)
-  elseif(TIFF_FOUND)
+  elseif( TIFF_FOUND )
     message(STATUS "TIFF support has been enabled but no path to the TIFF library "
     "has been specified; please configure with -DCMAKE_PREFIX_PATH=<TIFF library directory>, "
     "or disable TIFF support using -DOJPH_ENABLE_TIFF_SUPPORT=OFF.")
@@ -58,17 +58,29 @@ if( OJPH_ENABLE_OPENEXR_SUPPORT )
     set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
     add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
   else(OpenEXR_FOUND)
+    message(STATUS "OpenEXR v3 not found, looking for OpenEXR v2")
     find_package(IlmBase)
     if(IlmBase_FOUND)
       message(STATUS "Found IlmBase ${IlmBase_VERSION}")
-
       find_package(OpenEXR 2)
       if(OpenEXR_FOUND)
         message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
         set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
         add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
+        # if (MSVC)
+        #   # Suffix for debug configuration libraries
+        #   # (if you should choose to install those)
+        #   set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds")
+        # endif (MSVC)
+      else(OpenEXR_FOUND)
+        message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR library "
+        "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
+        "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
       endif(OpenEXR_FOUND)
-
+    else(IlmBase_FOUND)
+      message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
+      "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
+      "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
     endif(IlmBase_FOUND)
 
   endif(OpenEXR_FOUND)

src/apps/common/ojph_img_io.h

@@ -901,28 +901,42 @@ namespace ojph {
       width = 0; 
       height = 0; 
       num_components = 0;
-      for( int i = 0; i < MAXIMUM_NUMBER_OF_COMPONENTS_EXR_OUT; i++)
+      for (int i = 0; i < MAXIMUM_NUMBER_OF_COMPONENTS_EXR_OUT; i++)
+      {
+        has_nlt[i] = false;
         bit_depth[i] = 0;
+        is_signed[i] = false;
+      }
+      is_use_Rgba_interface = false;
+        
       is_open = false;
     }
     virtual ~exr_out()
     {
       close();
-      pixels.resizeErase(0, 0);
+      if(true == is_use_Rgba_interface )
+        pixels.resizeErase(0, 0);
     }
 
     void open(const char* filename);
-    void configure(ui32 width, ui32 height, ui32 num_components, ui32 bit_depth);
+    void configure(ui32 width, ui32 height, ui32 num_components, bool* has_nlt, ui8* bitdepths, bool* is_signed);
     virtual ui32 write(const line_buf* line, ui32 comp_num);
     virtual void close();
 
   private:
 
     const char* fname;
     bool is_open;
+
     ui32 width, height, num_components;
+
+    bool has_nlt[MAXIMUM_NUMBER_OF_COMPONENTS_EXR_OUT];
     ui32 bit_depth[MAXIMUM_NUMBER_OF_COMPONENTS_EXR_OUT];
+    bool is_signed[MAXIMUM_NUMBER_OF_COMPONENTS_EXR_OUT];
+
     Imf::Array2D<Imf::Rgba> pixels;
+    bool is_use_Rgba_interface;
+
     ui32 cur_line;
   };
 #endif /* OJPH_ENABLE_OPENEXR_SUPPORT */

src/apps/ojph_expand/ojph_expand.cpp

@@ -399,30 +399,99 @@ int main(int argc, char *argv[]) {
       else if (is_matching(".exr", v))
       {
         ojph::param_siz siz = codestream.access_siz();
+        ojph::param_nlt nlt = codestream.access_nlt();
+        ojph::ui32 num_components = siz.get_num_components();
+
+        ojph::ui8 *bitdepths = (ojph::ui8*)calloc(num_components, sizeof(ojph::ui8));
+        if (NULL == bitdepths) {
+          fprintf(stderr, "Unable to allocate %zd bytes for bitdepths", num_components * sizeof(ojph::ui8));
+          exit(-1);
+        }
+
+        bool *is_signed = (bool*)calloc(num_components, sizeof(bool));
+        if (NULL == is_signed) {
+          fprintf(stderr, "Unable to allocate %zd bytes for is_signed", num_components * sizeof(bool));
+          exit(-1);
+        }
+        bool *has_nlt = (bool*)calloc(num_components, sizeof(bool));
+        if (NULL == has_nlt) {
+          fprintf(stderr, "Unable to allocate %zd bytes for has_nlt", num_components * sizeof(bool));
+          exit(-1);
+        }
 
-        if (siz.get_num_components() != 3 && siz.get_num_components() != 4)
+        // check properties for all components
+        for (ojph::ui32 c = 0; c < num_components; c++)
+        {
+          bool nlt_is_signed;
+          ojph::ui8 nlt_bit_depth;
+          has_nlt[c] = nlt.get_type3_transformation(c, nlt_bit_depth, nlt_is_signed);
+
+          fprintf(stderr, "comp = %d has_nlt = %s ",
+            c, has_nlt[c] ? "true" : "false");
+          if (true == has_nlt[c])
+          {
+            fprintf(stderr, "nlt_bit_depth = %d nlt_is_signed = % s\n",
+              nlt_bit_depth,
+              nlt_is_signed ? "true" : "false");
+          }
+          else
+          {
+            fprintf(stderr, "\n");
+          }
+          
+          if (true == has_nlt[c] && (nlt_bit_depth != siz.get_bit_depth(c) || nlt_is_signed != siz.is_signed(c)))
+          {
+            OJPH_ERROR(0x0200000F,
+              "There is discrepancy in component %d configuration between "
+              "SIZ marker segment, which specifies bit_depth = %d and "
+              "signedness = %s, and NLT marker segment, which specifies "
+              "bit_depth = %d and signedness = %s.\n", c,
+              siz.get_bit_depth(c), siz.is_signed(c) ? "True" : "False",
+              nlt_bit_depth, nlt_is_signed ? "True" : "False");
+          }
+
+          bitdepths[c] = siz.get_bit_depth(c);
+          is_signed[c] = siz.is_signed(c);
+        }
+
+        if (num_components != 3 && num_components != 4)
           OJPH_ERROR(0x0200000C,
             "The file has %d color components; this cannot be saved to"
             " .exr file (currently only 3 and 4 components are supported).\n",
-            siz.get_num_components());
+            num_components);
         ojph::ui32 width = siz.get_recon_width(0);
         ojph::ui32 height = siz.get_recon_height(0);
-        ojph::ui32 bit_depth = siz.get_bit_depth(0);
-        ojph::ui32 num_components = siz.get_num_components();
-        exr.configure(width, height, num_components, bit_depth);
+        
+        exr.configure(width, height, num_components, has_nlt, bitdepths, is_signed);
         exr.open(output_filename);
         base = &exr;
+
+        free(bitdepths);
+        free(is_signed);
+        free(has_nlt);
       }
 #endif /* OJPH_ENABLE_EXR_SUPPORT */
       else
 #ifdef OJPH_ENABLE_TIFF_SUPPORT
+  #ifdef OJPH_ENABLE_OPENEXR_SUPPORT
         OJPH_ERROR(0x02000009,
-          "unknown output file extension; only pgm, ppm, tif(f) and raw(yuv))"
+          "unknown output file extension; only pgm, ppm, tif(f), exr and raw(yuv))"
           " are supported\n");
+  #else
+      OJPH_ERROR(0x02000009,
+      "unknown output file extension; only pgm, ppm, tif(f) and raw(yuv))"
+      " are supported\n");
+  #endif
 #else
+  #ifdef OJPH_ENABLE_OPENEXR_SUPPORT
+      OJPH_ERROR(0x02000009,
+      "unknown output file extension; only pgm, ppm, exr and raw(yuv))"
+      " are supported\n");
+  #else
         OJPH_ERROR(0x0200000A,
           "unknown output file extension; only pgm, ppm, and raw(yuv) are"
           " supported\n");
+  #endif
 #endif // !OJPH_ENABLE_TIFF_SUPPORT
     }
     else