Cleanup enums in TGAImage.h and actually print error value in the test file.

This commit is contained in:
Aaron Helton
2017-04-13 20:11:20 -04:00
parent 376bad5aee
commit 82eb6b018d
3 changed files with 19 additions and 21 deletions

View File

@@ -21,8 +21,6 @@ IF (CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GNUCC_WARNINGS} -pg -O0")
ENDIF (CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_TGA_DEBUG=1")
add_executable(TGAReader ${SOURCE_FILES})
target_include_directories(TGAReader PUBLIC ${CMAKE_SOURCE_DIR}/include)

View File

@@ -5,27 +5,27 @@
#include <stdint.h>
typedef enum {
TGA_NO_ERR = 0,
TGA_INV_IMAGE_PNT,
TGA_INV_FILE_PNT,
TGA_MEM_ERR,
TGA_GEN_IO_ERR,
TGA_READ_ERR,
TGA_WRITE_ERR,
TGA_IMAGE_IMMUTABLE_ERR,
TGA_UNSUPPORTED,
TGA_INTERNAL_ERR
TGA_NO_ERR = 0,
TGA_INV_IMAGE_PNT = 1,
TGA_INV_FILE_PNT = 2,
TGA_MEM_ERR = 3,
TGA_GEN_IO_ERR = 4,
TGA_READ_ERR = 5,
TGA_WRITE_ERR = 6,
TGA_IMAGE_IMMUTABLE_ERR = 7,
TGA_UNSUPPORTED = 8,
TGA_INTERNAL_ERR = 9
} TGAError;
typedef enum {
TGA_NO_DATA = 0,
TGA_COLOR_MAPPED = 1,
TGA_TRUECOLOR = 2,
TGA_MONOCHROME = 3,
TGA_ENCODED_COLOR_MAPPED = 9,
TGA_ENCODED_TRUECOLOR = 10,
TGA_ENCODED_MONOCHROME = 11,
TGA_INVALID_TYPE = 255
TGA_NO_DATA = 0,
TGA_COLOR_MAPPED = 1,
TGA_TRUECOLOR = 2,
TGA_MONOCHROME = 3,
TGA_ENCODED_COLOR_MAPPED = 9,
TGA_ENCODED_TRUECOLOR = 10,
TGA_ENCODED_MONOCHROME = 11,
TGA_INVALID_TYPE = 255
} TGAColorType;
struct _NY_TgaMeta;

View File

@@ -26,7 +26,7 @@ int main(int argc, char **argv)
TGAImage *img = read_tga_image(img_file);
if(!img)
{
fprintf(stderr, "Unable to read image.");
fprintf(stderr, "Unable to read image. ERROR: %d\n", tga_error());
return tga_error();
}
print_tga_data(img);