diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-03-15 20:52:02 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-03-15 20:52:02 +0000 |
| commit | 92549de2c2b139070294aec12ec39b7c86a56b52 (patch) | |
| tree | d1e73f31bc387f204ead06de135e421583ce0876 /turbojpeg-jni.c | |
| parent | d932e582178e2352b7e1da5622183e3e6082f5b3 (diff) | |
| download | libjpeg-turbo-92549de2c2b139070294aec12ec39b7c86a56b52.tar.gz | |
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
Diffstat (limited to 'turbojpeg-jni.c')
| -rw-r--r-- | turbojpeg-jni.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c index 45727d82..c133969b 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 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3 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 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3 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 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ 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 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ 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 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress 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 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress 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."); |