Merge branch 'dev/forceCompositingLevels' of github.com:alicevision/A…

…liceVision into dev/forceCompositingLevels
alicevision · Mar 9, 2023 · 4b7a06f · 4b7a06f
2 parents 0a3162c + 0647b42
commit 4b7a06f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/software/pipeline/main_panoramaCompositing.cpp b/src/software/pipeline/main_panoramaCompositing.cpp
@@ -120,12 +120,12 @@ std::unique_ptr<PanoramaMap> buildMap(const sfmData::SfMData& sfmData, const std
         }
     }
 
-    ALICEVISION_LOG_INFO("Estimated levels count : " << min_scale);
+    ALICEVISION_LOG_INFO("Estimated pyramid levels count: " << min_scale);
 
-    if (forceMinPyramidLevels > 0)
+    if (forceMinPyramidLevels > min_scale)
     {
-        min_scale = std::max(forceMinPyramidLevels, min_scale);
-        ALICEVISION_LOG_INFO("Forced levels count : " << min_scale);
+        min_scale = forceMinPyramidLevels;
+        ALICEVISION_LOG_INFO("Forced pyramid levels count: " << min_scale);
     }
 
     std::unique_ptr<PanoramaMap> ret(new PanoramaMap(panoramaSize.first, panoramaSize.second, min_scale, borderSize));