Windows based warnings fix

Signed-off-by: Aleksandr Motsjonov <[email protected]>

Author: soswow

src/rawtoaces_core/define.h

@@ -24,7 +24,7 @@
 #    include <windows.h>
 //#    define snprintf _snprintf
 #    define _CRT_SECURE_NO_WARNINGS
-#    define cmp_str stricmp
+#    define cmp_str _stricmp
 #else
 #    define cmp_str strcasecmp
 #endif
@@ -266,7 +266,7 @@ inline void lowerCase( char *tex )
     std::string tmp( tex );
 
     for ( size_t i = 0; i < tmp.size(); i++ )
-        tex[i] = tolower( tex[i] );
+        tex[i] = static_cast<char>( tolower( tex[i] ) );
 }
 
 // Function to check if a value is numeric

src/rawtoaces_core/mathOps.h

@@ -105,7 +105,7 @@ vector<vector<T>> invertVM( const vector<vector<T>> &vMtx )
 
 template <typename T> vector<T> invertV( const vector<T> &vMtx )
 {
-    size_t            size = std::sqrt( vMtx.size() );
+    size_t            size = static_cast<size_t>( std::sqrt( vMtx.size() ) );
     vector<vector<T>> tmp( size, vector<T>( size ) );
 
     for ( size_t i = 0; i < size; i++ )

src/rawtoaces_core/rawtoaces_core.cpp

@@ -44,7 +44,7 @@ vector<double> CCT_to_xy( const double &cct )
 
 void calculate_daylight_SPD( const int &cct_input, Spectrum &spectrum )
 {
-    int step             = spectrum.shape.step;
+    int step             = static_cast<int>( spectrum.shape.step );
     int wavelength_range = s_series[53].wl - s_series[0].wl;
     assert( wavelength_range % step == 0 );
 
@@ -272,12 +272,12 @@ bool SpectralSolver::load_spectral_data(
     {
         for ( const auto &directory: _search_directories )
         {
-            std::filesystem::path path( directory );
-            path.append( file_path );
+            std::filesystem::path search_path( directory );
+            search_path.append( file_path );
 
-            if ( std::filesystem::exists( path ) )
+            if ( std::filesystem::exists( search_path ) )
             {
-                return out_data.load( path.string() );
+                return out_data.load( search_path.string() );
             }
         }
 
@@ -321,15 +321,15 @@ bool SpectralSolver::find_illuminant( const std::string &type )
     if ( is_daylight )
     {
         int               cct  = atoi( type.substr( 1 ).c_str() );
-        const std::string type = "d" + std::to_string( cct );
-        generate_illuminant( cct, type, true, illuminant );
+        const std::string illuminant_type = "d" + std::to_string( cct );
+        generate_illuminant( cct, illuminant_type, true, illuminant );
         return true;
     }
     else if ( is_blackbody )
     {
         int cct = atoi( type.substr( 0, type.length() - 1 ).c_str() );
-        const std::string type = std::to_string( cct ) + "k";
-        generate_illuminant( cct, type, false, illuminant );
+        const std::string illuminant_type = std::to_string( cct ) + "k";
+        generate_illuminant( cct, illuminant_type, false, illuminant );
         return true;
     }
     else
@@ -364,25 +364,25 @@ bool SpectralSolver::find_illuminant( const vector<double> &wb )
         // Daylight - pre-calculate
         for ( int cct = 4000; cct <= 25000; cct += 500 )
         {
-            SpectralData     &illuminant = _all_illuminants.emplace_back();
+            SpectralData     &illuminant_data = _all_illuminants.emplace_back();
             const std::string type       = "d" + std::to_string( cct / 100 );
-            generate_illuminant( cct, type, true, illuminant );
+            generate_illuminant( cct, type, true, illuminant_data );
         }
 
         // Blackbody - pre-calculate
         for ( int cct = 1500; cct < 4000; cct += 500 )
         {
-            SpectralData     &illuminant = _all_illuminants.emplace_back();
+            SpectralData     &illuminant_data = _all_illuminants.emplace_back();
             const std::string type       = std::to_string( cct ) + "k";
-            generate_illuminant( cct, type, false, illuminant );
+            generate_illuminant( cct, type, false, illuminant_data );
         }
 
         auto illuminant_files = collect_data_files( "illuminant" );
 
         for ( const auto &illuminant_file: illuminant_files )
         {
-            SpectralData &illuminant = _all_illuminants.emplace_back();
-            if ( !illuminant.load( illuminant_file ) )
+            SpectralData &illuminant_data = _all_illuminants.emplace_back();
+            if ( !illuminant_data.load( illuminant_file ) )
             {
                 _all_illuminants.pop_back();
                 continue;

src/rawtoaces_core/spectral_data.cpp

@@ -23,7 +23,7 @@ Spectrum::Spectrum( double value, const Shape &reference_shape )
 {
     if ( shape.step > 0 )
         values.resize(
-            ( shape.last - shape.first + shape.step ) / shape.step, value );
+            static_cast<size_t>( ( shape.last - shape.first + shape.step ) / shape.step ), value );
 }
 
 template <typename Val_or_Ref, typename F>

src/rawtoaces_util/image_converter.cpp

@@ -443,7 +443,7 @@ bool prepare_transform_DNG(
         // Extract illuminant type for this calibration
         auto key = "raw:dng:calibration_illuminant" + index_string;
         metadata.calibration[k].illuminant =
-            image_spec.get_int_attribute( key );
+            static_cast<unsigned short>( image_spec.get_int_attribute( key ) );
 
         // Extract XYZ to RGB color matrix
         auto key1         = "raw:dng:color_matrix" + index_string;
@@ -1026,7 +1026,7 @@ bool ImageConverter::parse_parameters( const OIIO::ArgParse &arg_parser )
         [&]() {
             for ( int i = 0; i < 3; i++ )
                 for ( int j = 0; j < 3; j++ )
-                    settings.custom_matrix[i][j] = i == j ? 1.0 : 0.0;
+                    settings.custom_matrix[i][j] = i == j ? 1.0f : 0.0f;
         } );
 
     auto crop_box = arg_parser["crop-box"].as_vec<int>();
@@ -1065,7 +1065,7 @@ bool ImageConverter::parse_parameters( const OIIO::ArgParse &arg_parser )
     if ( chromatic_aberration.size() == 2 )
     {
         for ( size_t i = 0; i < 2; i++ )
-            settings.chromatic_aberration[i] = chromatic_aberration[i];
+            settings.chromatic_aberration[i] = static_cast<float>( chromatic_aberration[i] );
     }
 
     auto demosaic_algorithm = arg_parser["demosaic"].get();
@@ -1095,7 +1095,7 @@ bool ImageConverter::parse_parameters( const OIIO::ArgParse &arg_parser )
     settings.headroom    = arg_parser["headroom"].get<float>();
     settings.auto_bright = arg_parser["auto-bright"].get<int>();
     settings.adjust_maximum_threshold =
-        arg_parser["adjust-maximum-threshold"].get<int>();
+        static_cast<float>( arg_parser["adjust-maximum-threshold"].get<int>() );
     settings.black_level      = arg_parser["black-level"].get<int>();
     settings.saturation_level = arg_parser["saturation-level"].get<int>();
     settings.half_size        = arg_parser["half-size"].get<int>();
@@ -1401,10 +1401,10 @@ bool ImageConverter::configure(
 
             for ( size_t i = 0; i < _WB_multipliers.size(); i++ )
             {
-                custom_WB[i] = _WB_multipliers[i];
+                custom_WB[i] = static_cast<float>( _WB_multipliers[i] );
             }
             if ( _WB_multipliers.size() == 3 )
-                custom_WB[3] = _WB_multipliers[1];
+                custom_WB[3] = static_cast<float>( _WB_multipliers[1] );
 
             options.attribute(
                 "raw:user_mul",
@@ -1473,7 +1473,7 @@ bool apply_matrix(
         {
             for ( size_t j = 0; j < num_columns; j++ )
             {
-                M[j][i] = matrix[i][j];
+                M[j][i] = static_cast<float>( matrix[i][j] );
             }
 
             for ( size_t j = num_columns; j < 4; j++ )
@@ -1634,8 +1634,8 @@ bool ImageConverter::save_image(
     // - acesImageContainerFlag present,
     // - no compression.
 
-    const float chromaticities[] = { 0.7347, 0.2653, 0,       1,
-                                     0.0001, -0.077, 0.32168, 0.33767 };
+    const float chromaticities[] = { 0.7347f, 0.2653f, 0.0f,       1.0f,
+                                     0.0001f, -0.077f, 0.32168f, 0.33767f };
 
     OIIO::ImageSpec image_spec = buf.spec();
     image_spec.set_format( OIIO::TypeDesc::HALF );