Java code cleanup + Java docs
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@518 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c
index 45727d8..c133969 100644
--- a/turbojpeg-jni.c
+++ b/turbojpeg-jni.c
@@ -34,10 +34,10 @@
#include "java/org_libjpegturbo_turbojpeg_TJDecompressor.h"
#include "java/org_libjpegturbo_turbojpeg_TJ.h"
-static const int _pixelsize[org_libjpegturbo_turbojpeg_TJ_NUMPFOPT]=
+static const int _pixelsize[org_libjpegturbo_turbojpeg_TJ_NUMPF]=
{3, 3, 4, 4, 4, 4, 1};
-static const int _flags[org_libjpegturbo_turbojpeg_TJ_NUMPFOPT]=
+static const int _flags[org_libjpegturbo_turbojpeg_TJ_NUMPF]=
{0, TJ_BGR, 0, TJ_BGR, TJ_BGR|TJ_ALPHAFIRST, TJ_ALPHAFIRST, 0};
#define _throw(msg) { \
@@ -105,7 +105,7 @@
gethandle();
- if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPFOPT || width<1 || height<1
+ if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
|| pitch<0)
_throw("Invalid argument in compress()");
flags|=_flags[pf];
@@ -146,7 +146,7 @@
gethandle();
- if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPFOPT || width<1 || height<1
+ if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
|| pitch<0)
_throw("Invalid argument in compress()");
if(_pixelsize[pf]!=sizeof(jint))
@@ -187,7 +187,7 @@
gethandle();
- if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPFOPT || width<1 || height<1
+ if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
|| pitch<0)
_throw("Invalid argument in encodeYUV()");
flags|=_flags[pf];
@@ -228,7 +228,7 @@
gethandle();
- if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPFOPT || width<1 || height<1
+ if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
|| pitch<0)
_throw("Invalid argument in compress()");
if(_pixelsize[pf]!=sizeof(jint))
@@ -362,7 +362,7 @@
gethandle();
- if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPFOPT)
+ if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
_throw("Invalid argument in decompress()");
flags|=_flags[pf];
pixelsize=_pixelsize[pf];
@@ -401,7 +401,7 @@
gethandle();
- if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPFOPT)
+ if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
_throw("Invalid argument in decompress()");
if(_pixelsize[pf]!=sizeof(jint))
_throw("Pixel format must be 32-bit when decompressing to an integer buffer.");