fixed warnings\nremoved cruft

src/native/common/devil/org_lwjgl_devil_IL.c

@@ -28,7 +28,6 @@ typedef ILvoid				(ILAPIENTRY *ilSetAlphaPROC) ( ILuint AlphaValue );
 typedef ILboolean			(ILAPIENTRY *ilGetBooleanPROC) (ILenum Mode);
 typedef ILvoid				(ILAPIENTRY *ilGetBooleanvPROC) (ILenum Mode, ILboolean *Param);
 typedef ILubyte*			(ILAPIENTRY *ilGetDataPROC) (ILvoid);
-typedef ILuint				(ILAPIENTRY *ilGetDXTCDataPROC) (ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat);
 typedef ILenum				(ILAPIENTRY *ilGetErrorPROC) (ILvoid);
 typedef ILint				(ILAPIENTRY *ilGetIntegerPROC) (ILenum Mode);
 typedef ILvoid				(ILAPIENTRY *ilGetIntegervPROC) (ILenum Mode, ILint *Param);
@@ -41,11 +40,9 @@ typedef ILboolean			(ILAPIENTRY *ilIsDisabledPROC) (ILenum Mode);
 typedef ILboolean			(ILAPIENTRY *ilIsEnabledPROC) (ILenum Mode);
 typedef ILboolean			(ILAPIENTRY *ilIsImagePROC) (ILuint Image);
 typedef ILboolean			(ILAPIENTRY *ilIsValidPROC) (ILenum Type, const ILstring FileName);
