From 05f544c14d169548b2ee1ac96bdc87dc6eb15337 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 4 Apr 2016 22:31:28 +0200 Subject: [PATCH] Added "unknown" atlas format and filter enum value. closes #515 --- spine-c/include/spine/Atlas.h | 6 +++++- spine-c/src/spine/Atlas.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spine-c/include/spine/Atlas.h b/spine-c/include/spine/Atlas.h index 15b9aabf3..4f038db3d 100644 --- a/spine-c/include/spine/Atlas.h +++ b/spine-c/include/spine/Atlas.h @@ -39,6 +39,7 @@ extern "C" { typedef struct spAtlas spAtlas; typedef enum { + SP_ATLAS_UNKNOWN_FORMAT, SP_ATLAS_ALPHA, SP_ATLAS_INTENSITY, SP_ATLAS_LUMINANCE_ALPHA, @@ -49,6 +50,7 @@ typedef enum { } spAtlasFormat; typedef enum { + SP_ATLAS_UNKNOWN_FILTER, SP_ATLAS_NEAREST, SP_ATLAS_LINEAR, SP_ATLAS_MIPMAP, @@ -59,7 +61,9 @@ typedef enum { } spAtlasFilter; typedef enum { - SP_ATLAS_MIRROREDREPEAT, SP_ATLAS_CLAMPTOEDGE, SP_ATLAS_REPEAT + SP_ATLAS_MIRROREDREPEAT, + SP_ATLAS_CLAMPTOEDGE, + SP_ATLAS_REPEAT } spAtlasWrap; typedef struct spAtlasPage spAtlasPage; diff --git a/spine-c/src/spine/Atlas.c b/spine-c/src/spine/Atlas.c index a076dd6e0..3c1b185f6 100644 --- a/spine-c/src/spine/Atlas.c +++ b/spine-c/src/spine/Atlas.c @@ -145,7 +145,7 @@ static int indexOf (const char** array, int count, Str* str) { int i; for (i = count - 1; i >= 0; i--) if (strncmp(array[i], str->begin, length) == 0) return i; - return -1; + return 0; } static int equals (Str* str, const char* other) {