From 89d4f55cbfd2c0eee67651c7a57f2e46d5175c55 Mon Sep 17 00:00:00 2001 From: Nikos Barkas Date: Sat, 10 Oct 2009 14:10:57 +0000 Subject: [PATCH] Fixed crash in Windows when using multi-contour polygon sprites for missile icons. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2662 127b21dd-08f5-0310-b4b7-95ae10353056 --- src/Core/OOPolygonSprite.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Core/OOPolygonSprite.m b/src/Core/OOPolygonSprite.m index 98efde83..5742cde7 100644 --- a/src/Core/OOPolygonSprite.m +++ b/src/Core/OOPolygonSprite.m @@ -76,11 +76,11 @@ static BOOL GrowTessPolygonData(TessPolygonData *data, size_t capacityHint); // static BOOL AppendVertex(TessPolygonData *data, NSPoint vertex); -static void SolidBeginCallback(GLenum type, void *polygonData); -static void SolidVertexCallback(void *vertexData, void *polygonData); -static void SolidEndCallback(void *polygonData); +static void APIENTRY SolidBeginCallback(GLenum type, void *polygonData); +static void APIENTRY SolidVertexCallback(void *vertexData, void *polygonData); +static void APIENTRY SolidEndCallback(void *polygonData); -static void ErrorCallback(GLenum error, void *polygonData); +static void APIENTRY ErrorCallback(GLenum error, void *polygonData); @implementation OOPolygonSprite @@ -289,7 +289,7 @@ static BOOL AppendVertex(TessPolygonData *data, NSPoint vertex) } -static void SolidBeginCallback(GLenum type, void *polygonData) +static void APIENTRY SolidBeginCallback(GLenum type, void *polygonData) { TessPolygonData *data = polygonData; NSCParameterAssert(data != NULL); @@ -299,7 +299,7 @@ static void SolidBeginCallback(GLenum type, void *polygonData) } -static void SolidVertexCallback(void *vertexData, void *polygonData) +static void APIENTRY SolidVertexCallback(void *vertexData, void *polygonData) { TessPolygonData *data = polygonData; NSValue *vertValue = vertexData; @@ -376,7 +376,7 @@ static void SolidVertexCallback(void *vertexData, void *polygonData) } -static void SolidEndCallback(void *polygonData) +static void APIENTRY SolidEndCallback(void *polygonData) { TessPolygonData *data = polygonData; NSCParameterAssert(data != NULL); @@ -386,7 +386,7 @@ static void SolidEndCallback(void *polygonData) } -static void ErrorCallback(GLenum error, void *polygonData) +static void APIENTRY ErrorCallback(GLenum error, void *polygonData) { TessPolygonData *data = polygonData; NSCParameterAssert(data != NULL);