feat(dng): load thumbnail images again, but resize to display window

Author: Tom94

include/tev/imageio/ImageLoader.h

@@ -186,8 +186,11 @@ class ImageLoader {
         size_t numChannels, const nanogui::Vector2i& size, EPixelFormat format, EPixelFormat desiredFormat, std::string_view layer
     );
 
-    static Task<void> resizeChannelsAsync(std::span<const Channel> srcChannels, std::vector<Channel>& dstChannels, int priority);
-    static Task<void> resizeImageData(ImageData& resultData, const nanogui::Vector2i& targetSize, int priority);
+    static Task<void> resizeChannelsAsync(
+        std::span<const Channel> srcChannels, std::vector<Channel>& dstChannels, const std::optional<Box2i>& dstBox, int priority
+    );
+    static Task<void>
+        resizeImageData(ImageData& resultData, const nanogui::Vector2i& targetSize, const std::optional<Box2i>& targetBox, int priority);
 };
 
 } // namespace tev

src/Image.cpp

@@ -214,7 +214,10 @@ Task<void> ImageData::matchColorsAndSizeOf(const ImageData& other, int priority)
 
     co_await applyColorConversion(inverse(other.toRec709) * toRec709, priority);
     if (!other.channels.empty()) {
-        co_await ImageLoader::resizeImageData(*this, other.channels.front().size(), priority);
+        optional<Box2i> targetBox = other.displayWindow.isValid() && other.dataWindow.isValid() ?
+            optional{other.displayWindow.translate(-other.dataWindow.min)} :
+            nullopt;
+        co_await ImageLoader::resizeImageData(*this, other.channels.front().size(), targetBox, priority);
     }
 }
 

src/imageio/GainMap.cpp

