diff --git a/spine-c/spine-c/include/spine/extension.h b/spine-c/spine-c/include/spine/extension.h index d5ec7f3c4..ef84c1dc4 100644 --- a/spine-c/spine-c/include/spine/extension.h +++ b/spine-c/spine-c/include/spine/extension.h @@ -63,6 +63,11 @@ #include +// Required for sprintf and consorts on MSVC +#ifdef _MSC_VER +#pragma warning(disable:4996) +#endif + /* All allocation uses these. */ #define MALLOC(TYPE,COUNT) ((TYPE*)_spMalloc(sizeof(TYPE) * (COUNT), __FILE__, __LINE__)) #define CALLOC(TYPE,COUNT) ((TYPE*)_spCalloc(COUNT, sizeof(TYPE), __FILE__, __LINE__)) diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp index 8cfc0726b..29586a5bb 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp @@ -145,9 +145,9 @@ void SkeletonClipping::clipTriangles(Vector &vertices, size_t verticesLen clippedTriangles.setSize(s + 3 * (clipOutputCount - 2), 0); clipOutputCount--; for (size_t ii = 1; ii < clipOutputCount; ii++) { - clippedTriangles[s] = index; - clippedTriangles[s + 1] = index + ii; - clippedTriangles[s + 2] = index + ii + 1; + clippedTriangles[s] = (unsigned short)(index); + clippedTriangles[s + 1] = (unsigned short)(index + ii); + clippedTriangles[s + 2] = (unsigned short)(index + ii + 1); s += 3; } index += clipOutputCount + 1; @@ -170,9 +170,9 @@ void SkeletonClipping::clipTriangles(Vector &vertices, size_t verticesLen s = clippedTriangles.size(); clippedTriangles.setSize(s + 3, 0); - clippedTriangles[s] = index; - clippedTriangles[s + 1] = index + 1; - clippedTriangles[s + 2] = index + 2; + clippedTriangles[s] = (unsigned short)index; + clippedTriangles[s + 1] = (unsigned short)(index + 1); + clippedTriangles[s + 2] = (unsigned short)(index + 2); index += 3; i += 3; goto continue_outer;