analysis

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

Author: antond-weta

.github/workflows/analysis.yml

@@ -59,9 +59,6 @@ jobs:
         shell: bash
         run: |
           build_scripts/install_deps_linux.bash
-
-      - name:  Install sonar-scanner and build-wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@e4882e1621ad2fb48dddfa48287411bed34789b1 # v2.0.2
       
       - name: Configure CMake
         run: >
@@ -84,3 +81,7 @@ jobs:
         with:
           name: "CodeChecker Bug Reports"
           path: ${{ steps.codechecker.outputs.result-html-dir }}
+          
+      - name: "Break build if CodeChecker reported any findings"
+        if: ${{ steps.codechecker.outputs.warnings == 'true' }}
+        run: exit 1

include/rawtoaces/image_converter.h

@@ -277,9 +277,9 @@ class ImageConverter
 
 private:
     // Solved transform of the current image.
-    std::vector<std::vector<double>> _IDT_matrix;
-    std::vector<std::vector<double>> _CAT_matrix;
-    std::vector<double>              _WB_multipliers;
+    std::vector<std::vector<double>> _idt_matrix;
+    std::vector<std::vector<double>> _cat_matrix;
+    std::vector<double>              _wb_multipliers;
 };
 
 } //namespace util

include/rawtoaces/rawtoaces_core.h

@@ -169,8 +169,8 @@ class SpectralSolver
     std::vector<std::string>  _search_directories;
     std::vector<SpectralData> _all_illuminants;
 
-    std::vector<double>              _WB_multipliers;
-    std::vector<std::vector<double>> _IDT_matrix;
+    std::vector<double>              _wb_multipliers;
+    std::vector<std::vector<double>> _idt_matrix;
 };
 
 /// DNG metadata required to calculate an input transform.

src/rawtoaces/main.cpp

@@ -12,13 +12,6 @@ int main( int argc, const char *argv[] )
 #else
     _putenv( (char *)"TZ=UTC" );
 #endif
-    
-    
-    int x;
-    
-    int y = x;
-    std::cerr << y;
-    
 
     rta::util::ImageConverter converter;
 

src/rawtoaces_core/define.h

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Contributors to the rawtoaces Project.
 
-#ifndef _DEFINE_h__
-#define _DEFINE_h__
+#pragma once
 
 #include <string>
 #include <algorithm>
@@ -343,5 +342,3 @@ inline bool isValidCT( std::string str )
 
 } // namespace core
 } // namespace rta
-
-#endif

src/rawtoaces_core/mathOps.h

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Contributors to the rawtoaces Project.
 
-#ifndef _MATHOPS_h__
-#define _MATHOPS_h__
+#pragma once
 
 #include "define.h"
 
@@ -491,5 +490,3 @@ getCalcXYZt( const vector<vector<T>> &RGB, const T beta_params[6] )
 
 } // namespace core
 } // namespace rta
-
-#endif

src/rawtoaces_core/rawtoaces_core.cpp

@@ -55,10 +55,8 @@ void calculate_daylight_SPD( const int &cct_input, Spectrum &spectrum )
         cct = cct_input * 1.0;
     else
     {
-        fprintf(
-            stderr,
-            "The range of Correlated Color Temperature for "
-            "Day Light should be from 4000 to 25000. \n" );
+        std::cerr << "The range of Correlated Color Temperature for "
+                  << "Day Light should be from 4000 to 25000." << std::endl;
         exit( 1 );
     }
 
