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

* Get rid of FORI

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

* remove FORJ, FORIJ and fix warnings

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

* More size_t related refactoring

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

* Make build strict

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

* fix semicolon

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

* more gcc11 strict stuff

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

* more function ; removal

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

* Windows based warnings fix

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

* format

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

* fix up max threshold getter

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

---------

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

Author: soswow

CMakeLists.txt

@@ -16,10 +16,16 @@ set(RAWTOACES_UTIL_LIB "rawtoaces_util")
 
 set( CMAKE_MACOSX_RPATH 1 )
 
+# Set strict compiler flags by default for all builds
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-#    set(warnings "/W4 /WX /EHsc")
-    add_compile_options ( /W0 )
+    # MSVC strict flags
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /EHsc")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /WX")
     add_compile_definitions( NOMINMAX )
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    # GCC/Clang strict flags
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -pedantic")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra -pedantic")
 endif()
 
 if (NOT CONFIGURED_ONCE)

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
@@ -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
@@ -263,16 +258,16 @@ inline std::vector<std::string> openDir( std::string path = "." )
     }
 
     return paths;
-};
+}
 
 // Function to covert upper-case to lower-case
 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] = static_cast<char>( tolower( tex[i] ) );
+}
 
 // Function to check if a value is numeric
 inline bool isNumeric( const char *val )
@@ -283,21 +278,21 @@ inline bool isNumeric( const char *val )
     return (
         input.find_first_not_of( base.substr( 0, base.size() ) ) ==
         std::string::npos );
-};
+}
 
 // Function to check if a input is a alphabetic letter
 inline bool isCTLetterDigit( const char c )
 {
     return (
         ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' ) || ( c == '-' ) ||
         isdigit( c ) );
-};
+}
 
 // Function to check if a string is a valid input
 // 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 )
@@ -344,7 +339,7 @@ inline bool isValidCT( std::string str )
         return false;
 
     return true;
-};
+}
 
 } // namespace core
 } // namespace rta