@@ -101,7 +101,7 @@ Task<void> preprocessAndApplyAppleGainMap(
 
     const auto size = imageChannels.front()->size();
 
-    co_await ImageLoader::resizeImageData(gainMap, size, priority);
+    co_await ImageLoader::resizeImageData(gainMap, size, nullopt, priority);
 
     // Re-fetch channels after resize
     gainMapChannels = getRgbOrLuminanceChannels(gainMap);
@@ -227,7 +227,7 @@ Task<void> preprocessAndApplyIsoGainMap(
 
     const auto size = imageChannels.front()->size();
 
-    co_await ImageLoader::resizeImageData(gainMap, size, priority);
+    co_await ImageLoader::resizeImageData(gainMap, size, nullopt, priority);
 
     // Re-fetch channels after resize
     gainMapChannels = getRgbOrLuminanceChannels(gainMap);

src/imageio/ImageLoader.cpp

@@ -225,7 +225,9 @@ vector<Channel>
     return channels;
 }
 
-Task<void> ImageLoader::resizeChannelsAsync(span<const Channel> srcChannels, vector<Channel>& dstChannels, int priority) {
+Task<void> ImageLoader::resizeChannelsAsync(
+    span<const Channel> srcChannels, vector<Channel>& dstChannels, const optional<Box2i>& dstArea, int priority
+) {
     TEV_ASSERT(srcChannels.size() == dstChannels.size(), "Number of source and destination channels must match.");
     if (srcChannels.empty()) {
         co_return;
@@ -235,23 +237,36 @@ Task<void> ImageLoader::resizeChannelsAsync(span<const Channel> srcChannels, vec
     const Vector2i targetSize = dstChannels.front().size();
     const int numChannels = (int)srcChannels.size();
 
+    const Box2i box = dstArea.value_or(Box2i{Vector2i(0, 0), targetSize});
+
     for (int i = 1; i < numChannels; ++i) {
         TEV_ASSERT(srcChannels[i].size() == size, "Source channels' size must match.");
         TEV_ASSERT(dstChannels[i].size() == targetSize, "Destination channels' size must match.");
     }
 
     const size_t numSamples = (size_t)targetSize.x() * targetSize.y() * numChannels;
-    const float scaleX = (float)size.x() / targetSize.x();
-    const float scaleY = (float)size.y() / targetSize.y();
+
+    const float scaleX = (float)size.x() / box.size().x();
+    const float scaleY = (float)size.y() / box.size().y();
 
     co_await ThreadPool::global().parallelForAsync<int>(
         0,
         targetSize.y(),
         numSamples,
         [&](int dstY) {
             for (int dstX = 0; dstX < targetSize.x(); ++dstX) {
-                const float srcX = (dstX + 0.5f) * scaleX - 0.5f;
-                const float srcY = (dstY + 0.5f) * scaleY - 0.5f;
+                const size_t dstIdx = dstY * (size_t)targetSize.x() + dstX;
+
+                if (dstX < box.min.x() || dstX >= box.max.x() || dstY < box.min.y() || dstY >= box.max.y()) {
+                    for (int c = 0; c < numChannels; ++c) {
+                        dstChannels[c].setAt(dstIdx, 0.0f);
+                    }
+
+                    continue;
+                }
+
+                const float srcX = ((dstX - box.min.x()) + 0.5f) * scaleX - 0.5f;
+                const float srcY = ((dstY - box.min.y()) + 0.5f) * scaleY - 0.5f;
 
                 const int x0 = std::max((int)floor(srcX), 0);
                 const int y0 = std::max((int)floor(srcY), 0);
@@ -268,8 +283,6 @@ Task<void> ImageLoader::resizeChannelsAsync(span<const Channel> srcChannels, vec
                 const float w10 = wx0 * wy1;
                 const float w11 = wx1 * wy1;
 
-                const size_t dstIdx = dstY * (size_t)targetSize.x() + dstX;
-
                 const size_t srcIdx00 = y0 * (size_t)size.x() + x0;
                 const size_t srcIdx01 = y0 * (size_t)size.x() + x1;
                 const size_t srcIdx10 = y1 * (size_t)size.x() + x0;
@@ -289,7 +302,7 @@ Task<void> ImageLoader::resizeChannelsAsync(span<const Channel> srcChannels, vec
     );
 }
 
-Task<void> ImageLoader::resizeImageData(ImageData& resultData, const Vector2i& targetSize, int priority) {
+Task<void> ImageLoader::resizeImageData(ImageData& resultData, const Vector2i& targetSize, const optional<Box2i>& targetArea, int priority) {
     const Vector2i size = resultData.channels.front().size();
     if (size == targetSize) {
         co_return;
@@ -302,7 +315,7 @@ Task<void> ImageLoader::resizeImageData(ImageData& resultData, const Vector2i& t
         resultData.channels.emplace_back(c.name(), targetSize, c.pixelFormat(), c.desiredPixelFormat());
     }
 
-    co_await resizeChannelsAsync(prevChannels, resultData.channels, priority);
+    co_await resizeChannelsAsync(prevChannels, resultData.channels, targetArea, priority);
 };
 
 } // namespace tev

src/imageio/TiffImageLoader.cpp

@@ -2547,7 +2547,7 @@ Task<ImageData>
 
         photometric = isDng ? PHOTOMETRIC_LINEAR_RAW : PHOTOMETRIC_RGB;
 
-        resultData.channels.front().setName(Channel::joinIfNonempty(partName, "cfa"));
+        resultData.channels.front().setName(Channel::joinIfNonempty(partName, "cfa.L"));
         resultData.channels.insert(
             resultData.channels.begin(), make_move_iterator(rgbaChannels.begin()), make_move_iterator(rgbaChannels.end())
         );
@@ -2696,7 +2696,7 @@ Task<vector<ImageData>> TiffImageLoader::load(istream& iStream, const fs::path&
                 // DNGs often come with multiple thumbnail images that act as a loading preview in photo editing software. Uninteresting for
                 // tev to load, except for the main IFD's orientation tag, which is authorative.
                 if (isThumbnail(type)) {
-                    co_return;
+                    // co_return;
                 }
 
                 name = dngSubFileTypeToString(type);