diff --git a/BUILDING.txt b/BUILDING.txt index a889ed78..e3997859 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -645,7 +645,7 @@ make dmg make udmg [BUILDDIR32={32-bit build directory}] On 64-bit OS X systems, this creates a version of the Macintosh package and - disk image which contains universal i386/x86-64 binaries. You should first + disk image that contains universal i386/x86-64 binaries. You should first configure a 32-bit out-of-tree build of libjpeg-turbo, then configure a 64-bit out-of-tree build, then run 'make udmg' from the 64-bit build directory. The build system will look for the 32-bit build under @@ -658,7 +658,7 @@ make sunpkg make csunpkg [BUILDDIR32={32-bit build directory}] - On 64-bit Solaris systems, this creates a combined package which contains + On 64-bit Solaris systems, this creates a combined package that contains both 32-bit and 64-bit libraries. You should first configure a 32-bit out-of-tree build of libjpeg-turbo, then configure a 64-bit out-of-tree build, then run 'make csunpkg' from the 64-bit build directory. The build diff --git a/README b/README index 2ead09e6..afa052db 100644 --- a/README +++ b/README @@ -62,7 +62,7 @@ OVERVIEW This package contains C software to implement JPEG image encoding, decoding, and transcoding. JPEG (pronounced "jay-peg") is a standardized compression method for full-color and gray-scale images. JPEG's strong suit is compressing -photographic images or other types of images which have smooth color and +photographic images or other types of images that have smooth color and brightness transitions between neighboring pixels. Images with sharp lines or other abrupt features may not compress well with JPEG, and a higher JPEG quality may have to be used to avoid visible compression artifacts with such @@ -274,7 +274,7 @@ FILE FORMAT WARS ================ The ISO JPEG standards committee actually promotes different formats like -"JPEG 2000" or "JPEG XR" which are incompatible with original DCT-based +"JPEG 2000" or "JPEG XR", which are incompatible with original DCT-based JPEG. IJG therefore does not support these formats (see REFERENCES). Indeed, one of the original reasons for developing this free software was to help force convergence on common, interoperable format standards for JPEG files. diff --git a/README-turbo.txt b/README-turbo.txt index ac37556f..b1ed2186 100755 --- a/README-turbo.txt +++ b/README-turbo.txt @@ -2,7 +2,7 @@ ** Background ******************************************************************************* -libjpeg-turbo is a derivative of libjpeg which uses SIMD instructions (MMX, +libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression on x86 and x86-64 systems. On such systems, libjpeg-turbo is generally 2-4x as fast as the unmodified version of libjpeg, all else being equal. @@ -59,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE. ** Using libjpeg-turbo ******************************************************************************* -libjpeg-turbo includes two APIs which can be used to compress and decompress +libjpeg-turbo includes two APIs that can be used to compress and decompress JPEG images: TurboJPEG/OSS: This API wraps libjpeg-turbo and provides an easy-to-use @@ -122,7 +122,7 @@ msvcr90.dll ships with more recent versions of Windows, but users of older Windows releases can obtain it from the Visual C++ 2008 Redistributable Package, which is available as a free download from Microsoft's web site. -NOTE: Features of libjpeg which require passing a C run time structure, such +NOTE: Features of libjpeg that require passing a C run time structure, such as a file handle, from an application to libjpeg will probably not work with the version of the libjpeg-turbo DLL distributed in the libjpeg-turbo SDK for Visual C++, unless the application is also built to use the Visual C++ 2008 C @@ -208,8 +208,8 @@ libjpeg-turbo) or jpeg-static.lib (to use the static version of libjpeg-turbo.) Colorspace Extensions ===================== -libjpeg-turbo includes extensions which allow JPEG images to be compressed -directly from (and decompressed directly to) buffers which use BGR, BGRX, +libjpeg-turbo includes extensions that allow JPEG images to be compressed +directly from (and decompressed directly to) buffers that use BGR, BGRX, RGBX, XBGR, and XRGB pixel ordering. This is implemented with six new colorspace constants: @@ -239,7 +239,7 @@ libjpeg v7 and v8 API/ABI support libjpeg v7 and v8 added new features to the API/ABI, and, unfortunately, the compression and decompression structures were extended in a backward- -incompatible manner to accommodate these features. Thus, programs which are +incompatible manner to accommodate these features. Thus, programs that are built to use libjpeg v7 or v8 did not work with libjpeg-turbo, since it is based on the libjpeg v6b code base. Although libjpeg v7 and v8 are still not as widely used as v6b, enough programs (including a few Linux distros) have @@ -247,7 +247,7 @@ made the switch that it was desirable to provide support for the libjpeg v7/v8 API/ABI in libjpeg-turbo. Some of the libjpeg v7 and v8 features -- DCT scaling, to name one -- involve -deep modifications to the code which cannot be accommodated by libjpeg-turbo +deep modifications to the code that cannot be accommodated by libjpeg-turbo without either breaking compatibility with libjpeg v6b or producing an unsupportable mess. In order to fully support libjpeg v8 with all of its features, we would have to essentially port the SIMD extensions to the libjpeg @@ -258,8 +258,8 @@ releases will also be backward-incompatible. By passing an argument of --with-jpeg7 or --with-jpeg8 to configure, or an argument of -DWITH_JPEG7=1 or -DWITH_JPEG8=1 to cmake, you can build a version -of libjpeg-turbo which emulates the libjpeg v7 or v8 API/ABI, so that programs -which are built against libjpeg v7 or v8 can be run with libjpeg-turbo. The +of libjpeg-turbo that emulates the libjpeg v7 or v8 API/ABI, so that programs +that are built against libjpeg v7 or v8 can be run with libjpeg-turbo. The following section describes which libjpeg v7+ features are supported and which aren't. diff --git a/doc/html/annotated.html b/doc/html/annotated.html index a2f41199..a089c5ae 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 Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index 32f098dd..bdc333f1 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 Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index bf8d5263..3363a218 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 Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 6b340127..6ac28f01 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 Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
Generated on Thu Dec 15 2011 06:54:38 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 8771d830..91835a6f 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -861,7 +861,7 @@ Variables
  • 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, *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.) + jpegSizepointer to an unsigned long variable that 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) flagsthe bitwise OR of one or more of the flags. @@ -945,7 +945,7 @@ If you choose option 1, *jpegSize should be set to the size of your handlea handle to a TurboJPEG decompressor or transformer instance jpegBufpointer to a buffer containing the JPEG image to decompress jpegSizesize of the JPEG image (in bytes) - dstBufpointer to an image buffer which 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. + 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. 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. @@ -1013,9 +1013,9 @@ If you choose option 1, *jpegSize should be set to the size of your handlea handle to a TurboJPEG decompressor or transformer instance jpegBufpointer to a buffer containing a JPEG image jpegSizesize of the JPEG image (in bytes) - widthpointer to an integer variable which will receive the width (in pixels) of the JPEG image - heightpointer to an integer variable which will receive the height (in pixels) of the JPEG image - jpegSubsamppointer to an integer variable which will receive the level of chrominance subsampling used when compressing the JPEG image (see Chrominance subsampling options.) + widthpointer to an integer variable that will receive the width (in pixels) of the JPEG image + heightpointer to an integer variable that will receive the height (in pixels) of the JPEG image + jpegSubsamppointer to an integer variable that will receive the level of chrominance subsampling used when compressing the JPEG image (see Chrominance subsampling options.) @@ -1073,7 +1073,7 @@ If you choose option 1, *jpegSize should be set to the size of your handlea handle to a TurboJPEG decompressor or transformer instance jpegBufpointer to a buffer containing the JPEG image to decompress jpegSizesize of the JPEG image (in bytes) - dstBufpointer to an image buffer which will receive the YUV image. Use tjBufSizeYUV to determine the appropriate size for this buffer based on the image width, height, and level of subsampling. + dstBufpointer to an image buffer that will receive the YUV image. Use tjBufSizeYUV to determine the appropriate size for this buffer based on the image width, height, and level of subsampling. flagsthe bitwise OR of one or more of the flags. @@ -1185,7 +1185,7 @@ If you choose option 1, *jpegSize should be set to the size of your pitchbytes per line of the source image. Normally, this should be width * tjPixelSize[pixelFormat] if the image is unpadded, or TJPAD(width * tjPixelSize[pixelFormat]) if each line of the image is padded to the nearest 32-bit boundary, as is the case for Windows bitmaps. You can also be clever and use this parameter to skip lines, etc. Setting this parameter to 0 is the equivalent of setting it to width * tjPixelSize[pixelFormat]. heightheight (in pixels) of the source image pixelFormatpixel format of the source image (see Pixel formats.) - dstBufpointer to an image buffer which will receive the YUV image. Use tjBufSizeYUV() to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling. + dstBufpointer to an image buffer that will receive the YUV image. Use tjBufSizeYUV() to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling. subsampthe level of chrominance subsampling to be used when generating the YUV image (see Chrominance subsampling options.) flagsthe bitwise OR of one or more of the flags. @@ -1403,7 +1403,7 @@ If you choose option 1, *jpegSize should be set to the size of your
  • 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, 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.) + dstSizespointer to an array of n unsigned long variables that 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. @@ -1536,7 +1536,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo -
    Generated on Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
    Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/index.html b/doc/html/index.html index d8af71c2..9b11ce36 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 Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
    Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/modules.html b/doc/html/modules.html index ecf02514..d5a9df13 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 Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
    Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index 904d7806..6b0730ed 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -165,7 +165,7 @@ Data Fields -
    Generated on Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
    Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index 65134207..b480cafd 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -127,7 +127,7 @@ Data Fields -
    Generated on Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
    Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
    diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 11ed60e8..88746abe 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -191,7 +191,7 @@ Data Fields -
    Generated on Tue Sep 20 2011 13:18:32 for TurboJPEG by  +
    Generated on Thu Dec 15 2011 06:54:38 for TurboJPEG by  doxygen 1.7.4
    diff --git a/java/README b/java/README index f5866829..22e0f738 100644 --- a/java/README +++ b/java/README @@ -18,7 +18,7 @@ compress and decompress JPEG images in memory. Performance Pitfalls -------------------- -The TurboJPEG Java front end defines several convenience methods which can +The TurboJPEG Java front end defines several convenience methods that can allocate image buffers or instantiate classes to hold the result of compress, decompress, or transform operations. However, if you use these methods, then be mindful of the amount of new data you are creating on the heap. It may be diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html index 071e3a29..0932734c 100644 --- a/java/doc/allclasses-frame.html +++ b/java/doc/allclasses-frame.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html index 148fac66..0d20a311 100644 --- a/java/doc/allclasses-noframe.html +++ b/java/doc/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html index 8a6d8d9e..a1dc69c8 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index 0e1178da..0e1ca19d 100644 --- a/java/doc/deprecated-list.html +++ b/java/doc/deprecated-list.html @@ -2,12 +2,12 @@ - + Deprecated List - + diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html index 4c4b064a..94aadcc8 100644 --- a/java/doc/help-doc.html +++ b/java/doc/help-doc.html @@ -2,12 +2,12 @@ - + API Help - + diff --git a/java/doc/index-all.html b/java/doc/index-all.html index 0b45436b..38d328a5 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,12 +2,12 @@ - + Index - + diff --git a/java/doc/index.html b/java/doc/index.html index a96eb27b..7d77dc39 100644 --- a/java/doc/index.html +++ b/java/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/java/doc/org/libjpegturbo/turbojpeg/TJ.html index 1119f02e..756af3e1 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -2,12 +2,12 @@ - + TJ - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html index 9c3479a8..de74d4f4 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html @@ -2,12 +2,12 @@ - + TJCompressor - + @@ -420,7 +420,7 @@ public void compress(byte[] dstBuf, instance and output a JPEG image to the given destination buffer.

    -
    Parameters:
    dstBuf - buffer which will receive the JPEG image. Use +
    Parameters:
    dstBuf - buffer that will receive the JPEG image. Use TJ.bufSize(int, int, int) to determine the maximum size for this buffer based on the image width and height.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws: @@ -461,7 +461,7 @@ public void compress(java.awt.image.BufferedImage srcImage,

    Parameters:
    srcImage - a BufferedImage instance containing RGB or - grayscale pixels to be compressed
    dstBuf - buffer which will receive the JPEG image. Use + grayscale pixels to be compressed
    dstBuf - buffer that will receive the JPEG image. Use TJ.bufSize(int, int, int) to determine the maximum size for this buffer based on the image width and height.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws: @@ -513,7 +513,7 @@ public void encodeYUV(byte[] dstBuf, "YUV420P") format.

    -
    Parameters:
    dstBuf - buffer which will receive the YUV planar image. Use +
    Parameters:
    dstBuf - buffer that will receive the YUV planar image. Use TJ.bufSizeYUV(int, int, int) to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws: @@ -555,7 +555,7 @@ public void encodeYUV(java.awt.image.BufferedImage srcImage,

    Parameters:
    srcImage - a BufferedImage instance containing RGB or - grayscale pixels to be encoded
    dstBuf - buffer which will receive the YUV planar image. Use + grayscale pixels to be encoded
    dstBuf - buffer that will receive the YUV planar image. Use TJ.bufSizeYUV(int, int, int) to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws: diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html index d88fcc61..e830e89e 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html @@ -2,12 +2,12 @@ - + TJCustomFilter - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html index d8ede5e8..c34abace 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html @@ -2,12 +2,12 @@ - + TJDecompressor - + @@ -703,7 +703,7 @@ public void decompress(byte[] dstBuf, instance and output a decompressed image to the given destination buffer.

    -
    Parameters:
    dstBuf - buffer which will receive the decompressed image. This +
    Parameters:
    dstBuf - buffer that will receive the decompressed image. This buffer should normally be pitch * scaledHeight bytes in size, where scaledHeight can be determined by calling scalingFactor.getScaled(jpegHeight) @@ -779,7 +779,7 @@ public void decompressToYUV(byte[] dstBuf, intermediate buffer copy will be performed within TurboJPEG.

    -
    Parameters:
    dstBuf - buffer which will receive the YUV planar image. Use +
    Parameters:
    dstBuf - buffer that will receive the YUV planar image. Use TJ.bufSizeYUV(int, int, int) to determine the appropriate size for this buffer based on the image width, height, and level of chrominance subsampling.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws: @@ -818,7 +818,7 @@ public void decompress(java.awt.image.BufferedImage dstImage, BufferedImage instance.

    -
    Parameters:
    dstImage - a BufferedImage instance which will receive +
    Parameters:
    dstImage - a BufferedImage instance that will receive the decompressed image
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    java.lang.Exception
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html index 5d9682ab..febc69f4 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html @@ -2,12 +2,12 @@ - + TJScalingFactor - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html index e10ace58..a4ff5b8d 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html @@ -2,12 +2,12 @@ - + TJTransform - + @@ -696,7 +696,7 @@ public TJTransform(java.awt.Rectangle r,
    Create a new lossless transform instance with the given parameters.

    -
    Parameters:
    r - a Rectangle instance which specifies the cropping +
    Parameters:
    r - a Rectangle instance that specifies the cropping region. See TJTransform(int, int, int, int, int, int, TJCustomFilter) for more detail.
    op - one of the transform operations (OP_*)
    options - the bitwise OR of one or more of the transform options (OPT_*)
    cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html index c61c8f27..75ddc3f3 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html @@ -2,12 +2,12 @@ - + TJTransformer - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html index 0fd25125..a63781e9 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html @@ -2,12 +2,12 @@ - + org.libjpegturbo.turbojpeg - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html index 52b963b5..55c74a35 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html @@ -2,12 +2,12 @@ - + org.libjpegturbo.turbojpeg - + diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html index ecb85962..30997a6a 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html @@ -2,12 +2,12 @@ - + org.libjpegturbo.turbojpeg Class Hierarchy - + diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html index 6f1e7847..37d8cd4d 100644 --- a/java/doc/overview-tree.html +++ b/java/doc/overview-tree.html @@ -2,12 +2,12 @@ - + Class Hierarchy - + diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index c1a0b754..41175d60 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -2,12 +2,12 @@ - + Serialized Form - + diff --git a/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/java/org/libjpegturbo/turbojpeg/TJCompressor.java index 8c6a608e..b3c9b956 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java @@ -131,7 +131,7 @@ public class TJCompressor { * Compress the uncompressed source image associated with this compressor * instance and output a JPEG image to the given destination buffer. * - * @param dstBuf buffer which will receive the JPEG image. Use + * @param dstBuf buffer that will receive the JPEG image. Use * {@link TJ#bufSize} to determine the maximum size for this buffer based on * the image width and height. * @@ -172,7 +172,7 @@ public class TJCompressor { * @param srcImage a BufferedImage instance containing RGB or * grayscale pixels to be compressed * - * @param dstBuf buffer which will receive the JPEG image. Use + * @param dstBuf buffer that will receive the JPEG image. Use * {@link TJ#bufSize} to determine the maximum size for this buffer based on * the image width and height. * @@ -274,7 +274,7 @@ public class TJCompressor { * {@link TJ#SAMP_420}, which produces an image compatible with the I420 (AKA * "YUV420P") format. * - * @param dstBuf buffer which will receive the YUV planar image. Use + * @param dstBuf buffer that will receive the YUV planar image. Use * {@link TJ#bufSizeYUV} to determine the appropriate size for this buffer * based on the image width, height, and level of chrominance subsampling. * @@ -316,7 +316,7 @@ public class TJCompressor { * @param srcImage a BufferedImage instance containing RGB or * grayscale pixels to be encoded * - * @param dstBuf buffer which will receive the YUV planar image. Use + * @param dstBuf buffer that will receive the YUV planar image. Use * {@link TJ#bufSizeYUV} to determine the appropriate size for this buffer * based on the image width, height, and level of chrominance subsampling. * diff --git a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java index 4be5494c..184061bc 100644 --- a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java @@ -234,7 +234,7 @@ public class TJDecompressor { * Decompress the JPEG source image associated with this decompressor * instance and output a decompressed image to the given destination buffer. * - * @param dstBuf buffer which will receive the decompressed image. This + * @param dstBuf buffer that will receive the decompressed image. This * buffer should normally be pitch * scaledHeight bytes in size, * where scaledHeight can be determined by calling * scalingFactor.{@link TJScalingFactor#getScaled getScaled}(jpegHeight) @@ -327,7 +327,7 @@ public class TJDecompressor { * size (see {@link TJ#getMCUWidth} and {@link TJ#getMCUHeight}), then an * intermediate buffer copy will be performed within TurboJPEG. * - * @param dstBuf buffer which will receive the YUV planar image. Use + * @param dstBuf buffer that will receive the YUV planar image. Use * {@link TJ#bufSizeYUV} to determine the appropriate size for this buffer * based on the image width, height, and level of chrominance subsampling. * @@ -367,7 +367,7 @@ public class TJDecompressor { * instance and output a decompressed image to the given * BufferedImage instance. * - * @param dstImage a BufferedImage instance which will receive + * @param dstImage a BufferedImage instance that will receive * the decompressed image * * @param flags the bitwise OR of one or more of {@link TJ TJ.FLAG_*} diff --git a/java/org/libjpegturbo/turbojpeg/TJTransform.java b/java/org/libjpegturbo/turbojpeg/TJTransform.java index b9fbad56..399cf3a6 100644 --- a/java/org/libjpegturbo/turbojpeg/TJTransform.java +++ b/java/org/libjpegturbo/turbojpeg/TJTransform.java @@ -166,7 +166,7 @@ public class TJTransform extends Rectangle { /** * Create a new lossless transform instance with the given parameters. * - * @param r a Rectangle instance which specifies the cropping + * @param r a Rectangle instance that specifies the cropping * region. See {@link * #TJTransform(int, int, int, int, int, int, TJCustomFilter)} for more * detail. diff --git a/turbojpeg.h b/turbojpeg.h index a065fd14..98997afe 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -489,7 +489,7 @@ DLLEXPORT tjhandle DLLCALL tjInitCompress(void); * 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. - * @param jpegSize pointer to an unsigned long variable which holds the size of + * @param jpegSize pointer to an unsigned long variable that 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 @@ -576,7 +576,7 @@ DLLEXPORT unsigned long DLLCALL tjBufSizeYUV(int width, int height, * @param height height (in pixels) of the source image * @param pixelFormat pixel format of the source image (see @ref TJPF * "Pixel formats".) - * @param dstBuf pointer to an image buffer which will receive the YUV image. + * @param dstBuf pointer to an image buffer that will receive the YUV image. * Use #tjBufSizeYUV() to determine the appropriate size for this buffer * based on the image width, height, and level of chrominance * subsampling. @@ -608,11 +608,11 @@ DLLEXPORT tjhandle DLLCALL tjInitDecompress(void); * @param handle a handle to a TurboJPEG decompressor or transformer instance * @param jpegBuf pointer to a buffer containing a JPEG image * @param jpegSize size of the JPEG image (in bytes) - * @param width pointer to an integer variable which will receive the width (in + * @param width pointer to an integer variable that will receive the width (in * pixels) of the JPEG image - * @param height pointer to an integer variable which will receive the height + * @param height pointer to an integer variable that will receive the height * (in pixels) of the JPEG image - * @param jpegSubsamp pointer to an integer variable which will receive the + * @param jpegSubsamp pointer to an integer variable that will receive the * level of chrominance subsampling used when compressing the JPEG image * (see @ref TJSAMP "Chrominance subsampling options".) * @@ -642,7 +642,7 @@ DLLEXPORT tjscalingfactor* DLLCALL tjGetScalingFactors(int *numscalingfactors); * @param handle a handle to a TurboJPEG decompressor or transformer instance * @param jpegBuf pointer to a buffer containing the JPEG image to decompress * @param jpegSize size of the JPEG image (in bytes) - * @param dstBuf pointer to an image buffer which will receive the decompressed + * @param dstBuf pointer 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 @@ -695,7 +695,7 @@ DLLEXPORT int DLLCALL tjDecompress2(tjhandle handle, * @param handle a handle to a TurboJPEG decompressor or transformer instance * @param jpegBuf pointer to a buffer containing the JPEG image to decompress * @param jpegSize size of the JPEG image (in bytes) - * @param dstBuf pointer to an image buffer which will receive the YUV image. + * @param dstBuf pointer to an image buffer that will receive the YUV image. * Use #tjBufSizeYUV to determine the appropriate size for this buffer * based on the image width, height, and level of subsampling. * @param flags the bitwise OR of one or more of the @ref TJFLAG_BOTTOMUP @@ -752,7 +752,7 @@ DLLEXPORT tjhandle DLLCALL tjInitTransform(void); * 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. - * @param dstSizes pointer to an array of n unsigned long variables which will + * @param dstSizes pointer to an array of n unsigned long variables that 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