From 693f4a5600ddae8c1efd404a5076458051b84201 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 11 Feb 2014 10:16:42 +0000 Subject: [PATCH 1/2] Fix an issue that prevented tjEncodeYUV2() and TJCompressor.encodeYUV() from working properly if the source image was very tiny. Basically, jpeg_start_compress() was attempting to write the JPEG headers, which was overrunning the YUV buffer. This patch removes the call to jpeg_start_compress() in tjEncodeYUV2() and replaces it with calls to the individual routines that are necessary to initialize the color converter and downsampler. TJUnitTest has also been modified to test for this condition (the buffer size regression test now works in YUV mode.) git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@1121 632fc199-4ca6-4c93-a231-07263d6284db --- ChangeLog.txt | 4 ++++ java/TJUnitTest.java | 30 +++++++++++++++++------- jversion.h | 4 ++-- tjunittest.c | 55 +++++++++++++++++++++++++++++--------------- turbojpeg.c | 17 ++++++++++++-- 5 files changed, 79 insertions(+), 31 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 9d5ae8d1..8027ec81 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -23,6 +23,10 @@ omitted at compile time". [6] Fixed a couple of issues whereby malformed JPEG images would cause libjpeg-turbo to use uninitialized memory during decompression. +[7] Fixed an error ("Buffer passed to JPEG library is too small") that occurred +when calling the TurboJPEG YUV encoding function with a very small (< 5x5) +source image, and added a unit test to check for this error. + 1.2.1 ===== diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java index b88b28ed..eaebf206 100644 --- a/java/TJUnitTest.java +++ b/java/TJUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2012 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2012, 2014 D. R. Commander. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -794,7 +794,7 @@ public class TJUnitTest { private static void bufSizeTest() throws Exception { int w, h, i, subsamp; - byte[] srcBuf, jpegBuf; + byte[] srcBuf, dstBuf; TJCompressor tjc = null; Random r = new Random(); @@ -808,22 +808,34 @@ public class TJUnitTest { if(h % 100 == 0) System.out.format("%04d x %04d\b\b\b\b\b\b\b\b\b\b\b", w, h); srcBuf = new byte[w * h * 4]; - jpegBuf = new byte[TJ.bufSize(w, h, subsamp)]; + if (yuv == YUVENCODE) + dstBuf = new byte[TJ.bufSizeYUV(w, h, subsamp)]; + else + dstBuf = new byte[TJ.bufSize(w, h, subsamp)]; for(i = 0; i < w * h * 4; i++) { srcBuf[i] = (byte)(r.nextInt(2) * 255); } tjc.setSourceImage(srcBuf, w, 0, h, TJ.PF_BGRX); tjc.setSubsamp(subsamp); tjc.setJPEGQuality(100); - tjc.compress(jpegBuf, 0); + if (yuv == YUVENCODE) + tjc.encodeYUV(dstBuf, 0); + else + tjc.compress(dstBuf, 0); srcBuf = new byte[h * w * 4]; - jpegBuf = new byte[TJ.bufSize(h, w, subsamp)]; + if (yuv == YUVENCODE) + dstBuf = new byte[TJ.bufSizeYUV(h, w, subsamp)]; + else + dstBuf = new byte[TJ.bufSize(h, w, subsamp)]; for(i = 0; i < h * w * 4; i++) { srcBuf[i] = (byte)(r.nextInt(2) * 255); } tjc.setSourceImage(srcBuf, h, 0, w, TJ.PF_BGRX); - tjc.compress(jpegBuf, 0); + if (yuv == YUVENCODE) + tjc.encodeYUV(dstBuf, 0); + else + tjc.compress(dstBuf, 0); } } } @@ -870,8 +882,10 @@ public class TJUnitTest { testName); doTest(41, 35, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_GRAY, testName); - if(!doyuv && !bi) bufSizeTest(); - if(doyuv && !bi) { + if(!bi) + bufSizeTest(); + if (doyuv && !bi) { + System.out.print("\n\n"); yuv = YUVDECODE; doTest(48, 48, onlyRGB, TJ.SAMP_444, "javatest_yuv0"); doTest(35, 39, onlyRGB, TJ.SAMP_444, "javatest_yuv1"); diff --git a/jversion.h b/jversion.h index 88c25668..0e3db281 100644 --- a/jversion.h +++ b/jversion.h @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. * Modifications: - * Copyright (C) 2010, 2012, D. R. Commander. + * Copyright (C) 2010, 2012-2014, D. R. Commander. * For conditions of distribution and use, see the accompanying README file. * * This file contains software version identification. @@ -28,5 +28,5 @@ #define JCOPYRIGHT "Copyright (C) 1991-2010 Thomas G. Lane, Guido Vollbeding\n" \ "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \ "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \ - "Copyright (C) 2009-2012 D. R. Commander\n" \ + "Copyright (C) 2009-2014 D. R. Commander\n" \ "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)" diff --git a/tjunittest.c b/tjunittest.c index 89a6d1db..a61d2664 100644 --- a/tjunittest.c +++ b/tjunittest.c @@ -1,5 +1,5 @@ /* - * Copyright (C)2009-2012 D. R. Commander. All Rights Reserved. + * Copyright (C)2009-2012, 2014 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: @@ -531,9 +531,9 @@ void doTest(int w, int h, const int *formats, int nformats, int subsamp, void bufSizeTest(void) { int w, h, i, subsamp; - unsigned char *srcBuf=NULL, *jpegBuf=NULL; + unsigned char *srcBuf=NULL, *dstBuf=NULL; tjhandle handle=NULL; - unsigned long jpegSize=0; + unsigned long dstSize=0; if((handle=tjInitCompress())==NULL) _throwtj(); @@ -548,12 +548,12 @@ void bufSizeTest(void) if(h%100==0) printf("%.4d x %.4d\b\b\b\b\b\b\b\b\b\b\b", w, h); if((srcBuf=(unsigned char *)malloc(w*h*4))==NULL) _throw("Memory allocation failure"); - if(!alloc) + if(!alloc || yuv==YUVENCODE) { - if((jpegBuf=(unsigned char *)tjAlloc(tjBufSize(w, h, subsamp))) - ==NULL) + if(yuv==YUVENCODE) dstSize=tjBufSizeYUV(w, h, subsamp); + else dstSize=tjBufSize(w, h, subsamp); + if((dstBuf=(unsigned char *)tjAlloc(dstSize))==NULL) _throw("Memory allocation failure"); - jpegSize=tjBufSize(w, h, subsamp); } for(i=0; iglobal_state!=CSTATE_START) + _throw("tjEncodeYUV3(): libjpeg API is in the wrong state"); + (*cinfo->err->reset_error_mgr)((j_common_ptr)cinfo); + (*cinfo->dest->init_destination)(cinfo); + jinit_c_master_control(cinfo, FALSE); + jinit_color_converter(cinfo); + jinit_downsampler(cinfo); + jinit_c_prep_controller(cinfo, FALSE); + (*cinfo->mem->realize_virt_arrays)((j_common_ptr)cinfo); + pw=PAD(width, cinfo->max_h_samp_factor); ph=PAD(height, cinfo->max_v_samp_factor); From e2ce3b5eb0fbd4ecf0ccabdf76ff011e7308f98b Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 28 Feb 2014 05:27:55 +0000 Subject: [PATCH 2/2] Remove unused code (the destination manager is not used during YUV encoding, there are no virtual arrays to realize, and jinit_c_prep_controller() is unnecessary because we are not using smoothing.) git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@1129 632fc199-4ca6-4c93-a231-07263d6284db --- turbojpeg.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/turbojpeg.c b/turbojpeg.c index 50fb1e35..6a987f7c 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -535,7 +535,6 @@ DLLEXPORT int DLLCALL tjEncodeYUV2(tjhandle handle, unsigned char *srcBuf, else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); yuvsize=tjBufSizeYUV(width, height, subsamp); - jpeg_mem_dest_tj(cinfo, &dstBuf, &yuvsize, 0); if(setCompDefaults(cinfo, pixelFormat, subsamp, -1, flags)==-1) return -1; /* Execute only the parts of jpeg_start_compress() that we need. If we @@ -545,12 +544,9 @@ DLLEXPORT int DLLCALL tjEncodeYUV2(tjhandle handle, unsigned char *srcBuf, if(cinfo->global_state!=CSTATE_START) _throw("tjEncodeYUV3(): libjpeg API is in the wrong state"); (*cinfo->err->reset_error_mgr)((j_common_ptr)cinfo); - (*cinfo->dest->init_destination)(cinfo); jinit_c_master_control(cinfo, FALSE); jinit_color_converter(cinfo); jinit_downsampler(cinfo); - jinit_c_prep_controller(cinfo, FALSE); - (*cinfo->mem->realize_virt_arrays)((j_common_ptr)cinfo); pw=PAD(width, cinfo->max_h_samp_factor); ph=PAD(height, cinfo->max_v_samp_factor);