Merge branch 'release/v1.1.9'

main/CMakeLists.txt

@@ -2,7 +2,6 @@ add_executable(rawls_convert rawls_convert.cpp)
 add_executable(rawls_merge_mean rawls_merge_mean.cpp)
 add_executable(rawls_h_flip rawls_h_flip.cpp)
 add_executable(rawls_merge_mean_incr rawls_merge_mean_incr.cpp)
-add_executable(rawls_merge_mean_incr_v2 rawls_merge_mean_incr_v2.cpp)
 add_executable(rawls_merge_median_incr rawls_merge_median_incr.cpp)
 add_executable(rawls_merge_MON_incr rawls_merge_MON_incr.cpp)
 add_executable(rawls_merge_MON_pct_incr rawls_merge_MON_pct_incr.cpp)
@@ -15,7 +14,6 @@ target_link_libraries(rawls_convert LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_mean LINK_PUBLIC rawls)
 target_link_libraries(rawls_h_flip LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_mean_incr LINK_PUBLIC rawls)
-target_link_libraries(rawls_merge_mean_incr_v2 LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_median_incr LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_MON_incr LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_MON_pct_incr LINK_PUBLIC rawls)
@@ -28,7 +26,6 @@ set_property(TARGET rawls_merge_mean PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_convert PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_h_flip PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_merge_mean_incr PROPERTY CXX_STANDARD 17)
-set_property(TARGET rawls_merge_mean_incr_v2 PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_merge_median_incr PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_merge_MON_incr PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_merge_MON_pct_incr PROPERTY CXX_STANDARD 17)

utils/extract_specific_png.py

@@ -33,13 +33,13 @@ def main():
     for img in sorted(images_path):
 
         # replace expected Samples value
-        img_data = img.split('-')
+        img_data = img.split('/')[-1].split('-')
         img_data[-2] = "S" + p_samples
         img_data[-1] = output_index + ".png"
 
         output_path = '-'.join(img_data)
 
-        output_path = output_path.replace(p_folder, p_output)
+        output_path = os.path.join(p_output, img.split('/')[-2], output_path)
         output_folder, _ = os.path.split(output_path)
 
         if not os.path.exists(output_folder):