From 9ce1a21ea7fd1b391f52fd5af3c4d4e3628bc8bb Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 26 Apr 2013 05:32:32 +0000 Subject: [PATCH] Subtle point, but since libjpeg-turbo 1.3 now supports scaling factors > 1, the width and height specified in tjDecompress2() are not necessarily smaller than the JPEG width/height. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@957 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 | 12 ++++++------ 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/html/annotated.html b/doc/html/annotated.html index aed62136..03097a9c 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 Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index 480db102..4068ded0 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 Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index 1271078f..f7c05490 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 6698b1f2..782aea01 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 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 bd493b96..86ac6709 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -1004,9 +1004,9 @@ If you choose option 1, *jpegSize should be set to the size of your jpegBufpointer to a buffer containing the JPEG image to decompress jpegSizesize of the JPEG image (in bytes) dstBufpointer to an image buffer that will receive the decompressed image. This buffer should normally be pitch * scaledHeight bytes in size, where scaledHeight can be determined by calling TJSCALED() with the JPEG image height and one of the scaling factors returned by tjGetScalingFactors(). The dstBuf pointer may also be used to decompress into a specific region of a larger buffer. - widthdesired width (in pixels) of the destination image. If this is smaller than the width of the JPEG image being decompressed, then TurboJPEG will use scaling in the JPEG decompressor to generate the largest possible image that will fit within the desired width. If width is set to 0, then only the height will be considered when determining the scaled image size. + widthdesired width (in pixels) of the destination image. If this is different than the width of the JPEG image being decompressed, then TurboJPEG will use scaling in the JPEG decompressor to generate the largest possible image that will fit within the desired width. If width is set to 0, then only the height will be considered when determining the scaled image size. pitchbytes per line of the destination image. Normally, this is scaledWidth * tjPixelSize[pixelFormat] if the decompressed image is unpadded, else TJPAD(scaledWidth * tjPixelSize[pixelFormat]) if each line of the decompressed image is padded to the nearest 32-bit boundary, as is the case for Windows bitmaps. (NOTE: scaledWidth can be determined by calling TJSCALED() with the JPEG image width and one of the scaling factors returned by tjGetScalingFactors().) You can also be clever and use the pitch parameter to skip lines, etc. Setting this parameter to 0 is the equivalent of setting it to scaledWidth * tjPixelSize[pixelFormat]. - heightdesired height (in pixels) of the destination image. If this is smaller than the height of the JPEG image being decompressed, then TurboJPEG will use scaling in the JPEG decompressor to generate the largest possible image that will fit within the desired height. If height is set to 0, then only the width will be considered when determining the scaled image size. + heightdesired height (in pixels) of the destination image. If this is different than the height of the JPEG image being decompressed, then TurboJPEG will use scaling in the JPEG decompressor to generate the largest possible image that will fit within the desired height. If height is set to 0, then only the width will be considered when determining the scaled image size. pixelFormatpixel format of the destination image (see Pixel formats.) flagsthe bitwise OR of one or more of the flags. @@ -1594,7 +1594,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo -
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/index.html b/doc/html/index.html index 46f5beca..c19231fb 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 Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/modules.html b/doc/html/modules.html index 7ce0d104..f4ba3b64 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 Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index a8b0c676..6063ef01 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -165,7 +165,7 @@ Data Fields -
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index ceee28f7..74f235e0 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -127,7 +127,7 @@ Data Fields -
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 9e879f87..bf449998 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -191,7 +191,7 @@ Data Fields -
Generated on Fri Jun 29 2012 18:34:09 for TurboJPEG by  +
Generated on Fri Apr 26 2013 00:23:46 for TurboJPEG by  doxygen 1.7.4
diff --git a/turbojpeg.h b/turbojpeg.h index 7610221b..a61cc1a3 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -1,5 +1,5 @@ /* - * Copyright (C)2009-2012 D. R. Commander. All Rights Reserved. + * Copyright (C)2009-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: @@ -697,7 +697,7 @@ DLLEXPORT tjscalingfactor* DLLCALL tjGetScalingFactors(int *numscalingfactors); * factors returned by #tjGetScalingFactors(). The dstBuf pointer may * also be used to decompress into a specific region of a larger buffer. * @param width desired width (in pixels) of the destination image. If this is - * smaller than the width of the JPEG image being decompressed, then + * different than the width of the JPEG image being decompressed, then * TurboJPEG will use scaling in the JPEG decompressor to generate the * largest possible image that will fit within the desired width. If * width is set to 0, then only the height will be considered when @@ -714,10 +714,10 @@ DLLEXPORT tjscalingfactor* DLLCALL tjGetScalingFactors(int *numscalingfactors); * parameter to 0 is the equivalent of setting it to scaledWidth * * #tjPixelSize[pixelFormat]. * @param height desired height (in pixels) of the destination image. If this - * is smaller than the height of the JPEG image being decompressed, then - * TurboJPEG will use scaling in the JPEG decompressor to generate the - * largest possible image that will fit within the desired height. If - * height is set to 0, then only the width will be considered when + * is different than the height of the JPEG image being decompressed, + * then TurboJPEG will use scaling in the JPEG decompressor to generate + * the largest possible image that will fit within the desired height. + * If height is set to 0, then only the width will be considered when * determining the scaled image size. * @param pixelFormat pixel format of the destination image (see @ref * TJPF "Pixel formats".)