Skip to content

Get rid of FORI, FORJ, FORIJ and clear warnings #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antond-weta merged 10 commits into from
Sep 14, 2025
Merged

Get rid of FORI, FORJ, FORIJ and clear warnings #195

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dfe8fb7
Get rid of FORI
soswow Sep 13, 2025
21e1489
remove FORJ, FORIJ and fix warnings
soswow Sep 13, 2025
ca49601
More size_t related refactoring
soswow Sep 13, 2025
2196154
Make build strict
soswow Sep 13, 2025
b69bc82
fix semicolon
soswow Sep 13, 2025
316736f
more gcc11 strict stuff
soswow Sep 13, 2025
b77cea4
more function ; removal
soswow Sep 13, 2025
7548215
Windows based warnings fix
soswow Sep 14, 2025
d8a514b
format
soswow Sep 14, 2025
65f2675
fix up max threshold getter
soswow Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/rawtoaces_core/define.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
# define FALSE 0
#endif

#define FORI( val ) for ( int i = 0; i < val; i++ )
#define FORJ( val ) for ( int j = 0; j < val; j++ )
#define FORIJ( val1, val2 ) \
for ( int i = 0; i < val1; i++ ) \
for ( int j = 0; j < val2; j++ )
#define countSize( a ) ( static_cast<int>( sizeof( a ) / sizeof( ( a )[0] ) ) )

namespace rta
Expand Down Expand Up @@ -270,8 +265,8 @@ inline void lowerCase( char *tex )
{
std::string tmp( tex );

FORI( tmp.size() )
tex[i] = tolower( tex[i] );
for ( size_t i = 0; i < tmp.size(); i++ )
tex[i] = tolower( tex[i] );
};

// Function to check if a value is numeric
Expand All @@ -297,7 +292,7 @@ inline bool isCTLetterDigit( const char c )
// to represent color temperature(s) (e.g., D60, 3200K)
inline bool isValidCT( std::string str )
{
int i = 0;
size_t i = 0;
size_t length = str.length();

if ( length == 0 )
Expand Down
108 changes: 65 additions & 43 deletions src/rawtoaces_core/mathOps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace core

template <typename T> int isSquare( const vector<vector<T>> &vm )
{
FORI( vm.size() )
for ( size_t i = 0; i < vm.size(); i++ )
{
if ( vm[i].size() != vm.size() )
return 0;
Expand Down Expand Up @@ -86,31 +86,38 @@ vector<vector<T>> invertVM( const vector<vector<T>> &vMtx )

Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic> m;
m.resize( vMtx.size(), vMtx[0].size() );
FORIJ( m.rows(), m.cols() ) m( i, j ) = vMtx[i][j];
for ( Eigen::Index i = 0; i < m.rows(); i++ )
for ( Eigen::Index j = 0; j < m.cols(); j++ )
m( i, j ) = vMtx[i][j];

// Map < Eigen::Matrix < T, Eigen::Dynamic, Eigen::Dynamic, RowMajor > > m (vMtx[0]);
// m.resize(vMtx.size(), vMtx[0].size());

m = m.inverse();

vector<vector<T>> vMtxR( m.rows(), vector<T>( m.cols() ) );
FORIJ( m.rows(), m.cols() ) vMtxR[i][j] = m( i, j );
for ( Eigen::Index i = 0; i < m.rows(); i++ )
for ( Eigen::Index j = 0; j < m.cols(); j++ )
vMtxR[i][j] = m( i, j );

return vMtxR;
};

template <typename T> vector<T> invertV( const vector<T> &vMtx )
{
int size = std::sqrt( static_cast<int>( vMtx.size() ) );
size_t size = std::sqrt( static_cast<size_t>( vMtx.size() ) );
Copy link
Contributor

@antond-weta antond-weta Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still need this cast?

vector<vector<T>> tmp( size, vector<T>( size ) );

FORIJ( size, size )
tmp[i][j] = vMtx[i * size + j];
for ( size_t i = 0; i < size; i++ )
for ( size_t j = 0; j < size; j++ )
tmp[i][j] = vMtx[i * size + j];

tmp = invertVM( tmp );
vector<T> result( vMtx.size() );

FORIJ( size, size ) result[i * size + j] = tmp[i][j];
for ( size_t i = 0; i < size; i++ )
for ( size_t j = 0; j < size; j++ )
result[i * size + j] = tmp[i][j];

return result;
};
Expand All @@ -122,7 +129,7 @@ template <typename T> vector<T> diagV( const vector<T> &vct )
int length = static_cast<int>( vct.size() );
vector<T> vctdiag( length * length, T( 0.0 ) );

FORI( length )
for ( int i = 0; i < length; i++ )
{
vctdiag[i * length + i] = vct[i];
}
Expand All @@ -138,11 +145,15 @@ vector<vector<T>> transposeVec( const vector<vector<T>> &vMtx )
Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic> m;
m.resize( vMtx.size(), vMtx[0].size() );

FORIJ( m.rows(), m.cols() ) m( i, j ) = vMtx[i][j];
for ( Eigen::Index i = 0; i < m.rows(); i++ )
for ( Eigen::Index j = 0; j < m.cols(); j++ )
m( i, j ) = vMtx[i][j];
m.transposeInPlace();

vector<vector<T>> vTran( m.rows(), vector<T>( m.cols() ) );
FORIJ( m.rows(), m.cols() ) vTran[i][j] = m( i, j );
for ( Eigen::Index i = 0; i < m.rows(); i++ )
for ( Eigen::Index j = 0; j < m.cols(); j++ )
vTran[i][j] = m( i, j );

return vTran;
};
Expand All @@ -151,7 +162,8 @@ template <typename T> T sumVector( const vector<T> &vct )
{
Eigen::Matrix<T, Eigen::Dynamic, 1> v;
v.resize( vct.size(), 1 );
FORI( v.rows() ) v( i, 0 ) = vct[i];
for ( int i = 0; i < v.rows(); i++ )
v( i, 0 ) = vct[i];

return v.sum();
};
Expand All @@ -161,12 +173,12 @@ template <typename T> T sumVectorM( const vector<vector<T>> &vct )
size_t row = vct.size();
size_t col = vct[0].size();

T sum = T( 0 );
Eigen::Matrix<T, Eigen::Dynamic, 1> v;
v.resize( row * col, 1 );

FORIJ( row, col )
v( i * col + j ) = vct[i][j];
for ( size_t i = 0; i < row; i++ )
for ( size_t j = 0; j < col; j++ )
v( i * col + j ) = vct[i][j];

return v.sum();
};
Expand All @@ -176,10 +188,12 @@ template <typename T> void scaleVector( vector<T> &vct, const T scale )
Eigen::Matrix<T, Eigen::Dynamic, 1> v;
v.resize( vct.size(), 1 );