@@ -104,10 +102,8 @@ void calculate_blackbody_SPD( const int &cct, Spectrum &spectrum )
 {
     if ( cct < 1500 || cct >= 4000 )
     {
-        fprintf(
-            stderr,
-            "The range of Color Temperature for BlackBody "
-            "should be from 1500 to 3999. \n" );
+        std::cerr << "The range of Color Temperature for BlackBody "
+                  << "should be from 1500 to 3999." << std::endl;
         exit( 1 );
     }
 
@@ -147,10 +143,11 @@ void generate_illuminant(
     auto &main_spectral_set = main_iter->second;
 
     // Add the power channel and get a reference to it
-    auto &power_spectrum = main_spectral_set
-                               .emplace_back( SpectralData::SpectralChannel(
-                                   "power", Spectrum( 0 ) ) )
-                               .second;
+    auto &power_spectrum =
+        main_spectral_set
+            .emplace_back(
+                SpectralData::SpectralChannel( "power", Spectrum( 0 ) ) )
+            .second;
 
     illuminant.illuminant = type;
     if ( is_daylight )
@@ -168,15 +165,15 @@ SpectralSolver::SpectralSolver(
     : _search_directories( search_directories )
 {
     verbosity = 0;
-    _IDT_matrix.resize( 3 );
-    _WB_multipliers.resize( 3 );
+    _idt_matrix.resize( 3 );
+    _wb_multipliers.resize( 3 );
     for ( int i = 0; i < 3; i++ )
     {
-        _IDT_matrix[i].resize( 3 );
-        _WB_multipliers[i] = 1.0;
+        _idt_matrix[i].resize( 3 );
+        _wb_multipliers[i] = 1.0;
         for ( size_t j = 0; j < 3; j++ )
         {
-            _IDT_matrix[i][j] = neutral3[i][j];
+            _idt_matrix[i][j] = neutral3[i][j];
         }
     }
 }
@@ -402,7 +399,7 @@ bool SpectralSolver::find_illuminant( const vector<double> &wb )
         {
             sse             = sse_tmp;
             illuminant      = current_illuminant;
-            _WB_multipliers = wb_tmp;
+            _wb_multipliers = wb_tmp;
         }
     }
 
@@ -431,7 +428,7 @@ bool SpectralSolver::calculate_WB()
         return false;
     }
 
-    _WB_multipliers = _calculate_WB( camera, illuminant );
+    _wb_multipliers = _calculate_WB( camera, illuminant );
     return true;
 }
 
@@ -455,7 +452,7 @@ calculate_CM( const SpectralData &camera, const SpectralData &illuminant )
     double g = ( camera_g * illuminant_spectrum ).integrate();
     double b = ( camera_b * illuminant_spectrum ).integrate();
 
-    double max = std::max( r, std::max( g, b ) );
+    double max = std::max( { r, g, b } );
 
     std::vector<double> result( 3 );
     result[0] = max / r;
@@ -746,10 +743,10 @@ bool SpectralSolver::calculate_IDT_matrix()
     double beta_params_start[6] = { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 };
 
     auto TI  = calculate_TI( illuminant, training_data );
-    auto RGB = calculate_RGB( camera, _WB_multipliers, TI );
+    auto RGB = calculate_RGB( camera, _wb_multipliers, TI );
     auto XYZ = calculate_XYZ( observer, illuminant, TI );
 
-    return curveFit( RGB, XYZ, beta_params_start, verbosity, _IDT_matrix );
+    return curveFit( RGB, XYZ, beta_params_start, verbosity, _idt_matrix );
 }
 
 //	=====================================================================
@@ -763,12 +760,12 @@ bool SpectralSolver::calculate_IDT_matrix()
 
 const vector<vector<double>> &SpectralSolver::get_IDT_matrix() const
 {
-    return _IDT_matrix;
+    return _idt_matrix;
 }
 
 const vector<double> &SpectralSolver::get_WB_multipliers() const
 {
-    return _WB_multipliers;
+    return _wb_multipliers;
 }
 
 MetadataSolver::MetadataSolver( const core::Metadata &metadata )
@@ -953,13 +950,13 @@ vector<double> find_XYZ_to_camera_matrix(
 
     if ( metadata.calibration[0].illuminant == 0 )
     {
-        fprintf( stderr, " No calibration illuminants were found. \n " );
+        std::cerr << "No calibration illuminants were found." << std::endl;
         return metadata.calibration[0].XYZ_to_RGB_matrix;
     }
 
     if ( neutral_RGB.size() == 0 )
     {
-        fprintf( stderr, " no neutral RGB values were found. \n " );
+        std::cerr << "No neutral RGB values were found." << std::endl;
         return metadata.calibration[0].XYZ_to_RGB_matrix;
     }
 
@@ -1247,4 +1244,4 @@ bool IDTOptimizationCost::operator()( const T *beta_params, T *residuals ) const
 }
 
 } // namespace core
-} // namespace rta
+} // namespace rta

src/rawtoaces_util/image_converter.cpp

@@ -1328,9 +1328,9 @@ bool ImageConverter::configure(
                     OIIO::TypeDesc( OIIO::TypeDesc::FLOAT, 4 ),
                     custom_WB );
 
-                _WB_multipliers.resize( 4 );
+                _wb_multipliers.resize( 4 );
                 for ( size_t i = 0; i < 4; i++ )
-                    _WB_multipliers[i] = custom_WB[i];
+                    _wb_multipliers[i] = custom_WB[i];
             }
             break;
         }
@@ -1366,9 +1366,9 @@ bool ImageConverter::configure(
                 OIIO::TypeDesc( OIIO::TypeDesc::FLOAT, 4 ),
                 settings.custom_WB );
 
