chore: minor emplace() & ranges refactor

Author: Tom94

src/BackgroundImagesLoader.cpp

@@ -46,7 +46,7 @@ void BackgroundImagesLoader::enqueue(const fs::path& path, string_view channelSe
         vector<fs::directory_entry> entries;
         forEachFileInDir(mRecursiveDirectories, canonicalPath, [&](const auto& entry) {
             if (!entry.is_directory()) {
-                mFilesFoundInDirectories.emplace(PathAndChannelSelector{entry, string{channelSelector}});
+                mFilesFoundInDirectories.emplace(entry, string{channelSelector});
                 entries.emplace_back(entry);
             }
         });

src/Common.cpp

@@ -297,7 +297,7 @@ bool matchesFuzzy(string_view text, string_view filter, size_t* matchedPartId) {
 
     // Perform matching via smart casing: if the filter is all lowercase, we want to match case-insensitively. If the filter contains any
     // uppercase characters, we want to match case-sensitively.
-    const bool caseInsensitive = all_of(begin(filter), end(filter), [](char c) { return islower(c); });
+    const bool caseInsensitive = ranges::all_of(filter, [](char c) { return islower(c); });
 
     string casedText, casedFilter;
     if (caseInsensitive) {

src/Image.cpp

@@ -834,29 +834,33 @@ Texture* Image::texture(span<const string> channelNames, EInterpolationMode minF
         default: throw runtime_error{"Unsupported number of channels for texture."};
     }
 
-    Texture::ComponentFormat componentFormat = Texture::ComponentFormat::Float16;
-    for (const auto& chanName : channelNames) {
-        const Channel* chan = channel(chanName);
-        if (chan && chan->desiredPixelFormat() == EPixelFormat::F32) {
-            componentFormat = Texture::ComponentFormat::Float32;
-            break; // No need to check further, we already have a channel that requires F32.
-        }
-    }
+    const Texture::ComponentFormat componentFormat = ranges::any_of(
+                                                         channelNames | views::transform([this](const auto& c) { return channel(c); }),
+                                                         [](const auto& c) { return c && c->desiredPixelFormat() == EPixelFormat::F32; }
+                                                     ) ?
+        Texture::ComponentFormat::Float32 :
+        Texture::ComponentFormat::Float16;
 
     mTextures.emplace(
-        lookup,
-        ImageTexture{
+        piecewise_construct,
+        tuple{
+            lookup
+    },
+        tuple{
             new Texture{
-                        pixelFormat, componentFormat,
-                        {size().x(), size().y()},
-                        toNanogui(minFilter),
-                        toNanogui(magFilter),
-                        Texture::WrapMode::ClampToEdge,
-                        1, Texture::TextureFlags::ShaderRead,
-                        true, },
-            {channelNames.begin(), channelNames.end()},
+                pixelFormat,
+                componentFormat,
+                {size().x(), size().y()},
+                toNanogui(minFilter),
+                toNanogui(magFilter),
+                Texture::WrapMode::ClampToEdge,
+                1,
+                Texture::TextureFlags::ShaderRead,
+                true,
+            },
+            channelNames | toVector,
             false,
-    }
+        }
     );
 
     auto& texture = mTextures.at(lookup).nanoguiTexture;
@@ -1182,7 +1186,7 @@ Task<HeapArray<float>> Image::getRgbaHdrImageData(
     const Channel* alphaChannel = nullptr;
 
     // Only treat the alpha channel specially if it is not the only channel of the image.
-    if (!all_of(begin(channels), end(channels), [](const Channel& c) { return c.isAlpha(); })) {
+    if (ranges::any_of(channels, [](const Channel& c) { return !c.isAlpha(); })) {
         if (channels.back().isAlpha()) {
             alphaChannel = &channels.back();
         }

src/ImageCanvas.cpp

@@ -831,7 +831,7 @@ Task<shared_ptr<CanvasStatistics>> ImageCanvas::computeCanvasStatistics(
     const ChannelView<float>* alphaChannel = nullptr;
 
     // Only treat the alpha channel specially if it is not the only channel of the image.
-    if (!all_of(begin(flattened), end(flattened), [](const Channel& c) { return c.isAlpha(); })) {
+    if (ranges::any_of(flattened, [](const Channel& c) { return !c.isAlpha(); })) {
         if (flattened.back().isAlpha()) {
             alphaChannel = &views.back();
         }

src/ImageViewer.cpp

@@ -1206,17 +1206,21 @@ bool ImageViewer::keyboard_event(int key, int scancode, int action, int modifier
             }
 
             return true;
-        } else if (key == GLFW_KEY_UP || key == GLFW_KEY_W || key == GLFW_KEY_PAGE_UP ||
-                   (key == GLFW_KEY_TAB && (modifiers & GLFW_MOD_CONTROL) && (modifiers & GLFW_MOD_SHIFT))) {
+        } else if (
+            key == GLFW_KEY_UP || key == GLFW_KEY_W || key == GLFW_KEY_PAGE_UP ||
+            (key == GLFW_KEY_TAB && (modifiers & GLFW_MOD_CONTROL) && (modifiers & GLFW_MOD_SHIFT))
+        ) {
             if (key != GLFW_KEY_TAB && (modifiers & GLFW_MOD_SHIFT)) {
                 selectReference(nextImage(mCurrentReference, Backward));
             } else {
                 selectImage(nextImage(mCurrentImage, Backward));
             }
 
             return true;
-        } else if (key == GLFW_KEY_DOWN || key == GLFW_KEY_S || key == GLFW_KEY_PAGE_DOWN ||
-                   (key == GLFW_KEY_TAB && (modifiers & GLFW_MOD_CONTROL) && !(modifiers & GLFW_MOD_SHIFT))) {
+        } else if (
+            key == GLFW_KEY_DOWN || key == GLFW_KEY_S || key == GLFW_KEY_PAGE_DOWN ||
+            (key == GLFW_KEY_TAB && (modifiers & GLFW_MOD_CONTROL) && !(modifiers & GLFW_MOD_SHIFT))
+        ) {
             if (key != GLFW_KEY_TAB && (modifiers & GLFW_MOD_SHIFT)) {
                 selectReference(nextImage(mCurrentReference, Forward));
             } else {
@@ -1387,7 +1391,7 @@ void ImageViewer::draw_contents() {
     }
 
     const bool anyImageVisible = mCurrentImage || mCurrentReference ||
-        any_of(begin(mImageButtonContainer->children()), end(mImageButtonContainer->children()), [](const auto& c) { return c->visible(); });
+        ranges::any_of(mImageButtonContainer->children(), [](const auto& c) { return c->visible(); });
 
     for (auto button : mAnyImageButtons) {
         button->set_enabled(anyImageVisible);
@@ -2403,7 +2407,7 @@ void ImageViewer::openImageDialog() {
                 allImages.push_back(filter.first);
             }
 
-            filters.emplace(filters.begin(), pair<string, string>{join(allImages, ","), "All images"});
+            filters.emplace(filters.begin(), pair{join(allImages, ","), "All images"});
             const auto paths = file_dialog(this, FileDialogType::OpenMultiple, filters);
 
             for (size_t i = 0; i < paths.size(); ++i) {
@@ -2735,7 +2739,7 @@ void ImageViewer::updateFilter() {
                 do {
                     int len = codePointLength(first[beginOffset]);
 
-                    allStartWithSameChar = all_of(begin(activeImageNames), end(activeImageNames), [&first, beginOffset, len](string_view name) {
+                    allStartWithSameChar = ranges::all_of(activeImageNames, [&first, beginOffset, len](string_view name) {
                         if (beginOffset + len > (int)name.size()) {
                             return false;
                         }
@@ -2755,7 +2759,7 @@ void ImageViewer::updateFilter() {
                 bool allEndWithSameChar;
                 do {
                     char lastChar = first[firstSize - endOffset - 1];
-                    allEndWithSameChar = all_of(begin(activeImageNames), end(activeImageNames), [lastChar, endOffset](string_view name) {
+                    allEndWithSameChar = ranges::all_of(activeImageNames, [lastChar, endOffset](string_view name) {
                         int index = (int)name.size() - endOffset - 1;
                         return index >= 0 && name[index] == lastChar;
                     });

src/imageio/Jpeg2000ImageLoader.cpp

@@ -205,7 +205,7 @@ Jp2Metadata extractJp2Metadata(span<const uint8_t> data) {
 
             if (memcmp(box->data.data(), xmpUuid, 16) == 0) {
                 meta.xmpXml = box->data.subspan(16);
-            } else if (any_of(begin(exifUuids), end(exifUuids), [&box](const uint8_t (&knownUuid)[16]) {
+            } else if (ranges::any_of(exifUuids, [&box](const uint8_t (&knownUuid)[16]) {
                            return memcmp(box->data.data(), knownUuid, 16) == 0;
                        })) {
                 meta.exifData = box->data.subspan(16);

src/imageio/TiffImageLoader.cpp

@@ -240,7 +240,7 @@ Task<void> tiffDataToFloat32(
     } else if (kind == ETiffKind::U32) {
         co_await toFloat32(imageData.span<const uint32_t>().subspan(offset), numSppIn, rgbaView, hasAlpha, priority, scale);
     } else if (kind == ETiffKind::Palette) {
-        if (any_of(palette.begin(), palette.end(), [](const auto& c) { return c.empty(); })) {
+        if (ranges::any_of(palette, [](const auto& c) { return c.empty(); })) {
             throw runtime_error{"Palette data is empty."};
         }
 
@@ -723,7 +723,7 @@ Task<void> linearizeAndNormalizeRawDng(
         channelScale[c] = 1.0f / (whiteLevel[c] - maxBlackLevel[c]);
     }
 
-    if (any_of(channelScale.begin(), channelScale.end(), [](float s) { return s != 1.0f; })) {
+    if (ranges::any_of(channelScale, [](float s) { return s != 1.0f; })) {
         tlog::debug("Non-1.0 channel scale [{}]", join(channelScale, ","));
 
         co_await ThreadPool::global().parallelFor(
@@ -1806,7 +1806,7 @@ Task<ImageData> readTiffImage(
         }
     }
 
-    if (all_of(begin(SUPPORTED_PHOTOMETRICS), end(SUPPORTED_PHOTOMETRICS), [&](uint16_t p) { return p != photometric; })) {
+    if (ranges::all_of(SUPPORTED_PHOTOMETRICS, [&](uint16_t p) { return p != photometric; })) {
         throw ImageLoadError{fmt::format("Unsupported photometric interpretation: {}", photometric)};
     }
 
@@ -1913,7 +1913,7 @@ Task<ImageData> readTiffImage(
             throw ImageLoadError{"Palette images must have unsigned integer sample format."};
         }
 
-        if (any_of(begin(palette), end(palette), [](const auto& c) { return c.empty(); })) {
+        if (ranges::any_of(palette, [](const auto& c) { return c.empty(); })) {
             throw ImageLoadError{"Failed to read color palette."};
         }