Make requested changes

rtengine/imageio.cc

@@ -24,6 +24,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+
 #include <fcntl.h>
 #include <glib/gstdio.h>
 #include <png.h>
@@ -31,10 +32,7 @@
 #include <tiffio.h>
 
 #ifdef LIBJXL
-#include <fstream>
-#include "jxl/decode.h"
 #include "jxl/decode_cxx.h"
-#include "jxl/resizable_parallel_runner.h"
 #include "jxl/resizable_parallel_runner_cxx.h"
 #endif
 
@@ -832,17 +830,16 @@ int ImageIO::loadTIFF (const Glib::ustring &fname)
 #ifdef LIBJXL
 #define _PROFILE_ JXL_COLOR_PROFILE_TARGET_ORIGINAL
 // adapted from libjxl
-int ImageIO::loadJxl(const Glib::ustring &fname)
+int ImageIO::loadJXL(const Glib::ustring &fname)
 {
     if (pl) {
         pl->setProgressStr("PROGRESSBAR_LOADJXL");
         pl->setProgress(0.0);
     }
 
-    std::vector<uint8_t> icc_profile;
+    std::vector<std::uint8_t> icc_profile;
-
+    std::vector<std::uint8_t> buffer;
-    gpointer buffer = nullptr;
+    std::size_t buffer_size = 0;
-    size_t buffer_size = 0;
 
     JxlBasicInfo info = {};
     JxlPixelFormat format = {};
@@ -852,17 +849,14 @@ int ImageIO::loadJxl(const Glib::ustring &fname)
     format.endianness = JXL_NATIVE_ENDIAN;
     format.align = 0;
 
-    // get file contents
+    std::string const contents = Glib::file_get_contents(fname);
-    std::ifstream instream(fname.c_str(), std::ios::in | std::ios::binary);
+    std::vector<std::uint8_t> const compressed(contents.begin(), contents.end());
-    std::vector<uint8_t> compressed(
-        (std::istreambuf_iterator<char>(instream)),
-        std::istreambuf_iterator<char>());
-    instream.close();
 
     // multi-threaded parallel runner.
     auto runner = JxlResizableParallelRunnerMake(nullptr);
 
     auto dec = JxlDecoderMake(nullptr);
+
     if (JXL_DEC_SUCCESS !=
             JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_BASIC_INFO |
                                       JXL_DEC_COLOR_ENCODING |
@@ -897,7 +891,7 @@ int ImageIO::loadJxl(const Glib::ustring &fname)
             // check for ICC profile
             deleteLoadedProfileData();
             embProfile = nullptr;
-            size_t icc_size = 0;
+            std::size_t icc_size = 0;
 
             if (JXL_DEC_SUCCESS !=
 #if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,8,0)
@@ -911,6 +905,7 @@ int ImageIO::loadJxl(const Glib::ustring &fname)
 
             if (icc_size > 0) {
                 icc_profile.resize(icc_size);
+
                 if (JXL_DEC_SUCCESS !=
 #if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,8,0)
                         JxlDecoderGetColorAsICCProfile(
@@ -932,7 +927,10 @@ int ImageIO::loadJxl(const Glib::ustring &fname)
                 g_printerr("Warning: Empty ICC data.\n");
             }
         } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-            format.data_type = JXL_TYPE_FLOAT;
+            // Note: If this assert is ever triggered, it should be changed
+            // to an assignment.  We want the maximum bit depth the decoder
+            // can provide regardless of the original encoding intent.
+            assert(format.data_type == JXL_TYPE_FLOAT);
 
             if (JXL_DEC_SUCCESS !=
                     JxlDecoderImageOutBufferSize(dec.get(), &format, &buffer_size)) {
@@ -940,20 +938,19 @@ int ImageIO::loadJxl(const Glib::ustring &fname)
                 return IMIO_READERROR;
             }
 
-            buffer = g_malloc(buffer_size);
+            buffer.resize(buffer_size);
-            if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(), &format, buffer, buffer_size)) {
+
+            if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(), &format, buffer.data(), buffer.size())) {
                 g_printerr("Error: JxlDecoderSetImageOutBuffer failed\n");
-                g_free(buffer);
                 return IMIO_READERROR;
             }
         } else if (status == JXL_DEC_FULL_IMAGE ||
                    status == JXL_DEC_FRAME) {
             // Nothing to do. If the image is an animation, more full frames
             // may be decoded. This example only keeps the first one.
+            break;
         } else if (status == JXL_DEC_SUCCESS) {
-            // All decoding successfully finished.
+            // Decoding complete.  Decoder will be released automatically.
-            // It's not required to call JxlDecoderReleaseInput(dec.get())
-            // since the decoder will be destroyed.
             break;
         } else if (status == JXL_DEC_NEED_MORE_INPUT) {
             g_printerr("Error: Already provided all input\n");
@@ -967,23 +964,21 @@ int ImageIO::loadJxl(const Glib::ustring &fname)
         }
     }  // end grand decode loop
 