FORI( vct.size() ) v( i, 0 ) = vct[i];
for ( size_t i = 0; i < vct.size(); i++ )
v( i, 0 ) = vct[i];
v *= scale;

FORI( vct.size() ) vct[i] = v( i, 0 );
for ( size_t i = 0; i < vct.size(); i++ )
vct[i] = v( i, 0 );

return;
};
Expand All @@ -193,7 +207,7 @@ vector<T> mulVectorElement( const vector<T> &vct1, const vector<T> &vct2 )
a1.resize( vct1.size(), 1 );
a2.resize( vct1.size(), 1 );

FORI( a1.rows() )
for ( int i = 0; i < a1.rows(); i++ )
{
a1( i, 0 ) = vct1[i];
a2( i, 0 ) = vct2[i];
Expand All @@ -211,8 +225,8 @@ vector<T> mulVector( vector<T> vct1, vector<T> vct2, int k = 3 )
int rows = ( static_cast<int>( vct1.size() ) ) / k;
int cols = ( static_cast<int>( vct2.size() ) ) / k;

assert( rows * k == vct1.size() );
assert( k * cols == vct2.size() );
assert( static_cast<size_t>( rows * k ) == vct1.size() );
assert( static_cast<size_t>( k * cols ) == vct2.size() );

vector<T> vct3( rows * cols );
T *pA = &vct1[0];
Expand Down Expand Up @@ -243,15 +257,19 @@ mulVector( const vector<vector<T>> &vct1, const vector<vector<T>> &vct2 )
m1.resize( vct1.size(), vct1[0].size() );
m2.resize( vct2[0].size(), vct2.size() );

FORIJ( m1.rows(), m1.cols() )
m1( i, j ) = vct1[i][j];
FORIJ( m2.rows(), m2.cols() )
m2( i, j ) = vct2[j][i];
for ( Eigen::Index i = 0; i < m1.rows(); i++ )
for ( Eigen::Index j = 0; j < m1.cols(); j++ )
m1( i, j ) = vct1[i][j];
for ( Eigen::Index i = 0; i < m2.rows(); i++ )
for ( Eigen::Index j = 0; j < m2.cols(); j++ )
m2( i, j ) = vct2[j][i];

m3 = m1 * m2;

vector<vector<T>> vct3( m3.rows(), vector<T>( m3.cols() ) );
FORIJ( m3.rows(), m3.cols() ) vct3[i][j] = m3( i, j );
for ( Eigen::Index i = 0; i < m3.rows(); i++ )
for ( Eigen::Index j = 0; j < m3.cols(); j++ )
vct3[i][j] = m3( i, j );

return vct3;
};
Expand All @@ -265,10 +283,11 @@ vector<T> mulVector( const vector<vector<T>> &vct1, const vector<T> &vct2 )
m1.resize( vct1.size(), vct1[0].size() );
m2.resize( vct2.size(), 1 );

