瀏覽代碼

Started using asserts

Thomas Buck 11 年之前
父節點
當前提交
2ad0b33026
共有 4 個檔案被更改,包括 32 行新增26 行删除
  1. 14
    0
      CMakeLists.txt
  2. 1
    1
      cmake/Config.h.in
  3. 0
    13
      src/CMakeLists.txt
  4. 17
    12
      src/utils/tga.cpp

+ 14
- 0
CMakeLists.txt 查看文件

32
 
32
 
33
 set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
33
 set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
34
 
34
 
35
+# Flags for all builds
36
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
37
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
38
+
39
+# Flags for Debug build
40
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
41
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
42
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
43
+
44
+# Flags for Releasae builds
45
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG -O2")
46
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
47
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
48
+
35
 # Add subdirectories
49
 # Add subdirectories
36
 add_subdirectory (src)
50
 add_subdirectory (src)
37
 add_subdirectory (test)
51
 add_subdirectory (test)

+ 1
- 1
cmake/Config.h.in 查看文件

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

+ 0
- 13
src/CMakeLists.txt 查看文件

47
 
47
 
48
 #################################################################
48
 #################################################################
49
 
49
 
50
-# Flags for all builds
51
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
52
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
53
-
54
-# Flags for Debug build
55
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
56
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
57
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
58
-
59
-# Flags for Releasae builds
60
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
61
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer -O2")
62
-
63
 # Apply Flags
50
 # Apply Flags
64
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
51
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
65
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_DEBUG}")
52
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_DEBUG}")

+ 17
- 12
src/utils/tga.cpp 查看文件

11
 #include <stdio.h>
11
 #include <stdio.h>
12
 #include <string.h>
12
 #include <string.h>
13
 #include <stdarg.h>
13
 #include <stdarg.h>
14
+#include <assert.h>
14
 
15
 
15
 #include "utils/tga.h"
16
 #include "utils/tga.h"
16
 
17
 
17
 int tgaCheck(FILE *f) {
18
 int tgaCheck(FILE *f) {
18
     char buffer[10];
19
     char buffer[10];
19
 
20
 
20
-    if (!f) {
21
-        perror("tgaCheck> Passed invalid file.\n");
22
-        return -1;
23
-    }
21
+    assert(f != NULL);
24
 
22
 
25
     /* Read the header */
23
     /* Read the header */
26
     fseek(f, 0, SEEK_SET);
24
     fseek(f, 0, SEEK_SET);
46
     unsigned int size;
44
     unsigned int size;
47
     unsigned int i, j;
45
     unsigned int i, j;
48
 
46
 
49
-    if (!f) {
50
-        fprintf(stderr, "tgaLoad> Invalid parameters.\n");
51
-        return -1;
52
-    }
47
+    assert(f != NULL);
48
+    assert(image != NULL);
49
+    assert(width != NULL);
50
+    assert(height != NULL);
51
+    assert(type != NULL);
53
 
52
 
54
     fseek(f, 0, SEEK_SET);
53
     fseek(f, 0, SEEK_SET);
55
 
54
 
264
     //unsigned int i;
263
     //unsigned int i;
265
     //unsigned char tmp;
264
     //unsigned char tmp;
266
 
265
 
267
-    if (!f || !image || !width || !height) {
268
-        fprintf(stderr, "tgaSave> Invalid parameters.\n");
269
-        return -1;
270
-    }
266
+    assert(f != NULL);
267
+    assert(image != NULL);
268
+    assert(width > 0);
269
+    assert(height > 0);
271
 
270
 
272
     strncpy(comment, "OpenRaider TGA", 63);
271
     strncpy(comment, "OpenRaider TGA", 63);
273
     comment[63] = 0;
272
     comment[63] = 0;
361
     FILE *f;
360
     FILE *f;
362
     int v;
361
     int v;
363
     va_list args;
362
     va_list args;
363
+
364
+    assert(image != NULL);
365
+    assert(width > 0);
366
+    assert(height > 0);
367
+    assert(s != NULL);
368
+
364
     va_start(args, s);
369
     va_start(args, s);
365
     vsnprintf(buffer, 1023, s, args);
370
     vsnprintf(buffer, 1023, s, args);
366
     va_end(args);
371
     va_end(args);

Loading…
取消
儲存