Mirrors/libjpeg-turbo
0
0
Fork 0
mirror of https://github.com/libjpeg-turbo/libjpeg-turbo.git synced 2026-01-18 21:41:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
DRC
2024-08-22 17:14:37 -04:00
parent ecf7c8b168 0acb084464
commit a98bc9a54f
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/org/libjpegturbo/turbojpeg/TJCompressor.java
View File

@@ -348,6 +348,8 @@ public class TJCompressor implements Closeable {
DataBufferInt db = (DataBufferInt)wr.getDataBuffer();
srcBufInt = db.getData();
srcBuf8 = null;
srcBuf12 = null;
srcBuf16 = null;
} else {
ComponentSampleModel sm =
(ComponentSampleModel)srcImage.getSampleModel();
@@ -357,6 +359,8 @@ public class TJCompressor implements Closeable {
srcPitch = sm.getScanlineStride();
DataBufferByte db = (DataBufferByte)wr.getDataBuffer();
srcBuf8 = db.getData();
srcBuf12 = null;
srcBuf16 = null;
srcBufInt = null;
}
srcYUVImage = null;
@@ -377,6 +381,8 @@ public class TJCompressor implements Closeable {
srcYUVImage = srcImage;
set(TJ.PARAM_SUBSAMP, srcImage.getSubsamp());
srcBuf8 = null;
srcBuf12 = null;
srcBuf16 = null;
srcBufInt = null;
}

31
java/turbojpeg-jni.c
View File

@@ -91,6 +91,8 @@
cArray = NULL; \
}
#define PAD(v, p) ((v + (p) - 1) & (~((p) - 1)))
/* TurboJPEG 1.2.x: TJ::bufSize() */
JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize
(JNIEnv *env, jclass cls, jint width, jint height, jint jpegSubsamp)
@@ -1274,7 +1276,8 @@ JNIEXPORT jobject JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_loadImage
{
tjhandle handle = NULL;
void *dstBuf = NULL, *jdstPtr;
int width, *warr, height, *harr, pixelFormat, *pfarr, n;
int width, *warr, height, *harr, pixelFormat, *pfarr;
jsize arraySize, pitch;
const char *filename = NULL;
jboolean isCopy;
jobject jdstBuf = NULL;
@@ -1330,13 +1333,14 @@ JNIEXPORT jobject JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_loadImage
pfarr[0] = pixelFormat;
(*env)->ReleasePrimitiveArrayCritical(env, jpixelFormat, pfarr, 0);
n = width * height * tjPixelSize[pixelFormat];
pitch = PAD(width * tjPixelSize[pixelFormat], align);
arraySize = pitch * height;
if (precision <= 8)
jdstBuf = (*env)->NewByteArray(env, n);
jdstBuf = (*env)->NewByteArray(env, arraySize);
else
jdstBuf = (*env)->NewShortArray(env, n);
jdstBuf = (*env)->NewShortArray(env, arraySize);
BAILIF0NOEC(jdstPtr = (*env)->GetPrimitiveArrayCritical(env, jdstBuf, 0));
memcpy(jdstPtr, dstBuf, n * (precision > 8 ? 2 : 1));
memcpy(jdstPtr, dstBuf, arraySize * (precision > 8 ? 2 : 1));
(*env)->ReleasePrimitiveArrayCritical(env, jdstBuf, jdstPtr, 0);
bailout:
@@ -1353,29 +1357,32 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_saveImage
tjhandle handle = NULL;
void *srcBuf = NULL, *jsrcPtr;
const char *filename = NULL;
int n;
jsize arraySize, actualPitch;
jboolean isCopy;
GET_HANDLE();
if (precision < 2 || precision > 16 || jfilename == NULL ||
jsrcBuf == NULL || width < 1 || height < 1 || pixelFormat < 0 ||
pixelFormat >= TJ_NUMPF)
jsrcBuf == NULL || width < 1 || pitch < 0 || height < 1 ||
pixelFormat < 0 || pixelFormat >= org_libjpegturbo_turbojpeg_TJ_NUMPF)
THROW_ARG("Invalid argument in saveImage()");
if (org_libjpegturbo_turbojpeg_TJ_NUMPF != TJ_NUMPF)
THROW_ARG("Mismatch between Java and C API");
if ((unsigned long long)width * (unsigned long long)height *
(unsigned long long)tjPixelSize[pixelFormat] >
(unsigned long long)((unsigned int)-1))
THROW_ARG("Image is too large");
n = width * height * tjPixelSize[pixelFormat];
if ((*env)->GetArrayLength(env, jsrcBuf) < n)
actualPitch = (pitch == 0) ? width * tjPixelSize[pixelFormat] : pitch;
arraySize = actualPitch * height;
if ((*env)->GetArrayLength(env, jsrcBuf) < arraySize)
THROW_ARG("Source buffer is not large enough");
if ((srcBuf = malloc(n * (precision > 8 ? 2 : 1))) == NULL)
if ((srcBuf = malloc(arraySize * (precision > 8 ? 2 : 1))) == NULL)
THROW_MEM();
BAILIF0NOEC(jsrcPtr = (*env)->GetPrimitiveArrayCritical(env, jsrcBuf, 0));
memcpy(srcBuf, jsrcPtr, n * (precision > 8 ? 2 : 1));
memcpy(srcBuf, jsrcPtr, arraySize * (precision > 8 ? 2 : 1));
(*env)->ReleasePrimitiveArrayCritical(env, jsrcBuf, jsrcPtr, 0);
BAILIF0(filename = (*env)->GetStringUTFChars(env, jfilename, &isCopy));