FORIJ( m1.rows(), m1.cols() )
m1( i, j ) = vct1[i][j];
FORI( m2.rows() )
m2( i, 0 ) = vct2[i];
for ( Eigen::Index i = 0; i < m1.rows(); i++ )
for ( Eigen::Index j = 0; j < m1.cols(); j++ )
m1( i, j ) = vct1[i][j];
for ( Eigen::Index i = 0; i < m2.rows(); i++ )
m2( i, 0 ) = vct2[i];

m3 = m1 * m2;

Expand Down Expand Up @@ -298,8 +317,8 @@ T calculate_SSE( const vector<T> &tcp, const vector<T> &src )
vector<T> tmp( src.size() );

T sum = T( 0.0 );
FORI( tcp.size() )
sum += std::pow( ( tcp[i] / src[i] - 1.0 ), T( 2.0 ) );
for ( size_t i = 0; i < tcp.size(); i++ )
sum += std::pow( ( tcp[i] / src[i] - 1.0 ), T( 2.0 ) );

return sum;
};
Expand All @@ -310,7 +329,7 @@ int findIndexInterp1( T val, const vector<T> &x, int size )
T dist = T( 1e9 );
int index = -1;

FORI( size )
for ( int i = 0; i < size; i++ )
{
T tmp = val - x[i];
if ( tmp < dist && tmp >= T( 0 ) )
Expand All @@ -331,7 +350,7 @@ vector<T> interp1DLinear(

vector<T> slope, intercept, Y1;

FORI( X0.size() - 1 )
for ( size_t i = 0; i < X0.size() - 1; i++ )
{
slope.push_back( ( Y0[i + 1] - Y0[i] ) / ( X0[i + 1] - X0[i] ) );
intercept.push_back( Y0[i] - X0[i] * slope[i] );
Expand All @@ -340,7 +359,7 @@ vector<T> interp1DLinear(
slope.push_back( slope[slope.size() - 1] );
intercept.push_back( intercept[intercept.size() - 1] );

FORI( X1.size() )
for ( size_t i = 0; i < X1.size(); i++ )
{
int index = findIndexInterp1( X1[i], X0, int( X0.size() ) );
if ( index != -1 )
Expand Down Expand Up @@ -420,17 +439,18 @@ vector<vector<T>> XYZ_to_LAB( const vector<vector<T>> &XYZ )
T add = T( 16.0 / 116.0 );

vector<vector<T>> tmpXYZ( XYZ.size(), vector<T>( 3, T( 1.0 ) ) );
FORIJ( XYZ.size(), 3 )
{
tmpXYZ[i][j] = XYZ[i][j] / ACES_white_point_XYZ[j];
if ( tmpXYZ[i][j] > T( e ) )
tmpXYZ[i][j] = ceres::pow( tmpXYZ[i][j], T( 1.0 / 3.0 ) );
else
tmpXYZ[i][j] = T( k ) * tmpXYZ[i][j] + add;
}
for ( size_t i = 0; i < XYZ.size(); i++ )
for ( size_t j = 0; j < 3; j++ )
{
tmpXYZ[i][j] = XYZ[i][j] / ACES_white_point_XYZ[j];
if ( tmpXYZ[i][j] > T( e ) )
tmpXYZ[i][j] = ceres::pow( tmpXYZ[i][j], T( 1.0 / 3.0 ) );
else
tmpXYZ[i][j] = T( k ) * tmpXYZ[i][j] + add;
}

vector<vector<T>> outCalcLab( XYZ.size(), vector<T>( 3 ) );
FORI( XYZ.size() )
for ( size_t i = 0; i < XYZ.size(); i++ )
{
outCalcLab[i][0] = T( 116.0 ) * tmpXYZ[i][1] - T( 16.0 );
outCalcLab[i][1] = T( 500.0 ) * ( tmpXYZ[i][0] - tmpXYZ[i][1] );
Expand All @@ -449,7 +469,9 @@ getCalcXYZt( const vector<vector<T>> &RGB, const T beta_params[6] )
vector<vector<T>> BV( 3, vector<T>( 3 ) );
vector<vector<T>> M( 3, vector<T>( 3 ) );

FORIJ( 3, 3 ) M[i][j] = T( acesrgb_XYZ_3[i][j] );
for ( size_t i = 0; i < 3; i++ )
for ( size_t j = 0; j < 3; j++ )
M[i][j] = T( acesrgb_XYZ_3[i][j] );

BV[0][0] = beta_params[0];
BV[0][1] = beta_params[1];
Expand Down
Loading
Loading