Started using asserts

CMakeLists.txt

@@ -32,6 +32,20 @@ set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
 
 set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
 
+# Flags for all builds
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
+
+# Flags for Debug build
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
+
+# Flags for Releasae builds
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG -O2")
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
+
 # Add subdirectories
 add_subdirectory (src)
 add_subdirectory (test)

cmake/Config.h.in

@@ -1,2 +1,2 @@
-#define VERSION "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@"
+#define VERSION "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@ (@CMAKE_BUILD_TYPE@)"
 #define BUILD_HOST "@OpenRaider_BUILD_HOST@"

src/CMakeLists.txt

@@ -47,19 +47,6 @@ endif (APPLE)
 
 #################################################################
 
-# Flags for all builds
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
-
-# Flags for Debug build
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
-
-# Flags for Releasae builds
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer -O2")
-
 # Apply Flags
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_DEBUG}")

src/utils/tga.cpp

@@ -11,16 +11,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <assert.h>
 
 #include "utils/tga.h"
 
 int tgaCheck(FILE *f) {
     char buffer[10];
 
-    if (!f) {
-        perror("tgaCheck> Passed invalid file.\n");
-        return -1;
-    }
+    assert(f != NULL);
 
     /* Read the header */
     fseek(f, 0, SEEK_SET);
@@ -46,10 +44,11 @@ int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *h
     unsigned int size;
     unsigned int i, j;
 
-    if (!f) {
-        fprintf(stderr, "tgaLoad> Invalid parameters.\n");
-        return -1;
-    }
+    assert(f != NULL);
+    assert(image != NULL);
+    assert(width != NULL);
+    assert(height != NULL);
+    assert(type != NULL);
 
     fseek(f, 0, SEEK_SET);
 
@@ -264,10 +263,10 @@ int tgaSave(FILE *f, unsigned char *image, unsigned int width, unsigned int heig
     //unsigned int i;
     //unsigned char tmp;
 
-    if (!f || !image || !width || !height) {
-        fprintf(stderr, "tgaSave> Invalid parameters.\n");
-        return -1;
-    }
+    assert(f != NULL);
+    assert(image != NULL);
+    assert(width > 0);
+    assert(height > 0);
 
     strncpy(comment, "OpenRaider TGA", 63);
     comment[63] = 0;
@@ -361,6 +360,12 @@ int tgaSaveFilename(unsigned char *image, unsigned int width, unsigned int heigh
     FILE *f;
     int v;
     va_list args;
+
+    assert(image != NULL);
+    assert(width > 0);
+    assert(height > 0);
+    assert(s != NULL);
+
     va_start(args, s);
     vsnprintf(buffer, 1023, s, args);
     va_end(args);