analysis

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

src/rawtoaces_core/rawtoaces_core.cpp

@@ -610,14 +610,14 @@ struct IDTOptimizationCost
     IDTOptimizationCost(
         const std::vector<std::vector<double>> &RGB,
         const std::vector<std::vector<double>> &out_LAB )
-        : _RGB( RGB ), _outLAB( out_LAB )
+        : _in_RGB( RGB ), _out_LAB( out_LAB )
     {}
 
     template <typename T>
     bool operator()( const T *beta_params, T *residuals ) const;
 
-    const std::vector<std::vector<double>> _RGB;
-    const std::vector<std::vector<double>> _outLAB;
+    const std::vector<std::vector<double>> _in_RGB;
+    const std::vector<std::vector<double>> _out_LAB;
 };
 
 /// Perform curve fitting optimization to find optimal IDT matrix parameters.
@@ -977,9 +977,9 @@ vector<double> find_XYZ_to_camera_matrix(
         metadata.calibration[1].XYZ_to_RGB_matrix;
 
     double low_mired =
-        std::max( min_mired, std::min( max_mired, std::min( mir1, mir2 ) ) );
+        std::clamp( std::min( mir1, mir2 ), min_mired, max_mired );
     double high_mired =
-        std::max( min_mired, std::min( max_mired, std::max( mir1, mir2 ) ) );
+        std::clamp( std::max( mir1, mir2 ), min_mired, max_mired );
     double mirStep = std::max( 5.0, ( high_mired - low_mired ) / 50.0 );
 
     double current_mired = 0.0, last_mired = 0.0, estimated_mired = 0.0,
@@ -1229,16 +1229,16 @@ vector<vector<double>> MetadataSolver::calculate_IDT_matrix()
 template <typename T>
 bool IDTOptimizationCost::operator()( const T *beta_params, T *residuals ) const
 {
-    vector<vector<T>> RGB_copy( _RGB.size(), vector<T>( 3 ) );
-    for ( size_t i = 0; i < _RGB.size(); i++ )
+    vector<vector<T>> RGB_copy( _in_RGB.size(), vector<T>( 3 ) );
+    for ( size_t i = 0; i < _in_RGB.size(); i++ )
         for ( size_t j = 0; j < 3; j++ )
-            RGB_copy[i][j] = T( _RGB[i][j] );
+            RGB_copy[i][j] = T( _in_RGB[i][j] );
 
     vector<vector<T>> out_calc_LAB =
         XYZ_to_LAB( getCalcXYZt( RGB_copy, beta_params ) );
-    for ( size_t i = 0; i < _RGB.size(); i++ )
+    for ( size_t i = 0; i < _in_RGB.size(); i++ )
         for ( size_t j = 0; j < 3; j++ )
-            residuals[i * 3 + j] = _outLAB[i][j] - out_calc_LAB[i][j];
+            residuals[i * 3 + j] = _out_LAB[i][j] - out_calc_LAB[i][j];
 
     return true;
 }

src/rawtoaces_util/image_converter.cpp

@@ -317,7 +317,8 @@ bool prepare_transform_spectral(
             if ( attr )
             {
                 for ( int i = 0; i < 4; i++ )
-                    tmp_wb_multipliers[i] = attr->get_float_indexed( i );
+                    tmp_wb_multipliers[i] =
+                        static_cast<double>( attr->get_float_indexed( i ) );
             }
         }
 
@@ -428,8 +429,8 @@ bool prepare_transform_DNG(
     // Step 1: Extract basic DNG metadata
     core::Metadata metadata;
 
-    metadata.baseline_exposure =
-        image_spec.get_float_attribute( "raw:dng:baseline_exposure" );
+    metadata.baseline_exposure = static_cast<double>(
+        image_spec.get_float_attribute( "raw:dng:baseline_exposure" ) );
 
     // Step 2: Extract neutral RGB values from camera multipliers
     metadata.neutral_RGB.resize( 3 );
@@ -439,7 +440,8 @@ bool prepare_transform_DNG(
     if ( attr )
     {
         for ( int i = 0; i < 3; i++ )
-            metadata.neutral_RGB[i] = 1.0 / attr->get_float_indexed( i );
+            metadata.neutral_RGB[i] =
+                1.0 / static_cast<double>( attr->get_float_indexed( i ) );
     }
 
     // Step 3: Extract calibration data for two illuminants
@@ -467,7 +469,8 @@ bool prepare_transform_DNG(
                 for ( int j = 0; j < 3; j++ )
                 {
                     calibration.XYZ_to_RGB_matrix[i * 3 + j] =
-                        matrix1_attr->get_float_indexed( i * 3 + j );
+                        static_cast<double>(
+                            matrix1_attr->get_float_indexed( i * 3 + j ) );
                 }
             }
         }
@@ -483,7 +486,8 @@ bool prepare_transform_DNG(
                 for ( int j = 0; j < 3; j++ )
                 {
                     calibration.camera_calibration_matrix[i * 3 + j] =
-                        matrix2_attr->get_float_indexed( i * 4 + j );
+                        static_cast<double>(
+                            matrix2_attr->get_float_indexed( i * 4 + j ) );
                 }
             }
         }
@@ -1296,8 +1300,8 @@ bool ImageConverter::configure(
             settings.crop_box );
     }
 
-    if ( settings.chromatic_aberration[0] != 1.0 &&
-         settings.chromatic_aberration[1] != 1.0 )
+    if ( settings.chromatic_aberration[0] != 1.0f &&
+         settings.chromatic_aberration[1] != 1.0f )
     {
         options.attribute(
             "raw:aber",
@@ -1330,7 +1334,7 @@ bool ImageConverter::configure(
 
                 _wb_multipliers.resize( 4 );
                 for ( size_t i = 0; i < 4; i++ )
-                    _wb_multipliers[i] = custom_WB[i];
+                    _wb_multipliers[i] = static_cast<double>( custom_WB[i] );
             }
             break;
         }
@@ -1368,7 +1372,8 @@ bool ImageConverter::configure(
 
             _wb_multipliers.resize( 4 );
             for ( size_t i = 0; i < 4; i++ )
-                _wb_multipliers[i] = settings.custom_WB[i];
+                _wb_multipliers[i] =
+                    static_cast<double>( settings.custom_WB[i] );
             break;
 
         default:
@@ -1428,7 +1433,8 @@ bool ImageConverter::configure(
                 _idt_matrix[i].resize( 3 );
                 for ( int j = 0; j < 3; j++ )
                 {
-                    _idt_matrix[i][j] = settings.custom_matrix[i][j];
+                    _idt_matrix[i][j] =
+                        static_cast<double>( settings.custom_matrix[i][j] );
                 }
             }
             break;