File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -435,7 +435,8 @@ std::vector<std::vector<T>> calculate_CAT(
435435template <typename T>
436436vector<vector<T>> XYZ_to_LAB ( const vector<vector<T>> &XYZ )
437437{
438- assert ( XYZ.size () == 190 );
438+ assert ( !XYZ.empty () );
439+ assert ( XYZ[0 ].size () == 3 );
439440 T add = T ( 16.0 / 116.0 );
440441
441442 vector<vector<T>> tmpXYZ ( XYZ.size (), vector<T>( 3 , T ( 1.0 ) ) );
@@ -464,7 +465,7 @@ template <typename T>
464465vector<vector<T>>
465466getCalcXYZt ( const vector<vector<T>> &RGB, const T beta_params[6 ] )
466467{
467- assert ( RGB.size () == 190 );
468+ assert ( ! RGB.empty () );
468469
469470 vector<vector<T>> BV ( 3 , vector<T>( 3 ) );
470471 vector<vector<T>> M ( 3 , vector<T>( 3 ) );
Original file line number Diff line number Diff line change @@ -1232,14 +1232,14 @@ vector<vector<double>> MetadataSolver::calculate_IDT_matrix()
12321232template <typename T>
12331233bool IDTOptimizationCost::operator ()( const T *beta_params, T *residuals ) const
12341234{
1235- vector<vector<T>> RGB_copy ( 190 , vector<T>( 3 ) );
1236- for ( size_t i = 0 ; i < 190 ; i++ )
1235+ vector<vector<T>> RGB_copy ( _RGB. size () , vector<T>( 3 ) );
1236+ for ( size_t i = 0 ; i < _RGB. size () ; i++ )
12371237 for ( size_t j = 0 ; j < 3 ; j++ )
12381238 RGB_copy[i][j] = T ( _RGB[i][j] );
12391239
12401240 vector<vector<T>> out_calc_LAB =
12411241 XYZ_to_LAB ( getCalcXYZt ( RGB_copy, beta_params ) );
1242- for ( size_t i = 0 ; i < 190 ; i++ )
1242+ for ( size_t i = 0 ; i < _RGB. size () ; i++ )
12431243 for ( size_t j = 0 ; j < 3 ; j++ )
12441244 residuals[i * 3 + j] = _outLAB[i][j] - out_calc_LAB[i][j];
12451245
You can’t perform that action at this time.
0 commit comments