-    unsigned int width = info.xsize;
+    std::size_t width = info.xsize;
-    unsigned int height = info.ysize;
+    std::size_t height = info.ysize;
 
     allocate(width, height);
 
-    int line_length = width * 3 * 4;
+    std::size_t line_length = width * 3 * 4;
 
-    for (size_t row = 0; row < height; ++row) {
+    for (std::size_t row = 0; row < height; ++row) {
-        setScanline (row, ((const unsigned char*)buffer) + (row * line_length), 32);
+        setScanline(row, ((const unsigned char*)buffer.data()) + (row * line_length), 32);
 
         if (pl && !(row % 100)) {
             pl->setProgress((double)(row) / height);
         }
     }
 
-    g_free(buffer);
-
     if (pl) {
         pl->setProgressStr("PROGRESSBAR_READY");
         pl->setProgress(1.0);
@@ -1484,7 +1479,7 @@ int ImageIO::load (const Glib::ustring &fname)
         return loadJPEG (fname);
 #ifdef LIBJXL
     } else if (hasJxlExtension(fname)) {
-        return loadJxl(fname);
+        return loadJXL(fname);
 #endif
     } else if (hasTiffExtension(fname)) {
         return loadTIFF (fname);

rtengine/imageio.h

@@ -91,7 +91,7 @@ public:
     int save (const Glib::ustring &fname) const;
 
 #ifdef LIBJXL
-    int loadJxl (const Glib::ustring &fname);
+    int loadJXL (const Glib::ustring &fname);
 #endif
 
     int loadPNG (const Glib::ustring &fname);

rtengine/utils.cc

@@ -240,8 +240,7 @@ bool hasJpegExtension(const Glib::ustring& filename)
 #ifdef LIBJXL
 bool hasJxlExtension(const Glib::ustring& filename)
 {
-   const Glib::ustring extension = getFileExtension(filename);
+   return getFileExtension(filename) == "jxl";
-   return extension == "jxl";
 }
 #endif
 

rtgui/thumbnail.cc

@@ -211,21 +211,24 @@ void Thumbnail::_generateThumbnailImage ()
     bool quick = false;
 
     rtengine::eSensorType sensorType = rtengine::ST_NONE;
+
     if (initial_ && options.internalThumbIfUntouched) {
         quick = true;
         tpp = rtengine::Thumbnail::loadQuickFromRaw(fname, sensorType, tw, th, 1, TRUE);
     }
 
-    if ( tpp == nullptr ) {
+    if (!tpp) {
         quick = false;
         tpp = rtengine::Thumbnail::loadFromRaw(fname, sensorType, tw, th, 1, pparams->wb.equal, pparams->wb.observer, TRUE, &(pparams->raw));
     }
 
     cfs.sensortype = sensorType;
+
     if (tpp) {
         cfs.format = FT_Raw;
         cfs.thumbImgType = quick ? CacheImageData::QUICK_THUMBNAIL : CacheImageData::FULL_THUMBNAIL;
         infoFromImage(fname);
+
         if (!quick) {
             cfs.width = tpp->full_width;
             cfs.height = tpp->full_height;
@@ -235,6 +238,7 @@ void Thumbnail::_generateThumbnailImage ()
     if (!tpp) {
         // this will load formats supported by imagio (jpg, png, jxl, and tiff)
         tpp = rtengine::Thumbnail::loadFromImage(fname, tw, th, -1, pparams->wb.equal, pparams->wb.observer);
+
         if (tpp) {
             cfs.format = FT_Custom;
             infoFromImage(fname);
@@ -718,10 +722,10 @@ rtengine::IImage8* Thumbnail::processThumbImage (const rtengine::procparams::Pro
 
     MyMutex::MyLock lock(mutex);
 
-    if ( tpp == nullptr ) {
+    if (!tpp) {
         _loadThumbnail();
 
-        if ( tpp == nullptr ) {
+        if (!tpp) {
             return nullptr;
         }
     }
@@ -755,7 +759,7 @@ rtengine::IImage8* Thumbnail::upgradeThumbImage (const rtengine::procparams::Pro
 
     _generateThumbnailImage();
 
-    if ( tpp == nullptr ) {
+    if (!tpp) {
         return nullptr;
     }
 
@@ -961,7 +965,7 @@ void Thumbnail::_loadThumbnail(bool firstTrial)
             _loadThumbnail (false);
         }
 
-        if (tpp == nullptr) {
+        if (!tpp) {
             return;
         }
     } else if (!succ) {