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
This commit is contained in:
parent
bc3a113b0f
commit
89d4f55cbf
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user