From 1d29c5f97bf5538a771c681ffff91c6fa8709d5c Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 27 Apr 2013 20:54:44 +0000 Subject: [PATCH] Correct misuse of the word "pitch" + more code formatting tweaks git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@970 632fc199-4ca6-4c93-a231-07263d6284db --- java/org/libjpegturbo/turbojpeg/TJ.java | 3 +-- .../libjpegturbo/turbojpeg/TJCompressor.java | 16 ++++++++-------- .../turbojpeg/TJDecompressor.java | 19 ++++++++----------- turbojpeg-jni.c | 12 ++++++------ 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/java/org/libjpegturbo/turbojpeg/TJ.java b/java/org/libjpegturbo/turbojpeg/TJ.java index f182f96..9f7c682 100644 --- a/java/org/libjpegturbo/turbojpeg/TJ.java +++ b/java/org/libjpegturbo/turbojpeg/TJ.java @@ -350,8 +350,7 @@ public final class TJ { * @return the size of the buffer (in bytes) required to hold a YUV planar * image with the given width, height, and level of chrominance subsampling */ - public static native int bufSizeYUV(int width, int height, - int subsamp) + public static native int bufSizeYUV(int width, int height, int subsamp) throws Exception; /** diff --git a/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/java/org/libjpegturbo/turbojpeg/TJCompressor.java index 24c122b..f8f82ac 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java @@ -280,15 +280,15 @@ public class TJCompressor { if (intPixels) { SinglePixelPackedSampleModel sm = (SinglePixelPackedSampleModel)srcImage.getSampleModel(); - int pitch = sm.getScanlineStride(); + int stride = sm.getScanlineStride(); DataBufferInt db = (DataBufferInt)wr.getDataBuffer(); int[] buf = db.getData(); if (srcX >= 0 && srcY >= 0) - compressedSize = compress(buf, srcX, srcY, width, pitch, height, + compressedSize = compress(buf, srcX, srcY, width, stride, height, pixelFormat, dstBuf, subsamp, jpegQuality, flags); else - compressedSize = compress(buf, width, pitch, height, pixelFormat, + compressedSize = compress(buf, width, stride, height, pixelFormat, dstBuf, subsamp, jpegQuality, flags); } else { ComponentSampleModel sm = @@ -435,10 +435,10 @@ public class TJCompressor { if (intPixels) { SinglePixelPackedSampleModel sm = (SinglePixelPackedSampleModel)srcImage.getSampleModel(); - int pitch = sm.getScanlineStride(); + int stride = sm.getScanlineStride(); DataBufferInt db = (DataBufferInt)wr.getDataBuffer(); int[] buf = db.getData(); - encodeYUV(buf, width, pitch, height, pixelFormat, dstBuf, subsamp, + encodeYUV(buf, width, stride, height, pixelFormat, dstBuf, subsamp, flags); } else { ComponentSampleModel sm = @@ -511,7 +511,7 @@ public class TJCompressor { // JPEG size in bytes is returned private native int compress(byte[] srcBuf, int width, int pitch, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, int jpegQual, - int flags) throws Exception; + int flags) throws Exception; // deprecated private native int compress(byte[] srcBuf, int x, int y, int width, int pitch, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, @@ -519,7 +519,7 @@ public class TJCompressor { private native int compress(int[] srcBuf, int width, int stride, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, int jpegQual, - int flags) throws Exception; + int flags) throws Exception; // deprecated private native int compress(int[] srcBuf, int x, int y, int width, int stride, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, @@ -529,7 +529,7 @@ public class TJCompressor { int height, int pixelFormat, byte[] dstBuf, int subsamp, int flags) throws Exception; - private native void encodeYUV(int[] srcBuf, int width, int pitch, + private native void encodeYUV(int[] srcBuf, int width, int stride, int height, int pixelFormat, byte[] dstBuf, int subsamp, int flags) throws Exception; diff --git a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java index c4bb5a3..da51a43 100644 --- a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java @@ -520,12 +520,12 @@ public class TJDecompressor { if (intPixels) { SinglePixelPackedSampleModel sm = (SinglePixelPackedSampleModel)dstImage.getSampleModel(); - int pitch = sm.getScanlineStride(); + int stride = sm.getScanlineStride(); DataBufferInt db = (DataBufferInt)wr.getDataBuffer(); int[] buf = db.getData(); if (jpegBuf == null) throw new Exception(NO_ASSOC_ERROR); - decompress(jpegBuf, jpegBufSize, buf, scaledWidth, pitch, scaledHeight, + decompress(jpegBuf, jpegBufSize, buf, scaledWidth, stride, scaledHeight, pixelFormat, flags); } else { ComponentSampleModel sm = @@ -600,25 +600,22 @@ public class TJDecompressor { private native void decompress(byte[] srcBuf, int size, byte[] dstBuf, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, int flags) - throws Exception; + throws Exception; // deprecated private native void decompress(byte[] srcBuf, int size, byte[] dstBuf, int x, int y, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, - int flags) - throws Exception; + int flags) throws Exception; private native void decompress(byte[] srcBuf, int size, int[] dstBuf, - int desiredWidth, int stride, int desiredHeight, int pixelFormat, int flags) - throws Exception; + int desiredWidth, int stride, int desiredHeight, int pixelFormat, + int flags) throws Exception; // deprecated private native void decompress(byte[] srcBuf, int size, int[] dstBuf, int x, int y, int desiredWidth, int stride, int desiredHeight, int pixelFormat, - int flags) - throws Exception; + int flags) throws Exception; private native void decompressToYUV(byte[] srcBuf, int size, byte[] dstBuf, - int flags) - throws Exception; + int flags) throws Exception; static { TJLoader.load(); diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c index 96a4a68..634bedf 100644 --- a/turbojpeg-jni.c +++ b/turbojpeg-jni.c @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2012 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2013 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -249,7 +249,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ } JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___3IIIII_3BII - (JNIEnv *env, jobject obj, jintArray src, jint width, jint pitch, + (JNIEnv *env, jobject obj, jintArray src, jint width, jint stride, jint height, jint pf, jbyteArray dst, jint subsamp, jint flags) { tjhandle handle=0; @@ -259,14 +259,14 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ gethandle(); if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1 - || pitch<0) - _throw("Invalid argument in compress()"); + || stride<0) + _throw("Invalid argument in encodeYUV()"); if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF) _throw("Mismatch between Java and C API"); if(tjPixelSize[pf]!=sizeof(jint)) _throw("Pixel format must be 32-bit when encoding from an integer buffer."); - arraySize=(pitch==0)? width*height:pitch*height; + arraySize=(stride==0)? width*height:stride*height; if((*env)->GetArrayLength(env, src)GetArrayLength(env, dst) @@ -276,7 +276,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___ bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0)); bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0)); - if(tjEncodeYUV2(handle, srcBuf, width, pitch*sizeof(jint), height, pf, + if(tjEncodeYUV2(handle, srcBuf, width, stride*sizeof(jint), height, pf, dstBuf, subsamp, flags)==-1) { (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0); -- 2.40.0