From ff78e37595c8462f64fd100f928aa1d08539527e Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 24 May 2011 10:17:32 +0000 Subject: [PATCH] Don't require buffer size to be preset if using TJFLAG_NOREALLOC git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@626 632fc199-4ca6-4c93-a231-07263d6284db --- doc/html/annotated.html | 2 +- doc/html/classes.html | 2 +- doc/html/functions.html | 2 +- doc/html/functions_vars.html | 2 +- doc/html/group___turbo_j_p_e_g.html | 6 +++--- doc/html/index.html | 2 +- doc/html/modules.html | 2 +- doc/html/structtjregion.html | 2 +- doc/html/structtjscalingfactor.html | 2 +- doc/html/structtjtransform.html | 2 +- turbojpeg.h | 4 ++-- turbojpegl.c | 18 ++++++++++++------ 12 files changed, 26 insertions(+), 20 deletions(-) diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 3c791b8..09db2cb 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index a294b86..d9b8c9a 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -80,7 +80,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index 4ffd7c9..edf3963 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 13d8121..a10da77 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/group___turbo_j_p_e_g.html b/doc/html/group___turbo_j_p_e_g.html index a79eb9a..2540b94 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -786,7 +786,7 @@ Variables
  • set *jpegBuf to NULL to tell TurboJPEG to allocate the buffer for you, or
  • pre-allocate the buffer to a "worst case" size determined by calling TJBUFSIZE(). This should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees this.)
    • -If you choose option 1 or 3, *jpegSize should be set to the size of your pre-allocated buffer. In any case, unless you have set TJFLAG_NOREALLOC, you should always check *jpegBuf upon return from this function, as it may have changed. +If you choose option 1, *jpegSize should be set to the size of your pre-allocated buffer. In any case, unless you have set TJFLAG_NOREALLOC, you should always check *jpegBuf upon return from this function, as it may have changed. jpegSizepointer to an unsigned long variable which holds the size of the JPEG image buffer. If *jpegBuf points to a pre-allocated buffer, then *jpegSize should be set to the size of the buffer. Upon return, *jpegSize will contain the size of the JPEG image (in bytes.) jpegSubsampthe level of chrominance subsampling to be used when generating the JPEG image (see Chrominance subsampling options.) jpegQualthe image quality of the generated JPEG image (1 = worst, 100 = best) @@ -1301,7 +1301,7 @@ If you choose option 1 or 3, *jpegSize should be set to the size of
  • set dstBufs[i] to NULL to tell TurboJPEG to allocate the buffer for you, or
  • pre-allocate the buffer to a "worst case" size determined by calling TJBUFSIZE() with the cropped width and height. This should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees this.)
    • -If you choose option 1 or 3, dstSizes[i] should be set to the size of your pre-allocated buffer. In any case, unless you have set TJFLAG_NOREALLOC, you should always check dstBufs[i] upon return from this function, as it may have changed. +If you choose option 1, dstSizes[i] should be set to the size of your pre-allocated buffer. In any case, unless you have set TJFLAG_NOREALLOC, you should always check dstBufs[i] upon return from this function, as it may have changed. dstSizespointer to an array of n unsigned long variables which will receive the actual sizes (in bytes) of each transformed JPEG image. If dstBufs[i] points to a pre-allocated buffer, then dstSizes[i] should be set to the size of the buffer. Upon return, dstSizes[i] will contain the size of the JPEG image (in bytes.) transformspointer to an array of n tjtransform structures, each of which specifies the transform parameters and/or cropping region for the corresponding transformed output image. flagsthe bitwise OR of one or more of the flags. @@ -1435,7 +1435,7 @@ If you choose option 1 or 3, dstSizes[i] should be set to the size -
    Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
    Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/index.html b/doc/html/index.html index 44528e9..8969bb0 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -69,7 +69,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
    Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
    Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/modules.html b/doc/html/modules.html index 78d13cc..9328d40 100644 --- a/doc/html/modules.html +++ b/doc/html/modules.html @@ -72,7 +72,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
    Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
    Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index 792f0f2..8a23e46 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -165,7 +165,7 @@ Data Fields -
    Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
    Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index c7be357..ad7858c 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -127,7 +127,7 @@ Data Fields -
    Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
    Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 3ff7d6e..52524b2 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -144,7 +144,7 @@ Data Fields -
    Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +
    Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  doxygen 1.7.4
    diff --git a/turbojpeg.h b/turbojpeg.h index 4bc9147..17bc306 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -440,7 +440,7 @@ DLLEXPORT tjhandle DLLCALL tjInitCompress(void); * calling #TJBUFSIZE(). This should ensure that the buffer never has * to be re-allocated (setting #TJFLAG_NOREALLOC guarantees this.) * . - * If you choose option 1 or 3, *jpegSize should be set to the + * If you choose option 1, *jpegSize should be set to the * size of your pre-allocated buffer. In any case, unless you have * set #TJFLAG_NOREALLOC, you should always check *jpegBuf upon * return from this function, as it may have changed. @@ -692,7 +692,7 @@ DLLEXPORT tjhandle DLLCALL tjInitTransform(void); * ensure that the buffer never has to be re-allocated (setting * #TJFLAG_NOREALLOC guarantees this.) * . - * If you choose option 1 or 3, dstSizes[i] should be set to + * If you choose option 1, dstSizes[i] should be set to * the size of your pre-allocated buffer. In any case, unless you have * set #TJFLAG_NOREALLOC, you should always check dstBufs[i] * upon return from this function, as it may have changed. diff --git a/turbojpegl.c b/turbojpegl.c index 26fed45..37a72c9 100644 --- a/turbojpegl.c +++ b/turbojpegl.c @@ -312,7 +312,7 @@ DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char **jpegBuf, unsigned long *jpegSize, int jpegSubsamp, int jpegQual, int flags) { - int i, retval=0; JSAMPROW *row_pointer=NULL; + int i, retval=0, alloc=1; JSAMPROW *row_pointer=NULL; getinstance(handle) if((this->init&COMPRESS)==0) @@ -339,7 +339,11 @@ DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf, else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); - jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, (flags&TJFLAG_NOREALLOC)==0); + if(flags&TJFLAG_NOREALLOC) + { + alloc=0; *jpegSize=TJBUFSIZE(width, height); + } + jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc); setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual); jpeg_start_compress(cinfo, TRUE); @@ -376,7 +380,6 @@ DLLEXPORT int DLLCALL tjCompress(tjhandle handle, unsigned char *srcBuf, } else { - size=TJBUFSIZE(width, height); retval=tjCompress2(handle, srcBuf, width, pitch, height, getPixelFormat(pixelSize, flags), &jpegBuf, &size, jpegSubsamp, jpegQual, flags|TJFLAG_NOREALLOC); @@ -953,9 +956,7 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf, for(i=0; iimage_width; h=dinfo->image_height; @@ -964,6 +965,11 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf, { w=xinfo[i].crop_width; h=xinfo[i].crop_height; } + if(flags&TJFLAG_NOREALLOC) + { + alloc=0; dstSizes[i]=TJBUFSIZE(w, h); + } + jpeg_mem_dest_tj(cinfo, &dstBufs[i], &dstSizes[i], alloc); jpeg_copy_critical_parameters(dinfo, cinfo); dstcoefs=jtransform_adjust_parameters(dinfo, cinfo, srccoefs, &xinfo[i]); -- 2.40.0