-            _WB_multipliers.resize( 4 );
+            _wb_multipliers.resize( 4 );
             for ( size_t i = 0; i < 4; i++ )
-                _WB_multipliers[i] = settings.custom_WB[i];
+                _wb_multipliers[i] = settings.custom_WB[i];
             break;
 
         default:
@@ -1422,13 +1422,13 @@ bool ImageConverter::configure(
             options["raw:ColorSpace"]        = "raw";
             options["raw:use_camera_matrix"] = 0;
 
-            _IDT_matrix.resize( 3 );
+            _idt_matrix.resize( 3 );
             for ( int i = 0; i < 3; i++ )
             {
-                _IDT_matrix[i].resize( 3 );
+                _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] = settings.custom_matrix[i][j];
                 }
             }
             break;
@@ -1448,9 +1448,9 @@ bool ImageConverter::configure(
         if ( !prepare_transform_spectral(
                  image_spec,
                  settings,
-                 _WB_multipliers,
-                 _IDT_matrix,
-                 _CAT_matrix ) )
+                 _wb_multipliers,
+                 _idt_matrix,
+                 _cat_matrix ) )
         {
             std::cerr << "ERROR: the colour space transform has not been "
                       << "configured properly (spectral mode)." << std::endl;
@@ -1461,12 +1461,12 @@ bool ImageConverter::configure(
         {
             float custom_WB[4];
 
-            for ( size_t i = 0; i < _WB_multipliers.size(); i++ )
+            for ( size_t i = 0; i < _wb_multipliers.size(); i++ )
             {
-                custom_WB[i] = static_cast<float>( _WB_multipliers[i] );
+                custom_WB[i] = static_cast<float>( _wb_multipliers[i] );
             }
-            if ( _WB_multipliers.size() == 3 )
-                custom_WB[3] = static_cast<float>( _WB_multipliers[1] );
+            if ( _wb_multipliers.size() == 3 )
+                custom_WB[3] = static_cast<float>( _wb_multipliers[1] );
 
             options.attribute(
                 "raw:user_mul",
@@ -1483,7 +1483,7 @@ bool ImageConverter::configure(
             options["raw:use_camera_wb"]     = 1;
 
             if ( !prepare_transform_DNG(
-                     image_spec, settings, _IDT_matrix, _CAT_matrix ) )
+                     image_spec, settings, _idt_matrix, _cat_matrix ) )
             {
                 std::cerr << "ERROR: the colour space transform has not been "
                           << "configured properly (metadata mode)."
@@ -1493,12 +1493,12 @@ bool ImageConverter::configure(
         }
         else
         {
-            prepare_transform_nonDNG( _IDT_matrix, _CAT_matrix );
+            prepare_transform_nonDNG( _idt_matrix, _cat_matrix );
         }
     }
     else if ( matrix_method == Settings::MatrixMethod::Adobe )
     {
-        prepare_transform_nonDNG( _IDT_matrix, _CAT_matrix );
+        prepare_transform_nonDNG( _idt_matrix, _cat_matrix );
     }
 
     if ( settings.verbosity > 1 )
@@ -1660,16 +1660,16 @@ bool ImageConverter::apply_matrix(
     if ( !roi.defined() )
         roi = dst.roi();
 
-    if ( _IDT_matrix.size() )
+    if ( _idt_matrix.size() )
     {
-        success = rta::util::apply_matrix( _IDT_matrix, dst, src, roi );
+        success = rta::util::apply_matrix( _idt_matrix, dst, src, roi );
         if ( !success )
             return false;
     }
 
-    if ( _CAT_matrix.size() )
+    if ( _cat_matrix.size() )
     {
-        success = rta::util::apply_matrix( _CAT_matrix, dst, dst, roi );
+        success = rta::util::apply_matrix( _cat_matrix, dst, dst, roi );
         if ( !success )
             return false;
 
@@ -1917,17 +1917,17 @@ bool ImageConverter::process_image( const std::string &input_filename )
 
 const std::vector<double> &ImageConverter::get_WB_multipliers()
 {
-    return _WB_multipliers;
+    return _wb_multipliers;
 }
 
 const std::vector<std::vector<double>> &ImageConverter::get_IDT_matrix()
 {
-    return _IDT_matrix;
+    return _idt_matrix;
 }
 
 const std::vector<std::vector<double>> &ImageConverter::get_CAT_matrix()
 {
-    return _CAT_matrix;
+    return _cat_matrix;
 }
 
 } //namespace util