-typedef ILboolean			(ILAPIENTRY *ilIsValidFPROC) (ILenum Type, ILHANDLE File);
 typedef ILboolean			(ILAPIENTRY *ilIsValidLPROC) (ILenum Type, ILvoid *Lump, ILuint Size);
 typedef ILvoid				(ILAPIENTRY *ilKeyColourPROC) (ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
 typedef ILboolean			(ILAPIENTRY *ilLoadPROC) (ILenum Type, const ILstring FileName);
-typedef ILboolean			(ILAPIENTRY *ilLoadFPROC) (ILenum Type, ILHANDLE File);
 typedef ILboolean			(ILAPIENTRY *ilLoadImagePROC) (const ILstring FileName);
 typedef ILboolean			(ILAPIENTRY *ilLoadLPROC) (ILenum Type, ILvoid *Lump, ILuint Size);
 typedef ILboolean			(ILAPIENTRY *ilLoadPalPROC) (const ILstring FileName);
@@ -53,32 +50,20 @@ typedef ILboolean			(ILAPIENTRY *ilOriginFuncPROC) (ILenum Mode);
 typedef ILboolean			(ILAPIENTRY *ilOverlayImagePROC) (ILuint Source, ILint XCoord, ILint YCoord, ILint ZCoord);
 typedef ILvoid				(ILAPIENTRY *ilPopAttribPROC) (ILvoid);
 typedef ILvoid				(ILAPIENTRY *ilPushAttribPROC) (ILuint Bits);
-typedef ILvoid				(ILAPIENTRY *ilRegisterFormatPROC) (ILenum Format);
-typedef ILboolean			(ILAPIENTRY *ilRegisterLoadPROC) (const ILstring Ext, IL_LOADPROC Load);
-typedef ILboolean			(ILAPIENTRY *ilRegisterMipNumPROC) (ILuint Num);
-typedef ILboolean			(ILAPIENTRY *ilRegisterNumImagesPROC) (ILuint Num);
-typedef ILvoid				(ILAPIENTRY *ilRegisterOriginPROC) (ILenum Origin);
-typedef ILvoid				(ILAPIENTRY *ilRegisterPalPROC) (ILvoid *Pal, ILuint Size, ILenum Type);
-typedef ILboolean			(ILAPIENTRY *ilRegisterSavePROC) (const ILstring Ext, IL_SAVEPROC Save);
-typedef ILvoid				(ILAPIENTRY *ilRegisterTypePROC) (ILenum Type);
 typedef ILboolean			(ILAPIENTRY *ilRemoveLoadPROC) (const ILstring Ext);
 typedef ILboolean			(ILAPIENTRY *ilRemoveSavePROC) (const ILstring Ext);
 typedef ILvoid				(ILAPIENTRY *ilResetMemoryPROC) (ILvoid);
 typedef ILvoid				(ILAPIENTRY *ilResetReadPROC) (ILvoid);
 typedef ILvoid				(ILAPIENTRY *ilResetWritePROC) (ILvoid);
 typedef ILboolean			(ILAPIENTRY *ilSavePROC) (ILenum Type, const ILstring FileName);
-typedef ILuint				(ILAPIENTRY *ilSaveFPROC) (ILenum Type, ILHANDLE File);
 typedef ILboolean			(ILAPIENTRY *ilSaveImagePROC) (const ILstring FileName);
 typedef ILuint				(ILAPIENTRY *ilSaveLPROC) (ILenum Type, ILvoid *Lump, ILuint Size);
 typedef ILboolean			(ILAPIENTRY *ilSavePalPROC) (const ILstring FileName);
 typedef ILboolean			(ILAPIENTRY *ilSetDataPROC) (ILvoid *Data);
 typedef ILboolean			(ILAPIENTRY *ilSetDurationPROC) (ILuint Duration);
 typedef ILvoid				(ILAPIENTRY *ilSetIntegerPROC) (ILenum Mode, ILint Param);
-typedef ILvoid				(ILAPIENTRY *ilSetMemoryPROC) (mAlloc AllocFunc, mFree FreeFunc);
 typedef ILvoid				(ILAPIENTRY *ilSetPixelsPROC) (ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
-typedef ILvoid				(ILAPIENTRY *ilSetReadPROC) (fOpenRProc Open, fCloseRProc Close, fEofProc Eof, fGetcProc Getc, fReadProc Read, fSeekRProc Seek, fTellRProc Tell);
 typedef ILvoid				(ILAPIENTRY *ilSetStringPROC) (ILenum Mode, const char *String);
-typedef ILvoid				(ILAPIENTRY *ilSetWritePROC) (fOpenWProc Open, fCloseWProc Close, fPutcProc Putc, fSeekWProc Seek, fTellWProc Tell, fWriteProc Write);
 typedef ILvoid				(ILAPIENTRY *ilShutDownPROC) (ILvoid);
 typedef ILboolean			(ILAPIENTRY *ilTexImagePROC) (ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data);
 typedef ILboolean			(ILAPIENTRY *ilTypeFuncPROC) (ILenum Mode);
@@ -87,6 +72,24 @@ typedef ILboolean			(ILAPIENTRY *ilLoadDataFPROC) (ILHANDLE File, ILuint Width,
 typedef ILboolean			(ILAPIENTRY *ilLoadDataLPROC) (ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 typedef ILboolean			(ILAPIENTRY *ilSaveDataPROC) (const ILstring FileName);
 
+// not bound
+//typedef ILuint				(ILAPIENTRY *ilGetDXTCDataPROC) (ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat);
+//typedef ILboolean			(ILAPIENTRY *ilIsValidFPROC) (ILenum Type, ILHANDLE File);
+//typedef ILboolean			(ILAPIENTRY *ilLoadFPROC) (ILenum Type, ILHANDLE File);
+//typedef ILvoid				(ILAPIENTRY *ilRegisterFormatPROC) (ILenum Format);
+//typedef ILboolean			(ILAPIENTRY *ilRegisterLoadPROC) (const ILstring Ext, IL_LOADPROC Load);
+//typedef ILboolean			(ILAPIENTRY *ilRegisterMipNumPROC) (ILuint Num);
+//typedef ILboolean			(ILAPIENTRY *ilRegisterNumImagesPROC) (ILuint Num);
+//typedef ILvoid				(ILAPIENTRY *ilRegisterOriginPROC) (ILenum Origin);
+//typedef ILvoid				(ILAPIENTRY *ilRegisterPalPROC) (ILvoid *Pal, ILuint Size, ILenum Type);
+//typedef ILboolean			(ILAPIENTRY *ilRegisterSavePROC) (const ILstring Ext, IL_SAVEPROC Save);
+//typedef ILvoid				(ILAPIENTRY *ilRegisterTypePROC) (ILenum Type);
+//typedef ILuint				(ILAPIENTRY *ilSaveFPROC) (ILenum Type, ILHANDLE File);
+//typedef ILvoid				(ILAPIENTRY *ilSetMemoryPROC) (mAlloc AllocFunc, mFree FreeFunc);
+//typedef ILvoid				(ILAPIENTRY *ilSetReadPROC) (fOpenRProc Open, fCloseRProc Close, fEofProc Eof, fGetcProc Getc, fReadProc Read, fSeekRProc Seek, fTellRProc Tell);
+//typedef ILvoid				(ILAPIENTRY *ilSetWritePROC) (fOpenWProc Open, fCloseWProc Close, fPutcProc Putc, fSeekWProc Seek, fTellWProc Tell, fWriteProc Write);
+
+
 static ilActiveImagePROC ilActiveImage;
 static ilActiveLayerPROC ilActiveLayer;
 static ilActiveMipmapPROC ilActiveMipmap;
@@ -115,7 +118,6 @@ static ilSetAlphaPROC ilSetAlpha;
 static ilGetBooleanPROC ilGetBoolean;
 static ilGetBooleanvPROC ilGetBooleanv;
 static ilGetDataPROC ilGetData;
-static ilGetDXTCDataPROC ilGetDXTCData;
 static ilGetErrorPROC ilGetError;
 static ilGetIntegerPROC ilGetInteger;
 static ilGetIntegervPROC ilGetIntegerv;
@@ -128,11 +130,9 @@ static ilIsDisabledPROC ilIsDisabled;
 static ilIsEnabledPROC ilIsEnabled;
 static ilIsImagePROC ilIsImage;
 static ilIsValidPROC ilIsValid;
-static ilIsValidFPROC ilIsValidF;
 static ilIsValidLPROC ilIsValidL;
 static ilKeyColourPROC ilKeyColour;
 static ilLoadPROC ilLoad;
-static ilLoadFPROC ilLoadF;
 static ilLoadImagePROC ilLoadImage; 
 static ilLoadLPROC ilLoadL;
 static ilLoadPalPROC ilLoadPal;
@@ -140,40 +140,45 @@ static ilOriginFuncPROC ilOriginFunc;
 static ilOverlayImagePROC ilOverlayImage;
 static ilPopAttribPROC ilPopAttrib;
 static ilPushAttribPROC ilPushAttrib;
-static ilRegisterFormatPROC ilRegisterFormat;
-static ilRegisterLoadPROC ilRegisterLoad;
-static ilRegisterMipNumPROC ilRegisterMipNum;
-static ilRegisterNumImagesPROC ilRegisterNumImages;
-static ilRegisterOriginPROC ilRegisterOrigin;
-static ilRegisterPalPROC ilRegisterPal;
-static ilRegisterSavePROC ilRegisterSave;
-static ilRegisterTypePROC ilRegisterType;
 static ilRemoveLoadPROC ilRemoveLoad;
 static ilRemoveSavePROC ilRemoveSave;
 static ilResetMemoryPROC ilResetMemory;
 static ilResetReadPROC ilResetRead;
 static ilResetWritePROC ilResetWrite;
 static ilSavePROC ilSave;
-static ilSaveFPROC ilSaveF;
 static ilSaveImagePROC ilSaveImage;
 static ilSaveLPROC ilSaveL;
 static ilSavePalPROC ilSavePal;
 static ilSetDataPROC ilSetData;
 static ilSetDurationPROC ilSetDuration;
 static ilSetIntegerPROC ilSetInteger;
-static ilSetMemoryPROC ilSetMemory;
 static ilSetPixelsPROC ilSetPixels;
-static ilSetReadPROC ilSetRead;
 static ilSetStringPROC ilSetString;
-static ilSetWritePROC ilSetWrite;
 static ilShutDownPROC ilShutDown;
 static ilTexImagePROC ilTexImage;
 static ilTypeFuncPROC ilTypeFunc;
 static ilLoadDataPROC ilLoadData;
-static ilLoadDataFPROC ilLoadDataF;
 static ilLoadDataLPROC ilLoadDataL;
 static ilSaveDataPROC ilSaveData;
 
+// not bound
+//static ilGetDXTCDataPROC ilGetDXTCData;
+//static ilIsValidFPROC ilIsValidF;
+//static ilLoadFPROC ilLoadF;
+//static ilRegisterFormatPROC ilRegisterFormat;
+//static ilRegisterLoadPROC ilRegisterLoad;
+//static ilRegisterMipNumPROC ilRegisterMipNum;
+//static ilRegisterNumImagesPROC ilRegisterNumImages;
+//static ilRegisterOriginPROC ilRegisterOrigin;
+//static ilRegisterPalPROC ilRegisterPal;
+//static ilRegisterSavePROC ilRegisterSave;
+//static ilRegisterTypePROC ilRegisterType;
+//static ilSaveFPROC ilSaveF;
+//static ilSetMemoryPROC ilSetMemory;
+//static ilSetReadPROC ilSetRead;
+//static ilSetWritePROC ilSetWrite;
+//static ilLoadDataFPROC ilLoadDataF;
+
 /*
  * Class:     org_lwjgl_devil_IL
  * Method:    ilActiveImage

src/native/common/devil/org_lwjgl_devil_ILU.c

@@ -32,11 +32,8 @@ typedef ILboolean		(ILAPIENTRY *iluMirrorPROC) (ILvoid);
 typedef ILboolean		(ILAPIENTRY *iluNegativePROC) (ILvoid);
 typedef ILboolean		(ILAPIENTRY *iluNoisifyPROC) (ILclampf Tolerance);
 typedef ILboolean		(ILAPIENTRY *iluPixelizePROC) (ILuint PixSize);
-typedef ILvoid			(ILAPIENTRY *iluRegionfvPROC) (ILpointf *Points, ILuint n);
-typedef ILvoid			(ILAPIENTRY *iluRegionivPROC) (ILpointi *Points, ILuint n);
 typedef ILboolean		(ILAPIENTRY *iluReplaceColourPROC) (ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance);
 typedef ILboolean		(ILAPIENTRY *iluRotatePROC) (ILfloat Angle);
-typedef ILboolean		(ILAPIENTRY *iluRotate3DPROC) (ILfloat x, ILfloat y, ILfloat z, ILfloat Angle);
 typedef ILboolean		(ILAPIENTRY *iluSaturate1fPROC) (ILfloat Saturation);
 typedef ILboolean		(ILAPIENTRY *iluSaturate4fPROC) (ILfloat r, ILfloat g, ILfloat b, ILfloat Saturation);
 typedef ILboolean		(ILAPIENTRY *iluScalePROC) (ILuint Width, ILuint Height, ILuint Depth);
@@ -45,6 +42,11 @@ typedef ILboolean		(ILAPIENTRY *iluSharpenPROC) (ILfloat Factor, ILuint Iter);
 typedef ILboolean		(ILAPIENTRY *iluSwapColoursPROC) (ILvoid);
 typedef ILboolean		(ILAPIENTRY *iluWavePROC) (ILfloat Angle);
 
+// not bound
+//typedef ILvoid		(ILAPIENTRY *iluRegionfvPROC) (ILpointf *Points, ILuint n);
+//typedef ILvoid		(ILAPIENTRY *iluRegionivPROC) (ILpointi *Points, ILuint n);
+//typedef ILboolean		(ILAPIENTRY *iluRotate3DPROC) (ILfloat x, ILfloat y, ILfloat z, ILfloat Angle);
+
 static iluAlienifyPROC iluAlienify;
 static iluBlurAvgPROC iluBlurAvg;
 static iluBlurGaussianPROC iluBlurGaussian;
@@ -77,11 +79,8 @@ static iluMirrorPROC iluMirror;
 static iluNegativePROC iluNegative;
 static iluNoisifyPROC iluNoisify;
 static iluPixelizePROC iluPixelize;
-static iluRegionfvPROC iluRegionfv;
-static iluRegionivPROC iluRegioniv;
 static iluReplaceColourPROC iluReplaceColour;
 static iluRotatePROC iluRotate;
-static iluRotate3DPROC iluRotate3D;
 static iluSaturate1fPROC iluSaturate1f;
 static iluSaturate4fPROC iluSaturate4f;
 static iluScalePROC iluScale;
@@ -90,6 +89,11 @@ static iluSharpenPROC iluSharpen;
 static iluSwapColoursPROC iluSwapColours;
 static iluWavePROC iluWave;
 
+// not bound
+//static iluRegionfvPROC iluRegionfv;
+//static iluRegionivPROC iluRegioniv;
+//static iluRotate3DPROC iluRotate3D;
+
 /*
  * Class:     org_lwjgl_devil_ILU
  * Method:    iluAlienify
@@ -440,59 +444,6 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluPixelize(JNIEnv *env, jcl
     return iluPixelize((ILuint)pixSize);
 }
 
-/*
- * Class:     org_lwjgl_devil_ILU
- * Method:    iluRegionfv
- * Signature: ([Lorg/lwjgl/devil/ILpointf;I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluRegionfv(JNIEnv *env, jclass clazz, jobjectArray points, jint n) {
-    /*jfieldID fieldId;
-    jmethodID methodId;
-    jobject element;
-    int i;
-    ILpointf *pointInfo;
-
-    if(points == 0) {
-        throwException(env, "ILpointf array must not be null.");
-    }
-
-    pointInfo = (ILpointf *)malloc(sizeof(ILpointf) * n);
-    iluGetImageInfo(pointInfo, n);
-
-    clazz = (*env)->FindClass(env, "org/lwjgl/devil/ILpointf");
-    methodId = (*env)->GetMethodID(env, clazz, "<init>", "()V");
-
-    for(i=1;i<n;i++) {
-        element = (*env)->NewObject(env, clazz, methodId);
-
-        fieldId = (*env)->GetFieldID(env, clazz, "x", "F");
-        (*env)->SetFloatField(env, element, fieldId, (jfloat)((pointInfo + i)->x));
-
-        fieldId = (*env)->GetFieldID(env, clazz, "y", "F");
-        (*env)->SetFloatField(env, element, fieldId, (jfloat)((pointInfo + i)->y));
-    printf("\nHere 3");
-    printf("\n                         (pointInfo + i)->x) = %f", (pointInfo + i)->x);
-    printf("\n(*env)->GetFloatField(env, element, fieldId) = %f", (*env)->GetFloatField(env, element, fieldId));
-
-    printf("\npoints address=%p", points);
-    printf("\nelement address=%p", element);
-    printf("\ni = %d", i);
-        (*env)->SetObjectArrayElement(env, points, i, element);
-    printf("\nHere 4");
-    }
-    printf("\nHere 5");
-
-    free(pointInfo);*/
-}
-
-/*
- * Class:     org_lwjgl_devil_ILU
- * Method:    iluRegioniv
- * Signature: ([Lorg/lwjgl/devil/ILpointi;I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluRegioniv(JNIEnv *env, jclass clazz, jobjectArray points, jint n) {
-}
-
 /*
  * Class:     org_lwjgl_devil_ILU
  * Method:    iluReplaceColour
@@ -618,7 +569,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_initNativeStubs(JNIEnv *env, jcl
 		{"iluGenImage", "()I", (void*)&Java_org_lwjgl_devil_ILU_iluGenImage, "iluGenImage", (void*)&iluGenImage},
 		{"iluGetImageInfo", "(Lorg/lwjgl/devil/ILinfo;)V", (void*)&Java_org_lwjgl_devil_ILU_iluGetImageInfo, "iluGetImageInfo", (void*)&iluGetImageInfo},
 		{"iluGetInteger", "(I)I", (void*)&Java_org_lwjgl_devil_ILU_iluGetInteger, "iluGetInteger", (void*)&iluGetInteger},
-		//{"niluGetIntegerv", "(ILjava/nio/IntBuffer;)V", (void*)&Java_org_lwjgl_devil_ILU_niluGetIntegerv, "iluGetIntegerv", (void*)&iluGetIntegerv},
+		{"niluGetIntegerv", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_devil_ILU_niluGetIntegerv, "iluGetIntegerv", (void*)&iluGetIntegerv},
 		{"iluGetString", "(I)Ljava/lang/String;", (void*)&Java_org_lwjgl_devil_ILU_iluGetString, "iluGetString", (void*)&iluGetString},
 		{"iluImageParameter", "(II)V", (void*)&Java_org_lwjgl_devil_ILU_iluImageParameter, "iluImageParameter", (void*)&iluImageParameter},
 		{"iluInit", "()V", (void*)&Java_org_lwjgl_devil_ILU_iluInit, "iluInit", (void*)&iluInit},