Merge pull request #976 from alicevision/dev/ldrToHdrSampling

[hdr] minor code cleanup in sampling
alicevision · Feb 12, 2021 · 891b2db · 891b2db
2 parents 02e5c56 + 87fd8be
commit 891b2db
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/aliceVision/hdr/sampling.cpp b/src/aliceVision/hdr/sampling.cpp
@@ -153,6 +153,7 @@ bool Sampling::extractSamplesFromImages(std::vector<ImageSample>& out_samples, c
 
     std::vector<std::pair<int, int>> vec_blocks;
     const auto step = params.blockSize - diameter;
+    vec_blocks.reserve(int(imageHeight / step) * int(imageWidth / step));
     for(int cy = 0; cy < imageHeight; cy += step)
     {
         for(int cx = 0; cx < imageWidth; cx += step)
@@ -375,7 +376,7 @@ bool Sampling::extractSamplesFromImages(std::vector<ImageSample>& out_samples, c
 
             for (int x = params.radius; x < samples.Width() - params.radius; ++x)
             {
-                ImageSample & sample = samples(y, x);
+                const ImageSample & sample = samples(y, x);
                 UniqueDescriptor desc;
 
                 for (int k = 0; k < sample.descriptions.size(); ++k)
@@ -398,7 +399,7 @@ bool Sampling::extractSamplesFromImages(std::vector<ImageSample>& out_samples, c
             }
         }
 
-        for (int i = 0; i < omp_get_max_threads(); ++i)
+        for(int i = 0; i < counters_vec.size(); ++i)
         {
             for (auto & item : counters_vec[i])
             {
@@ -426,7 +427,7 @@ bool Sampling::extractSamplesFromImages(std::vector<ImageSample>& out_samples, c
 
         for (std::size_t i = 0; i < item.second.size(); ++i)
         {
-            Coordinates coords = item.second[i];
+            const Coordinates& coords = item.second[i];
 
             if (!samples(coords.second, coords.first).descriptions.empty())
             {