Browse Source

[cpp] Fix compiler warnings on Clang.

Mario Zechner 3 years ago
parent
commit
7cf42c814b

+ 3 - 3
spine-cpp/spine-cpp/include/spine/Atlas.h

@@ -55,7 +55,7 @@ namespace spine {
 #else
 	#define TEXTURE_FILTER_ENUM TextureFilter
 #endif
-	
+
 	enum TEXTURE_FILTER_ENUM {
 		TextureFilter_Unknown,
 		TextureFilter_Nearest,
@@ -78,8 +78,8 @@ namespace spine {
 		String name;
 		String texturePath;
 		Format format;
-		SpineTextureFilter minFilter;
-		SpineTextureFilter magFilter;
+		TEXTURE_FILTER_ENUM minFilter;
+		TEXTURE_FILTER_ENUM magFilter;
 		TextureWrap uWrap;
 		TextureWrap vWrap;
 		int width, height;

+ 1 - 1
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp

@@ -1382,7 +1382,7 @@ Animation *SkeletonJson::readAnimation(Json *root, SkeletonData *skeletonData) {
 					originalIndex++;
 				}
 				/* Collect remaining unchanged items. */
-				while (originalIndex < (int)skeletonData->_slots.size())
+				while ((int)originalIndex < (int)skeletonData->_slots.size())
 					unchanged[unchangedIndex++] = (int)originalIndex++;
 				/* Fill in unchanged items. */
 				for (ii = (int) skeletonData->_slots.size() - 1; ii >= 0; ii--)

+ 1 - 1
spine-cpp/spine-cpp/src/spine/Triangulator.cpp

@@ -45,7 +45,7 @@ Vector<int> &Triangulator::triangulate(Vector<float> &vertices) {
 	indices.clear();
 	indices.ensureCapacity(vertexCount);
 	indices.setSize(vertexCount, 0);
-	for (int i = 0; i < vertexCount; ++i) {
+	for (int i = 0; i < (int)vertexCount; ++i) {
 		indices[i] = i;
 	}