tweaks

cmake/CPM.cmake

@@ -1,4 +1,4 @@
-set(CPM_DOWNLOAD_VERSION 0.35.1)
+set(CPM_DOWNLOAD_VERSION 0.38.6)
 
 if(CPM_SOURCE_CACHE)
   # Expand relative path. This is important if the provided path contains a tilde (~)

src/brush.cpp

@@ -5,9 +5,9 @@
 //
 
 #include "brush.h"
-
 #include "color.h"
 #include "common.h"
+#include "parallelfor.h"
 #include <nanogui/vector.h>
 
 using namespace nanogui;

src/commandpalette.cpp

@@ -3,9 +3,10 @@
 // Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE.txt file.
 //
-//
-// The part of the Command::draw function that performs the substring highlighting logic is adapted from ImGui
-// Command Palette, it's license follows.
+// Outside sources:
+// [1]
+// The part of the Command::draw function that performs the substring highlighting logic is adapted from
+// [ImGui Command Palette](https://github.com/hnOsmium0001/imgui-command-palette), it's license follows.
 //
 // The MIT License (MIT)
 //
@@ -207,6 +208,9 @@ void Command::draw(NVGcontext *ctx)
         draw_shadowed_text(false, m_caption.c_str());
     else
     {
+        //
+        // CITATION: The logic below is adapted from the ImGui Command Palette. See [1] above.
+        //
         auto text = m_caption.c_str();
         int  range_begin;
         int  range_end;

src/filters/zap_gremlins.cpp

@@ -12,6 +12,7 @@
 #include "hdrimage.h"
 #include "hdrviewscreen.h"
 #include "imagelistpanel.h"
+#include "parallelfor.h"
 #include "xpuimage.h"
 #include <spdlog/fmt/ostr.h>
 #include <spdlog/spdlog.h>

src/hdrimage.cpp

@@ -28,10 +28,9 @@
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
 #include "stb_image_resize.h" // for stbir_resize_float
 
+#include "parallelfor.h"
+
 using namespace std;
-using Imath::M33f;
-using Imath::V2f;
-using Imath::V3f;
 
 // local functions
 namespace

src/hdrimage.h

@@ -9,9 +9,7 @@
 #include "array2d.h"
 #include "box.h"
 #include "color.h" // for Color4, max, min
-#include "parallelfor.h"
 #include "progress.h"
-#include <ImathMatrix.h>
 #include <functional> // for function
 #include <nanogui/vector.h>
 #include <set>    // for set

src/hdrimageio.cpp

@@ -209,17 +209,9 @@ bool HDRImage::load(const string &filename)
             Imath::M44f chr_M; // the conversion matrix to rec709 RGB; defaults to identity
             if (hasChromaticities(file.header()))
             {
-                // equality comparison for Imf::Chromaticities
-                auto chr_eq = [](const Imf::Chromaticities &a, const Imf::Chromaticities &b)
-                {
-                    return (a.red - b.red).length2() + (a.green - b.green).length2() + (a.blue - b.blue).length2() +
-                               (a.white - b.white).length2() <
-                           1e-8f;
-                };
-
                 Imf::Chromaticities rec709_chr; // default rec709 (sRGB) primaries
                 Imf::Chromaticities file_chr = Imf::chromaticities(file.header());
-                if (!chr_eq(file_chr, rec709_chr))
+                if (file_chr != rec709_chr)
                 {
                     chr_M = Imf::RGBtoXYZ(file_chr, 1) * Imf::XYZtoRGB(rec709_chr, 1);
                     spdlog::info("Converting pixel values to Rec709/sRGB primaries and whitepoint.");

src/hdrviewscreen.cpp

@@ -701,9 +701,9 @@ void HDRViewScreen::create_menubar()
              {{GLFW_MOD_ALT, 'H'}});
     add_item({"Flip vertically", "Mirror vertically"}, FA_ARROWS_ALT_V, flip_callback(false, m_images_panel),
              {{GLFW_MOD_ALT, 'V'}});
-    add_item({"Rotate 90° clockwise", "Turn clockwise"}, FA_REDO, rotate_callback(true, m_images_panel),
+    add_item({"Rotate 90° clockwise", "Rotate right", "Turn clockwise"}, FA_REDO, rotate_callback(true, m_images_panel),
              {{SYSTEM_COMMAND_MOD, ']'}});
-    add_item({"Rotate 90° counter clockwise", "Turn counter clockwise"}, FA_UNDO,
+    add_item({"Rotate 90° counter clockwise", "Rotate left", "Turn counter clockwise"}, FA_UNDO,
              rotate_callback(false, m_images_panel), {{SYSTEM_COMMAND_MOD, '['}});
     menu->popup()->add<Separator>();
     add_item({"Crop to selection"}, FA_CROP, crop_callback(m_images_panel), {{GLFW_MOD_ALT, 'C'}});

src/tool.cpp

@@ -13,6 +13,7 @@
 #include "hscrollpanel.h"
 #include "imagelistpanel.h"
 #include "menu.h"
+#include "parallelfor.h"
 #include "rasterdraw.h"
 #include "well.h"
 #include <hdrview_resources.h>