From: DRC Date: Thu, 22 Mar 2018 21:04:29 +0000 (-0500) Subject: Label this release 2.0 instead of 1.6 X-Git-Tag: 1.5.90~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0ca354eb4312af7c8559a28cbd3a576a342749b;p=libjpeg-turbo Label this release 2.0 instead of 1.6 This also pulls the formatting changes from 19c791cdac6df84418c66eb9d67cfa9703bc2461 into the TurboJPEG C API docs. --- diff --git a/ChangeLog.md b/ChangeLog.md index f12ad38..5e385bb 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,4 @@ -1.6 pre-beta +2.0 pre-beta ============ ### Significant changes relative to 1.5.3: diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 8172f55..50286d2 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/classes.html b/doc/html/classes.html index bc23e51..41a2811 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/doxygen-extra.css b/doc/html/doxygen-extra.css index 5abbcc2..f1bd4c2 100644 --- a/doc/html/doxygen-extra.css +++ b/doc/html/doxygen-extra.css @@ -1,3 +1,3 @@ code { - color: #4665A2; + color: #4665A2; } diff --git a/doc/html/functions.html b/doc/html/functions.html index 570debd..1042ae7 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 7d45f87..e0a7157 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/group___turbo_j_p_e_g.html b/doc/html/group___turbo_j_p_e_g.html index 40f8b28..cef856a 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

@@ -141,10 +141,10 @@ Macros The number of transform operations. More...
#define TJXOPT_PERFECT - This option will cause tjTransform() to return an error if the transform is not perfect. More...
+ This option will cause tjTransform() to return an error if the transform is not perfect. More...
#define TJXOPT_TRIM - This option will cause tjTransform() to discard any partial MCU blocks that cannot be transformed. More...
+ This option will cause tjTransform() to discard any partial MCU blocks that cannot be transformed. More...
#define TJXOPT_CROP This option will enable lossless cropping. More...
@@ -153,13 +153,13 @@ Macros This option will discard the color data in the input image and produce a grayscale output image. More...
#define TJXOPT_NOOUTPUT - This option will prevent tjTransform() from outputting a JPEG image for this particular transform (this can be used in conjunction with a custom filter to capture the transformed DCT coefficients without transcoding them.) More...
+ This option will prevent tjTransform() from outputting a JPEG image for this particular transform (this can be used in conjunction with a custom filter to capture the transformed DCT coefficients without transcoding them.) More...
#define TJXOPT_PROGRESSIVE This option will enable progressive entropy coding in the output image generated by this particular transform. More...
#define TJXOPT_COPYNONE - This option will prevent tjTransform() from copying any extra markers (including EXIF and ICC profile data) from the source image to the output image. More...
+ This option will prevent tjTransform() from copying any extra markers (including EXIF and ICC profile data) from the source image to the output image. More...
#define TJPAD(width) Pad the given width to the nearest 32-bit boundary. More...
@@ -240,95 +240,95 @@ Enumerations TJXOP_ROT270
} - Transform operations for tjTransform() More...
+ Transform operations for tjTransform() More...
- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Functions
DLLEXPORT tjhandle DLLCALL	tjInitCompress (void)
	Create a TurboJPEG compressor instance. More...

DLLEXPORT int DLLCALL	tjCompress2 (tjhandle handle, const unsigned char srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char jpegBuf, unsigned long jpegSize, int jpegSubsamp, int jpegQual, int flags)
	Compress an RGB, grayscale, or CMYK image into a JPEG image. More...

DLLEXPORT int DLLCALL	tjCompressFromYUV (tjhandle handle, const unsigned char srcBuf, int width, int pad, int height, int subsamp, unsigned char jpegBuf, unsigned long jpegSize, int jpegQual, int flags)
	Compress a YUV planar image into a JPEG image. More...

DLLEXPORT int DLLCALL	tjCompressFromYUVPlanes (tjhandle handle, const unsigned char *srcPlanes, int width, const int strides, int height, int subsamp, unsigned char *jpegBuf, unsigned long jpegSize, int jpegQual, int flags)
	Compress a set of Y, U (Cb), and V (Cr) image planes into a JPEG image. More...

DLLEXPORT unsigned long DLLCALL	tjBufSize (int width, int height, int jpegSubsamp)
	The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters. More...

DLLEXPORT unsigned long DLLCALL	tjBufSizeYUV2 (int width, int pad, int height, int subsamp)
	The size of the buffer (in bytes) required to hold a YUV planar image with the given parameters. More...

DLLEXPORT unsigned long DLLCALL	tjPlaneSizeYUV (int componentID, int width, int stride, int height, int subsamp)
	The size of the buffer (in bytes) required to hold a YUV image plane with the given parameters. More...

DLLEXPORT tjhandle	tjInitCompress (void)
	Create a TurboJPEG compressor instance. More...

DLLEXPORT int	tjCompress2 (tjhandle handle, const unsigned char srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char jpegBuf, unsigned long jpegSize, int jpegSubsamp, int jpegQual, int flags)
	Compress an RGB, grayscale, or CMYK image into a JPEG image. More...

DLLEXPORT int	tjCompressFromYUV (tjhandle handle, const unsigned char srcBuf, int width, int pad, int height, int subsamp, unsigned char jpegBuf, unsigned long jpegSize, int jpegQual, int flags)
	Compress a YUV planar image into a JPEG image. More...

DLLEXPORT int	tjCompressFromYUVPlanes (tjhandle handle, const unsigned char *srcPlanes, int width, const int strides, int height, int subsamp, unsigned char *jpegBuf, unsigned long jpegSize, int jpegQual, int flags)
	Compress a set of Y, U (Cb), and V (Cr) image planes into a JPEG image. More...

DLLEXPORT unsigned long	tjBufSize (int width, int height, int jpegSubsamp)
	The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters. More...

DLLEXPORT unsigned long	tjBufSizeYUV2 (int width, int pad, int height, int subsamp)
	The size of the buffer (in bytes) required to hold a YUV planar image with the given parameters. More...

DLLEXPORT unsigned long	tjPlaneSizeYUV (int componentID, int width, int stride, int height, int subsamp)
	The size of the buffer (in bytes) required to hold a YUV image plane with the given parameters. More...

DLLEXPORT int	tjPlaneWidth (int componentID, int width, int subsamp)
	The plane width of a YUV image plane with the given parameters. More...

DLLEXPORT int	tjPlaneHeight (int componentID, int height, int subsamp)
	The plane height of a YUV image plane with the given parameters. More...

DLLEXPORT int DLLCALL	tjEncodeYUV3 (tjhandle handle, const unsigned char srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char dstBuf, int pad, int subsamp, int flags)
	Encode an RGB or grayscale image into a YUV planar image. More...

DLLEXPORT int DLLCALL	tjEncodeYUVPlanes (tjhandle handle, const unsigned char srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char dstPlanes, int strides, int subsamp, int flags)
	Encode an RGB or grayscale image into separate Y, U (Cb), and V (Cr) image planes. More...

DLLEXPORT tjhandle DLLCALL	tjInitDecompress (void)
	Create a TurboJPEG decompressor instance. More...

DLLEXPORT int DLLCALL	tjDecompressHeader3 (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, int width, int height, int jpegSubsamp, int *jpegColorspace)
	Retrieve information about a JPEG image without decompressing it. More...

DLLEXPORT tjscalingfactor *DLLCALL	tjGetScalingFactors (int *numscalingfactors)
	Returns a list of fractional scaling factors that the JPEG decompressor in this implementation of TurboJPEG supports. More...

DLLEXPORT int DLLCALL	tjDecompress2 (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, unsigned char dstBuf, int width, int pitch, int height, int pixelFormat, int flags)
	Decompress a JPEG image to an RGB, grayscale, or CMYK image. More...

DLLEXPORT int DLLCALL	tjDecompressToYUV2 (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, unsigned char dstBuf, int width, int pad, int height, int flags)
	Decompress a JPEG image to a YUV planar image. More...

DLLEXPORT int DLLCALL	tjDecompressToYUVPlanes (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, unsigned char dstPlanes, int width, int strides, int height, int flags)
	Decompress a JPEG image into separate Y, U (Cb), and V (Cr) image planes. More...

DLLEXPORT int DLLCALL	tjDecodeYUV (tjhandle handle, const unsigned char srcBuf, int pad, int subsamp, unsigned char dstBuf, int width, int pitch, int height, int pixelFormat, int flags)
	Decode a YUV planar image into an RGB or grayscale image. More...

DLLEXPORT int DLLCALL	tjDecodeYUVPlanes (tjhandle handle, const unsigned char *srcPlanes, const int strides, int subsamp, unsigned char *dstBuf, int width, int pitch, int height, int pixelFormat, int flags)
	Decode a set of Y, U (Cb), and V (Cr) image planes into an RGB or grayscale image. More...

DLLEXPORT tjhandle DLLCALL	tjInitTransform (void)
	Create a new TurboJPEG transformer instance. More...

DLLEXPORT int DLLCALL	tjTransform (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, int n, unsigned char dstBufs, unsigned long dstSizes, tjtransform *transforms, int flags)
	Losslessly transform a JPEG image into another JPEG image. More...

DLLEXPORT int DLLCALL	tjDestroy (tjhandle handle)
	Destroy a TurboJPEG compressor, decompressor, or transformer instance. More...

DLLEXPORT unsigned char *DLLCALL	tjAlloc (int bytes)
	Allocate an image buffer for use with TurboJPEG. More...

DLLEXPORT unsigned char *DLLCALL	tjLoadImage (const char filename, int width, int align, int height, int pixelFormat, int flags)
	Load an uncompressed image from disk into memory. More...

DLLEXPORT int DLLCALL	tjSaveImage (const char filename, unsigned char buffer, int width, int pitch, int height, int pixelFormat, int flags)
	Save an uncompressed image from memory to disk. More...

DLLEXPORT void DLLCALL	tjFree (unsigned char *buffer)
	Free an image buffer previously allocated by TurboJPEG. More...

DLLEXPORT char *DLLCALL	tjGetErrorStr2 (tjhandle handle)
	Returns a descriptive error message explaining why the last command failed. More...

DLLEXPORT int DLLCALL	tjGetErrorCode (tjhandle handle)
	Returns a code indicating the severity of the last error. More...

DLLEXPORT int	tjEncodeYUV3 (tjhandle handle, const unsigned char srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char dstBuf, int pad, int subsamp, int flags)
	Encode an RGB or grayscale image into a YUV planar image. More...

DLLEXPORT int	tjEncodeYUVPlanes (tjhandle handle, const unsigned char srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char dstPlanes, int strides, int subsamp, int flags)
	Encode an RGB or grayscale image into separate Y, U (Cb), and V (Cr) image planes. More...

DLLEXPORT tjhandle	tjInitDecompress (void)
	Create a TurboJPEG decompressor instance. More...

DLLEXPORT int	tjDecompressHeader3 (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, int width, int height, int jpegSubsamp, int *jpegColorspace)
	Retrieve information about a JPEG image without decompressing it. More...

DLLEXPORT tjscalingfactor *	tjGetScalingFactors (int *numscalingfactors)
	Returns a list of fractional scaling factors that the JPEG decompressor in this implementation of TurboJPEG supports. More...

DLLEXPORT int	tjDecompress2 (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, unsigned char dstBuf, int width, int pitch, int height, int pixelFormat, int flags)
	Decompress a JPEG image to an RGB, grayscale, or CMYK image. More...

DLLEXPORT int	tjDecompressToYUV2 (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, unsigned char dstBuf, int width, int pad, int height, int flags)
	Decompress a JPEG image to a YUV planar image. More...

DLLEXPORT int	tjDecompressToYUVPlanes (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, unsigned char dstPlanes, int width, int strides, int height, int flags)
	Decompress a JPEG image into separate Y, U (Cb), and V (Cr) image planes. More...

DLLEXPORT int	tjDecodeYUV (tjhandle handle, const unsigned char srcBuf, int pad, int subsamp, unsigned char dstBuf, int width, int pitch, int height, int pixelFormat, int flags)
	Decode a YUV planar image into an RGB or grayscale image. More...

DLLEXPORT int	tjDecodeYUVPlanes (tjhandle handle, const unsigned char *srcPlanes, const int strides, int subsamp, unsigned char *dstBuf, int width, int pitch, int height, int pixelFormat, int flags)
	Decode a set of Y, U (Cb), and V (Cr) image planes into an RGB or grayscale image. More...

DLLEXPORT tjhandle	tjInitTransform (void)
	Create a new TurboJPEG transformer instance. More...

DLLEXPORT int	tjTransform (tjhandle handle, const unsigned char jpegBuf, unsigned long jpegSize, int n, unsigned char dstBufs, unsigned long dstSizes, tjtransform *transforms, int flags)
	Losslessly transform a JPEG image into another JPEG image. More...

DLLEXPORT int	tjDestroy (tjhandle handle)
	Destroy a TurboJPEG compressor, decompressor, or transformer instance. More...

DLLEXPORT unsigned char *	tjAlloc (int bytes)
	Allocate an image buffer for use with TurboJPEG. More...

DLLEXPORT unsigned char *	tjLoadImage (const char filename, int width, int align, int height, int pixelFormat, int flags)
	Load an uncompressed image from disk into memory. More...

DLLEXPORT int	tjSaveImage (const char filename, unsigned char buffer, int width, int pitch, int height, int pixelFormat, int flags)
	Save an uncompressed image from memory to disk. More...

DLLEXPORT void	tjFree (unsigned char *buffer)
	Free an image buffer previously allocated by TurboJPEG. More...

DLLEXPORT char *	tjGetErrorStr2 (tjhandle handle)
	Returns a descriptive error message explaining why the last command failed. More...

DLLEXPORT int	tjGetErrorCode (tjhandle handle)
	Returns a code indicating the severity of the last error. More...

@@ -594,7 +594,7 @@ Variables

Variables

This option will prevent tjTransform() from copying any extra markers (including EXIF and ICC profile data) from the source image to the output image.

@@ -609,7 +609,7 @@ Variables

This option will enable lossless cropping.

See tjTransform() for more information.

@@ -637,7 +637,7 @@ Variables

This option will prevent tjTransform() from outputting a JPEG image for this particular transform (this can be used in conjunction with a custom filter to capture the transformed DCT coefficients without transcoding them.)

@@ -651,7 +651,7 @@ Variables

This option will cause tjTransform() to return an error if the transform is not perfect.

Lossless transforms operate on MCU blocks, whose size depends on the level of chrominance subsampling used (see tjMCUWidth and tjMCUHeight.) If the image's width or height is not evenly divisible by the MCU block size, then there will be partial MCU blocks on the right and/or bottom edges. It is not possible to move these partial MCU blocks to the top or left of the image, so any transform that would require that is "imperfect." If this option is not specified, then any partial MCU blocks that cannot be transformed will be left in place, which will create odd-looking strips on the right or bottom edge of the image.

@@ -681,7 +681,7 @@ Variables

This option will cause tjTransform() to discard any partial MCU blocks that cannot be transformed.

@@ -835,7 +835,7 @@ Variables TJPF_UNKNOWN

Unknown pixel format.

Currently this is only used by tjLoadImage().

@@ -894,7 +894,7 @@ Variables

Transform operations for tjTransform()

Function Documentation

- +

Enumerator
TJXOP_NONE	Do not transform the position of the image pixels. @@ -930,12 +930,12 @@ Variables

- + @@ -953,16 +953,16 @@ Variables

Returns: a pointer to a newly-allocated buffer with the specified number of bytes.

See Also: tjFree()

See Also: tjFree()

- +

DLLEXPORT unsigned char* DLLCALL tjAlloc DLLEXPORT unsigned char* tjAlloc ( int bytes )

- + @@ -1001,12 +1001,12 @@ Variables - +

DLLEXPORT unsigned long DLLCALL tjBufSize DLLEXPORT unsigned long tjBufSize ( int width,

- + @@ -1051,12 +1051,12 @@ Variables - +

DLLEXPORT unsigned long DLLCALL tjBufSizeYUV2 DLLEXPORT unsigned long tjBufSizeYUV2 ( int width,

- + @@ -1139,9 +1139,9 @@ Variables @@ -1151,16 +1151,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT int DLLCALL tjCompress2	DLLEXPORT int tjCompress2	(	tjhandle	handle,
height	height (in pixels) of the source image
pixelFormat	pixel format of the source image (see Pixel formats.)
jpegBuf	address of a pointer to an image buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to: - pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, + pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, 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 that it won't be.) + 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 that it won't be.) 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.
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 size of the JPEG image (in bytes.) If `jpegBuf` points to a JPEG image buffer that is being reused from a previous call to one of the JPEG compression functions, then `*jpegSize` is ignored.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1231,15 +1231,15 @@ If you choose option 1, *jpegSize should be set to the size of your

Parameters

DLLEXPORT int DLLCALL tjCompressFromYUV DLLEXPORT int tjCompressFromYUV ( tjhandle handle,

- + @@ -1248,16 +1248,16 @@ If you choose option 1, *jpegSize should be set to the size of your

handle	a handle to a TurboJPEG compressor or transformer instance
srcBuf	pointer to an image buffer containing a YUV planar image to be compressed. The size of this buffer should match the value returned by tjBufSizeYUV2() for the given image width, height, padding, and level of chrominance subsampling. The Y, U (Cb), and V (Cr) image planes should be stored sequentially in the source buffer (refer to YUV Image Format Notes.)
srcBuf	pointer to an image buffer containing a YUV planar image to be compressed. The size of this buffer should match the value returned by tjBufSizeYUV2() for the given image width, height, padding, and level of chrominance subsampling. The Y, U (Cb), and V (Cr) image planes should be stored sequentially in the source buffer (refer to YUV Image Format Notes.)
width	width (in pixels) of the source image. If the width is not an even multiple of the MCU block width (see tjMCUWidth), then an intermediate buffer copy will be performed within TurboJPEG.
pad	the line padding used in the source image. For instance, if each line in each plane of the YUV image is padded to the nearest multiple of 4 bytes, then `pad` should be set to 4.
height	height (in pixels) of the source image. If the height is not an even multiple of the MCU block height (see tjMCUHeight), then an intermediate buffer copy will be performed within TurboJPEG.
subsamp	the level of chrominance subsampling used in the source image (see Chrominance subsampling options.)
jpegBuf	address of a pointer to an image buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to: - pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, + pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, 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 that it won't be.) + 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 that it won't be.) 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.
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 size of the JPEG image (in bytes.) If `jpegBuf` points to a JPEG image buffer that is being reused from a previous call to one of the JPEG compression functions, then `*jpegSize` is ignored.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1328,15 +1328,15 @@ If you choose option 1, *jpegSize should be set to the size of your

Parameters

DLLEXPORT int DLLCALL tjCompressFromYUVPlanes DLLEXPORT int tjCompressFromYUVPlanes ( tjhandle handle,

- + @@ -1345,16 +1345,16 @@ If you choose option 1, *jpegSize should be set to the size of your

handle	a handle to a TurboJPEG compressor or transformer instance
srcPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if compressing a grayscale image) that contain a YUV image to be compressed. These planes can be contiguous or non-contiguous in memory. The size of each plane should match the value returned by tjPlaneSizeYUV() for the given image width, height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
srcPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if compressing a grayscale image) that contain a YUV image to be compressed. These planes can be contiguous or non-contiguous in memory. The size of each plane should match the value returned by tjPlaneSizeYUV() for the given image width, height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
width	width (in pixels) of the source image. If the width is not an even multiple of the MCU block width (see tjMCUWidth), then an intermediate buffer copy will be performed within TurboJPEG.
strides	an array of integers, each specifying the number of bytes per line in the corresponding plane of the YUV source image. Setting the stride for any plane to 0 is the same as setting it to the plane width (see YUV Image Format Notes.) If `strides` is NULL, then the strides for all planes will be set to their respective plane widths. You can adjust the strides in order to specify an arbitrary amount of line padding in each plane or to create a JPEG image from a subregion of a larger YUV planar image.
height	height (in pixels) of the source image. If the height is not an even multiple of the MCU block height (see tjMCUHeight), then an intermediate buffer copy will be performed within TurboJPEG.
subsamp	the level of chrominance subsampling used in the source image (see Chrominance subsampling options.)
jpegBuf	address of a pointer to an image buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to: - pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, + pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, 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 that it won't be.) + 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 that it won't be.) 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.
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 size of the JPEG image (in bytes.) If `jpegBuf` points to a JPEG image buffer that is being reused from a previous call to one of the JPEG compression functions, then `*jpegSize` is ignored.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1426,7 +1426,7 @@ If you choose option 1, *jpegSize should be set to the size of your

Parameters

DLLEXPORT int DLLCALL tjDecodeYUV DLLEXPORT int tjDecodeYUV ( tjhandle handle,

- + @@ -1438,16 +1438,16 @@ If you choose option 1, *jpegSize should be set to the size of your

handle	a handle to a TurboJPEG decompressor or transformer instance
srcBuf	pointer to an image buffer containing a YUV planar image to be decoded. The size of this buffer should match the value returned by tjBufSizeYUV2() for the given image width, height, padding, and level of chrominance subsampling. The Y, U (Cb), and V (Cr) image planes should be stored sequentially in the source buffer (refer to YUV Image Format Notes.)
srcBuf	pointer to an image buffer containing a YUV planar image to be decoded. The size of this buffer should match the value returned by tjBufSizeYUV2() for the given image width, height, padding, and level of chrominance subsampling. The Y, U (Cb), and V (Cr) image planes should be stored sequentially in the source buffer (refer to YUV Image Format Notes.)
pad	Use this parameter to specify that the width of each line in each plane of the YUV source image is padded to the nearest multiple of this number of bytes (must be a power of 2.)
subsamp	the level of chrominance subsampling used in the YUV source image (see Chrominance subsampling options.)
dstBuf	pointer to an image buffer that will receive the decoded image. This buffer should normally be `pitch * height` bytes in size, but the `dstBuf` pointer can also be used to decode into a specific region of a larger buffer.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1519,7 +1519,7 @@ If you choose option 1, *jpegSize should be set to the size of your

Parameters

DLLEXPORT int DLLCALL tjDecodeYUVPlanes DLLEXPORT int tjDecodeYUVPlanes ( tjhandle handle,

- + @@ -1531,16 +1531,16 @@ If you choose option 1, *jpegSize should be set to the size of your

handle	a handle to a TurboJPEG decompressor or transformer instance
srcPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if decoding a grayscale image) that contain a YUV image to be decoded. These planes can be contiguous or non-contiguous in memory. The size of each plane should match the value returned by tjPlaneSizeYUV() for the given image width, height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
srcPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if decoding a grayscale image) that contain a YUV image to be decoded. These planes can be contiguous or non-contiguous in memory. The size of each plane should match the value returned by tjPlaneSizeYUV() for the given image width, height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
strides	an array of integers, each specifying the number of bytes per line in the corresponding plane of the YUV source image. Setting the stride for any plane to 0 is the same as setting it to the plane width (see YUV Image Format Notes.) If `strides` is NULL, then the strides for all planes will be set to their respective plane widths. You can adjust the strides in order to specify an arbitrary amount of line padding in each plane or to decode a subregion of a larger YUV planar image.
subsamp	the level of chrominance subsampling used in the YUV source image (see Chrominance subsampling options.)
dstBuf	pointer to an image buffer that will receive the decoded image. This buffer should normally be `pitch * height` bytes in size, but the `dstBuf` pointer can also be used to decode into a specific region of a larger buffer.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1607,25 +1607,25 @@ If you choose option 1, *jpegSize should be set to the size of your - + - +

DLLEXPORT int DLLCALL tjDecompress2	DLLEXPORT int tjDecompress2	(	tjhandle	handle,
handle	a handle to a TurboJPEG decompressor or transformer instance
jpegBuf	pointer to a buffer containing the JPEG image to decompress
jpegSize	size of the JPEG image (in bytes)
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 factors returned by tjGetScalingFactors(). The `dstBuf` pointer may also be used to decompress into a specific region of a larger buffer.
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 factors returned by tjGetScalingFactors(). The `dstBuf` pointer may also be used to decompress into a specific region of a larger buffer.
width	desired 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.
pitch	bytes per line in 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]`.
pitch	bytes per line in 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]`.
height	desired 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.
pixelFormat	pixel format of the destination image (see Pixel formats.)
flags	the bitwise OR of one or more of the flags

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1687,16 +1687,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT int DLLCALL tjDecompressHeader3 DLLEXPORT int tjDecompressHeader3 ( tjhandle handle,

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1758,7 +1758,7 @@ If you choose option 1, *jpegSize should be set to the size of your - + @@ -1766,16 +1766,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT int DLLCALL tjDecompressToYUV2	DLLEXPORT int tjDecompressToYUV2	(	tjhandle	handle,
handle	a handle to a TurboJPEG decompressor or transformer instance
jpegBuf	pointer to a buffer containing the JPEG image to decompress
jpegSize	size of the JPEG image (in bytes)
dstBuf	pointer to an image buffer that will receive the YUV image. Use tjBufSizeYUV2() to determine the appropriate size for this buffer based on the image width, height, padding, and level of subsampling. The Y, U (Cb), and V (Cr) image planes will be stored sequentially in the buffer (refer to YUV Image Format Notes.)
dstBuf	pointer to an image buffer that will receive the YUV image. Use tjBufSizeYUV2() to determine the appropriate size for this buffer based on the image width, height, padding, and level of subsampling. The Y, U (Cb), and V (Cr) image planes will be stored sequentially in the buffer (refer to YUV Image Format Notes.)
width	desired width (in pixels) of the YUV 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. If the scaled width is not an even multiple of the MCU block width (see tjMCUWidth), then an intermediate buffer copy will be performed within TurboJPEG.
pad	the width of each line in each plane of the YUV image will be padded to the nearest multiple of this number of bytes (must be a power of 2.) To generate images suitable for X Video, `pad` should be set to 4.
height	desired height (in pixels) of the YUV 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. If the scaled height is not an even multiple of the MCU block height (see tjMCUHeight), then an intermediate buffer copy will be performed within TurboJPEG.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1837,7 +1837,7 @@ If you choose option 1, *jpegSize should be set to the size of your - + @@ -1845,16 +1845,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT int DLLCALL tjDecompressToYUVPlanes	DLLEXPORT int tjDecompressToYUVPlanes	(	tjhandle	handle,
handle	a handle to a TurboJPEG decompressor or transformer instance
jpegBuf	pointer to a buffer containing the JPEG image to decompress
jpegSize	size of the JPEG image (in bytes)
dstPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if decompressing a grayscale image) that will receive the YUV image. These planes can be contiguous or non-contiguous in memory. Use tjPlaneSizeYUV() to determine the appropriate size for each plane based on the scaled image width, scaled image height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
dstPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if decompressing a grayscale image) that will receive the YUV image. These planes can be contiguous or non-contiguous in memory. Use tjPlaneSizeYUV() to determine the appropriate size for each plane based on the scaled image width, scaled image height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
width	desired width (in pixels) of the YUV 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. If the scaled width is not an even multiple of the MCU block width (see tjMCUWidth), then an intermediate buffer copy will be performed within TurboJPEG.
strides	an array of integers, each specifying the number of bytes per line in the corresponding plane of the output image. Setting the stride for any plane to 0 is the same as setting it to the scaled plane width (see YUV Image Format Notes.) If `strides` is NULL, then the strides for all planes will be set to their respective scaled plane widths. You can adjust the strides in order to add an arbitrary amount of line padding to each plane or to decompress the JPEG image into a subregion of a larger YUV planar image.
height	desired height (in pixels) of the YUV 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. If the scaled height is not an even multiple of the MCU block height (see tjMCUHeight), then an intermediate buffer copy will be performed within TurboJPEG.

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -1870,16 +1870,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT int DLLCALL tjDestroy DLLEXPORT int tjDestroy ( tjhandle handle )

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

- +

- + @@ -1956,23 +1956,23 @@ If you choose option 1, *jpegSize should be set to the size of your - +

DLLEXPORT int DLLCALL tjEncodeYUV3	DLLEXPORT int tjEncodeYUV3	(	tjhandle	handle,
pitch	bytes per line in 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]`.
height	height (in pixels) of the source image
pixelFormat	pixel format of the source image (see Pixel formats.)
dstBuf	pointer to an image buffer that will receive the YUV image. Use tjBufSizeYUV2() to determine the appropriate size for this buffer based on the image width, height, padding, and level of chrominance subsampling. The Y, U (Cb), and V (Cr) image planes will be stored sequentially in the buffer (refer to YUV Image Format Notes.)
dstBuf	pointer to an image buffer that will receive the YUV image. Use tjBufSizeYUV2() to determine the appropriate size for this buffer based on the image width, height, padding, and level of chrominance subsampling. The Y, U (Cb), and V (Cr) image planes will be stored sequentially in the buffer (refer to YUV Image Format Notes.)
pad	the width of each line in each plane of the YUV image will be padded to the nearest multiple of this number of bytes (must be a power of 2.) To generate images suitable for X Video, `pad` should be set to 4.
subsamp	the level of chrominance subsampling to be used when generating the YUV image (see Chrominance subsampling options.) To generate images suitable for X Video, `subsamp` should be set to TJSAMP_420. This produces an image compatible with the I420 (AKA "YUV420P") format.
flags	the bitwise OR of one or more of the flags

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -2049,23 +2049,23 @@ If you choose option 1, *jpegSize should be set to the size of your - +

DLLEXPORT int DLLCALL tjEncodeYUVPlanes	DLLEXPORT int tjEncodeYUVPlanes	(	tjhandle	handle,
pitch	bytes per line in 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]`.
height	height (in pixels) of the source image
pixelFormat	pixel format of the source image (see Pixel formats.)
dstPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if generating a grayscale image) that will receive the encoded image. These planes can be contiguous or non-contiguous in memory. Use tjPlaneSizeYUV() to determine the appropriate size for each plane based on the image width, height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
dstPlanes	an array of pointers to Y, U (Cb), and V (Cr) image planes (or just a Y plane, if generating a grayscale image) that will receive the encoded image. These planes can be contiguous or non-contiguous in memory. Use tjPlaneSizeYUV() to determine the appropriate size for each plane based on the image width, height, strides, and level of chrominance subsampling. Refer to YUV Image Format Notes for more details.
strides	an array of integers, each specifying the number of bytes per line in the corresponding plane of the output image. Setting the stride for any plane to 0 is the same as setting it to the plane width (see YUV Image Format Notes.) If `strides` is NULL, then the strides for all planes will be set to their respective plane widths. You can adjust the strides in order to add an arbitrary amount of line padding to each plane or to encode an RGB or grayscale image into a subregion of a larger YUV planar image.
subsamp	the level of chrominance subsampling to be used when generating the YUV image (see Chrominance subsampling options.) To generate images suitable for X Video, `subsamp` should be set to TJSAMP_420. This produces an image compatible with the I420 (AKA "YUV420P") format.
flags	the bitwise OR of one or more of the flags

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

- +

- + @@ -2075,23 +2075,23 @@ If you choose option 1, *jpegSize should be set to the size of your

Free an image buffer previously allocated by TurboJPEG.

You should always use this function to free JPEG destination buffer(s) that were automatically (re)allocated by the compression and transform functions or that were manually allocated using tjAlloc().

Parameters

DLLEXPORT void DLLCALL tjFree DLLEXPORT void tjFree ( unsigned char * buffer )

buffer address of the buffer to free

See Also: tjAlloc()

See Also: tjAlloc()

- +

- + @@ -2112,12 +2112,12 @@ If you choose option 1, *jpegSize should be set to the size of your - +

DLLEXPORT int DLLCALL tjGetErrorCode DLLEXPORT int tjGetErrorCode ( tjhandle handle )

- + @@ -2137,12 +2137,12 @@ If you choose option 1, *jpegSize should be set to the size of your - +

DLLEXPORT char* DLLCALL tjGetErrorStr2 DLLEXPORT char* tjGetErrorStr2 ( tjhandle handle )

- + @@ -2158,16 +2158,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT tjscalingfactor* DLLCALL tjGetScalingFactors DLLEXPORT tjscalingfactor* tjGetScalingFactors ( int * numscalingfactors )

Returns: a pointer to a list of fractional scaling factors, or NULL if an error is encountered (see tjGetErrorStr2().)

Returns: a pointer to a list of fractional scaling factors, or NULL if an error is encountered (see tjGetErrorStr2().)

- +

- + @@ -2177,16 +2177,16 @@ If you choose option 1, *jpegSize should be set to the size of your

Create a TurboJPEG compressor instance.

Returns: a handle to the newly-created instance, or NULL if an error occurred (see tjGetErrorStr2().)

Returns: a handle to the newly-created instance, or NULL if an error occurred (see tjGetErrorStr2().)

- +

DLLEXPORT tjhandle DLLCALL tjInitCompress DLLEXPORT tjhandle tjInitCompress ( void )

- + @@ -2196,16 +2196,16 @@ If you choose option 1, *jpegSize should be set to the size of your

Create a TurboJPEG decompressor instance.

Returns: a handle to the newly-created instance, or NULL if an error occurred (see tjGetErrorStr2().)

Returns: a handle to the newly-created instance, or NULL if an error occurred (see tjGetErrorStr2().)

- +

DLLEXPORT tjhandle DLLCALL tjInitDecompress DLLEXPORT tjhandle tjInitDecompress ( void )

- + @@ -2215,16 +2215,16 @@ If you choose option 1, *jpegSize should be set to the size of your

Create a new TurboJPEG transformer instance.

Returns: a handle to the newly-created instance, or NULL if an error occurred (see tjGetErrorStr2().)

Returns: a handle to the newly-created instance, or NULL if an error occurred (see tjGetErrorStr2().)

- +

DLLEXPORT tjhandle DLLCALL tjInitTransform DLLEXPORT tjhandle tjInitTransform ( void )

- + @@ -2274,7 +2274,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

DLLEXPORT unsigned char* DLLCALL tjLoadImage	DLLEXPORT unsigned char* tjLoadImage	(	const char *	filename,
width	pointer to an integer variable that will receive the width (in pixels) of the uncompressed image
align	row alignment of the image buffer to be returned (must be a power of 2.) For instance, setting this parameter to 4 will cause all rows in the image buffer to be padded to the nearest 32-bit boundary, and setting this parameter to 1 will cause all rows in the image buffer to be unpadded.
height	pointer to an integer variable that will receive the height (in pixels) of the uncompressed image
pixelFormat	pointer to an integer variable that specifies or will receive the pixel format of the uncompressed image buffer. The behavior of tjLoadImage() will vary depending on the value of `*pixelFormat` passed to the function: +
pixelFormat	pointer to an integer variable that specifies or will receive the pixel format of the uncompressed image buffer. The behavior of tjLoadImage() will vary depending on the value of `pixelFormat` passed to the function: TJPF_UNKNOWN : The uncompressed image buffer returned by the function will use the most optimal pixel format for the file type, and `pixelFormat` will contain the ID of this pixel format upon successful return from the function. TJPF_GRAY : Only PGM files and 8-bit BMP files with a grayscale colormap can be loaded. TJPF_CMYK : The RGB or grayscale pixels stored in the file will be converted using a quick & dirty algorithm that is suitable only for testing purposes (proper conversion between CMYK and other formats requires a color management system.) @@ -2285,7 +2285,7 @@ If you choose option 1, `*jpegSize` should be set to the size of your

Returns: a pointer to a newly-allocated buffer containing the uncompressed image, converted to the chosen pixel format and with the chosen row alignment, or NULL if an error occurred (see tjGetErrorStr2().) This buffer should be freed using tjFree().

Returns: a pointer to a newly-allocated buffer containing the uncompressed image, converted to the chosen pixel format and with the chosen row alignment, or NULL if an error occurred (see tjGetErrorStr2().) This buffer should be freed using tjFree().

@@ -2333,12 +2333,12 @@ If you choose option 1, *jpegSize should be set to the size of your - +

- + @@ -2434,12 +2434,12 @@ If you choose option 1, *jpegSize should be set to the size of your - +

DLLEXPORT unsigned long DLLCALL tjPlaneSizeYUV DLLEXPORT unsigned long tjPlaneSizeYUV ( int componentID,

- + @@ -2501,16 +2501,16 @@ If you choose option 1, *jpegSize should be set to the size of your

DLLEXPORT int DLLCALL tjSaveImage DLLEXPORT int tjSaveImage ( const char * filename,

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

- +

- + @@ -2574,9 +2574,9 @@ If you choose option 1, *jpegSize should be set to the size of your @@ -2585,7 +2585,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo

DLLEXPORT int DLLCALL tjTransform	DLLEXPORT int tjTransform	(	tjhandle	handle,
jpegSize	size of the JPEG source image (in bytes)
n	the number of transformed JPEG images to generate
dstBufs	pointer to an array of n image buffers. `dstBufs[i]` will receive a JPEG image that has been transformed using the parameters in `transforms[i]`. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to: - pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, + pre-allocate the JPEG buffer with an arbitrary size using tjAlloc() and let TurboJPEG grow the buffer as needed, 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 transformed or cropped width and height. Under normal circumstances, this should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees that it won't be.) Note, however, that there are some rare cases (such as transforming images with a large amount of embedded EXIF or ICC profile data) in which the output image will be larger than the worst-case size, and TJFLAG_NOREALLOC cannot be used in those cases. + pre-allocate the buffer to a "worst case" size determined by calling tjBufSize() with the transformed or cropped width and height. Under normal circumstances, this should ensure that the buffer never has to be re-allocated (setting TJFLAG_NOREALLOC guarantees that it won't be.) Note, however, that there are some rare cases (such as transforming images with a large amount of embedded EXIF or ICC profile data) in which the output image will be larger than the worst-case size, and TJFLAG_NOREALLOC cannot be used in those cases. 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.
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 return, `dstSizes[i]` will contain the size of the JPEG image (in bytes.)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

diff --git a/doc/html/index.html b/doc/html/index.html index 6b27f31..a60f4d0 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/modules.html b/doc/html/modules.html index 8b38151..e79f226 100644 --- a/doc/html/modules.html +++ b/doc/html/modules.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index fe7e697..5b97c71 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -5,29 +5,29 @@ var searchData= ['tj_5fnumpf',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]], ['tj_5fnumsamp',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]], ['tj_5fnumxop',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]], - ['tjalloc',['tjAlloc',['../group___turbo_j_p_e_g.html#ga5c9234bda6d993cdaffdd89bf81a00ff',1,'turbojpeg.h']]], + ['tjalloc',['tjAlloc',['../group___turbo_j_p_e_g.html#gaec627dd4c5f30b7a775a7aea3bec5d83',1,'turbojpeg.h']]], ['tjalphaoffset',['tjAlphaOffset',['../group___turbo_j_p_e_g.html#ga5af0ab065feefd526debf1e20c43e837',1,'turbojpeg.h']]], ['tjblueoffset',['tjBlueOffset',['../group___turbo_j_p_e_g.html#ga84e2e35d3f08025f976ec1ec53693dea',1,'turbojpeg.h']]], - ['tjbufsize',['tjBufSize',['../group___turbo_j_p_e_g.html#gaccc5bca7f12fcdcc302e6e1c6d4b311b',1,'turbojpeg.h']]], - ['tjbufsizeyuv2',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#gaf451664a62c1f6c7cc5a6401f32908c9',1,'turbojpeg.h']]], - ['tjcompress2',['tjCompress2',['../group___turbo_j_p_e_g.html#gaf38f2ed44bdc88e730e08b632fa6e88e',1,'turbojpeg.h']]], - ['tjcompressfromyuv',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga6f6de375d6ec0020faba627e37e5a060',1,'turbojpeg.h']]], - ['tjcompressfromyuvplanes',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#ga0b84c682d8accf097d7a743c965d3464',1,'turbojpeg.h']]], + ['tjbufsize',['tjBufSize',['../group___turbo_j_p_e_g.html#ga67ac12fee79073242cb216e07c9f1f90',1,'turbojpeg.h']]], + ['tjbufsizeyuv2',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#ga2be2b9969d4df9ecce9b05deed273194',1,'turbojpeg.h']]], + ['tjcompress2',['tjCompress2',['../group___turbo_j_p_e_g.html#gafbdce0112fd78fd38efae841443a9bcf',1,'turbojpeg.h']]], + ['tjcompressfromyuv',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga7622a459b79aa1007e005b58783f875b',1,'turbojpeg.h']]], + ['tjcompressfromyuvplanes',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#ga29ec5dfbd2d84b8724e951d6fa0d5d9e',1,'turbojpeg.h']]], ['tjcs',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]], ['tjcs_5fcmyk',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]], ['tjcs_5fgray',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]], ['tjcs_5frgb',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]], ['tjcs_5fycbcr',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]], ['tjcs_5fycck',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]], - ['tjdecodeyuv',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga077c61027b875afecd5a1613bf18b3c1',1,'turbojpeg.h']]], - ['tjdecodeyuvplanes',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#gaf42f19b7a496eb18bdc84fe61ee6d3e2',1,'turbojpeg.h']]], - ['tjdecompress2',['tjDecompress2',['../group___turbo_j_p_e_g.html#gad8026a417e16a76313bc0a6c9e8b2ba2',1,'turbojpeg.h']]], - ['tjdecompressheader3',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#ga3fced455e504e8ff4fbad28ba94a3020',1,'turbojpeg.h']]], - ['tjdecompresstoyuv2',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga39e08906528db5a764670ea48d344b09',1,'turbojpeg.h']]], - ['tjdecompresstoyuvplanes',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#ga38d0ef90692663b3ffb5b16da2541512',1,'turbojpeg.h']]], - ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga674adee917b95ad4a896f1ba39e12540',1,'turbojpeg.h']]], - ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gaabe05acd734990053ad1294b5ef239aa',1,'turbojpeg.h']]], - ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga8a65ed3bd12df57c219d46afbc9008f1',1,'turbojpeg.h']]], + ['tjdecodeyuv',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga70abbf38f77a26fd6da8813bef96f695',1,'turbojpeg.h']]], + ['tjdecodeyuvplanes',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga10e837c07fa9d25770565b237d3898d9',1,'turbojpeg.h']]], + ['tjdecompress2',['tjDecompress2',['../group___turbo_j_p_e_g.html#gae9eccef8b682a48f43a9117c231ed013',1,'turbojpeg.h']]], + ['tjdecompressheader3',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#ga0595681096bba7199cc6f3533cb25f77',1,'turbojpeg.h']]], + ['tjdecompresstoyuv2',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga04d1e839ff9a0860dd1475cff78d3364',1,'turbojpeg.h']]], + ['tjdecompresstoyuvplanes',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#gaa59f901a5258ada5bd0185ad59368540',1,'turbojpeg.h']]], + ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga75f355fa27225ba1a4ee392c852394d2',1,'turbojpeg.h']]], + ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gac519b922cdf446e97d0cdcba513636bf',1,'turbojpeg.h']]], + ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#gae2d04c72457fe7f4d60cf78ab1b1feb1',1,'turbojpeg.h']]], ['tjerr',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]], ['tjerr_5ffatal',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]], ['tjerr_5fwarning',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]], @@ -38,16 +38,16 @@ var searchData= ['tjflag_5fnorealloc',['TJFLAG_NOREALLOC',['../group___turbo_j_p_e_g.html#ga8808d403c68b62aaa58a4c1e58e98963',1,'turbojpeg.h']]], ['tjflag_5fprogressive',['TJFLAG_PROGRESSIVE',['../group___turbo_j_p_e_g.html#ga43b426750b46190a25d34a67ef76df1b',1,'turbojpeg.h']]], ['tjflag_5fstoponwarning',['TJFLAG_STOPONWARNING',['../group___turbo_j_p_e_g.html#ga519cfa4ef6c18d9e5b455fdf59306a3a',1,'turbojpeg.h']]], - ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#ga8c4a1231dc06a450514c835f6471f137',1,'turbojpeg.h']]], - ['tjgeterrorcode',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga0be00a62bd1be897f170fa1fed5fb4cb',1,'turbojpeg.h']]], - ['tjgeterrorstr2',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga94a235bd4f1088f61ad87b4eadb64c9c',1,'turbojpeg.h']]], - ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#ga6449044b9af402999ccf52f401333be8',1,'turbojpeg.h']]], + ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#gaea863d2da0cdb609563aabdf9196514b',1,'turbojpeg.h']]], + ['tjgeterrorcode',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga414feeffbf860ebd31c745df203de410',1,'turbojpeg.h']]], + ['tjgeterrorstr2',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga1ead8574f9f39fbafc6b497124e7aafa',1,'turbojpeg.h']]], + ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#gac3854476006b10787bd128f7ede48057',1,'turbojpeg.h']]], ['tjgreenoffset',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]], ['tjhandle',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]], - ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga3d10c47fbe4a2489a2b30c931551d01a',1,'turbojpeg.h']]], - ['tjinitdecompress',['tjInitDecompress',['../group___turbo_j_p_e_g.html#gae5408179d041e2a2f7199c8283cf649e',1,'turbojpeg.h']]], - ['tjinittransform',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga3155b775bfbac9dbba869b95a0367902',1,'turbojpeg.h']]], - ['tjloadimage',['tjLoadImage',['../group___turbo_j_p_e_g.html#ga144b981d6b281ecca4cbb4709de75749',1,'turbojpeg.h']]], + ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga9d63a05fc6d813f4aae06107041a37e8',1,'turbojpeg.h']]], + ['tjinitdecompress',['tjInitDecompress',['../group___turbo_j_p_e_g.html#ga52300eac3f3d9ef4bab303bc244f62d3',1,'turbojpeg.h']]], + ['tjinittransform',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga928beff6ac248ceadf01089fc6b41957',1,'turbojpeg.h']]], + ['tjloadimage',['tjLoadImage',['../group___turbo_j_p_e_g.html#gaffbd83c375e79f5db4b5c5d8ad4466e7',1,'turbojpeg.h']]], ['tjmcuheight',['tjMCUHeight',['../group___turbo_j_p_e_g.html#gabd247bb9fecb393eca57366feb8327bf',1,'turbojpeg.h']]], ['tjmcuwidth',['tjMCUWidth',['../group___turbo_j_p_e_g.html#ga9e61e7cd47a15a173283ba94e781308c',1,'turbojpeg.h']]], ['tjpad',['TJPAD',['../group___turbo_j_p_e_g.html#ga0aba955473315e405295d978f0c16511',1,'turbojpeg.h']]], @@ -67,7 +67,7 @@ var searchData= ['tjpf_5fxrgb',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]], ['tjpixelsize',['tjPixelSize',['../group___turbo_j_p_e_g.html#gad77cf8fe5b2bfd3cb3f53098146abb4c',1,'turbojpeg.h']]], ['tjplaneheight',['tjPlaneHeight',['../group___turbo_j_p_e_g.html#ga1a209696c6a80748f20e134b3c64789f',1,'turbojpeg.h']]], - ['tjplanesizeyuv',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#ga6f98d977bfa9d167c97172e876ba61e2',1,'turbojpeg.h']]], + ['tjplanesizeyuv',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#gab4ab7b24f6e797d79abaaa670373961d',1,'turbojpeg.h']]], ['tjplanewidth',['tjPlaneWidth',['../group___turbo_j_p_e_g.html#ga63fb66bb1e36c74008c4634360becbb1',1,'turbojpeg.h']]], ['tjredoffset',['tjRedOffset',['../group___turbo_j_p_e_g.html#gadd9b446742ac8a3923f7992c7988fea8',1,'turbojpeg.h']]], ['tjregion',['tjregion',['../structtjregion.html',1,'']]], @@ -78,10 +78,10 @@ var searchData= ['tjsamp_5f440',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]], ['tjsamp_5f444',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]], ['tjsamp_5fgray',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]], - ['tjsaveimage',['tjSaveImage',['../group___turbo_j_p_e_g.html#ga2e78b7b79796e74584028da880a6a29c',1,'turbojpeg.h']]], + ['tjsaveimage',['tjSaveImage',['../group___turbo_j_p_e_g.html#ga6f445b22d8933ae4815b3370a538d879',1,'turbojpeg.h']]], ['tjscaled',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]], ['tjscalingfactor',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]], - ['tjtransform',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#gaa29f3189c41be12ec5dee7caec318a31',1,'tjtransform(): turbojpeg.h'],['../group___turbo_j_p_e_g.html#gad02cd42b69f193a0623a9c801788df3a',1,'tjTransform(tjhandle handle, const unsigned char *jpegBuf, unsigned long jpegSize, int n, unsigned char **dstBufs, unsigned long *dstSizes, tjtransform *transforms, int flags): turbojpeg.h']]], + ['tjtransform',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#gaa29f3189c41be12ec5dee7caec318a31',1,'tjtransform(): turbojpeg.h'],['../group___turbo_j_p_e_g.html#ga9cb8abf4cc91881e04a0329b2270be25',1,'tjTransform(tjhandle handle, const unsigned char *jpegBuf, unsigned long jpegSize, int n, unsigned char **dstBufs, unsigned long *dstSizes, tjtransform *transforms, int flags): turbojpeg.h']]], ['tjxop',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]], ['tjxop_5fhflip',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]], ['tjxop_5fnone',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index 0c9a3c1..bd4f34f 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -1,31 +1,31 @@ var searchData= [ - ['tjalloc',['tjAlloc',['../group___turbo_j_p_e_g.html#ga5c9234bda6d993cdaffdd89bf81a00ff',1,'turbojpeg.h']]], - ['tjbufsize',['tjBufSize',['../group___turbo_j_p_e_g.html#gaccc5bca7f12fcdcc302e6e1c6d4b311b',1,'turbojpeg.h']]], - ['tjbufsizeyuv2',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#gaf451664a62c1f6c7cc5a6401f32908c9',1,'turbojpeg.h']]], - ['tjcompress2',['tjCompress2',['../group___turbo_j_p_e_g.html#gaf38f2ed44bdc88e730e08b632fa6e88e',1,'turbojpeg.h']]], - ['tjcompressfromyuv',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga6f6de375d6ec0020faba627e37e5a060',1,'turbojpeg.h']]], - ['tjcompressfromyuvplanes',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#ga0b84c682d8accf097d7a743c965d3464',1,'turbojpeg.h']]], - ['tjdecodeyuv',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga077c61027b875afecd5a1613bf18b3c1',1,'turbojpeg.h']]], - ['tjdecodeyuvplanes',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#gaf42f19b7a496eb18bdc84fe61ee6d3e2',1,'turbojpeg.h']]], - ['tjdecompress2',['tjDecompress2',['../group___turbo_j_p_e_g.html#gad8026a417e16a76313bc0a6c9e8b2ba2',1,'turbojpeg.h']]], - ['tjdecompressheader3',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#ga3fced455e504e8ff4fbad28ba94a3020',1,'turbojpeg.h']]], - ['tjdecompresstoyuv2',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga39e08906528db5a764670ea48d344b09',1,'turbojpeg.h']]], - ['tjdecompresstoyuvplanes',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#ga38d0ef90692663b3ffb5b16da2541512',1,'turbojpeg.h']]], - ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga674adee917b95ad4a896f1ba39e12540',1,'turbojpeg.h']]], - ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gaabe05acd734990053ad1294b5ef239aa',1,'turbojpeg.h']]], - ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga8a65ed3bd12df57c219d46afbc9008f1',1,'turbojpeg.h']]], - ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#ga8c4a1231dc06a450514c835f6471f137',1,'turbojpeg.h']]], - ['tjgeterrorcode',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga0be00a62bd1be897f170fa1fed5fb4cb',1,'turbojpeg.h']]], - ['tjgeterrorstr2',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga94a235bd4f1088f61ad87b4eadb64c9c',1,'turbojpeg.h']]], - ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#ga6449044b9af402999ccf52f401333be8',1,'turbojpeg.h']]], - ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga3d10c47fbe4a2489a2b30c931551d01a',1,'turbojpeg.h']]], - ['tjinitdecompress',['tjInitDecompress',['../group___turbo_j_p_e_g.html#gae5408179d041e2a2f7199c8283cf649e',1,'turbojpeg.h']]], - ['tjinittransform',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga3155b775bfbac9dbba869b95a0367902',1,'turbojpeg.h']]], - ['tjloadimage',['tjLoadImage',['../group___turbo_j_p_e_g.html#ga144b981d6b281ecca4cbb4709de75749',1,'turbojpeg.h']]], + ['tjalloc',['tjAlloc',['../group___turbo_j_p_e_g.html#gaec627dd4c5f30b7a775a7aea3bec5d83',1,'turbojpeg.h']]], + ['tjbufsize',['tjBufSize',['../group___turbo_j_p_e_g.html#ga67ac12fee79073242cb216e07c9f1f90',1,'turbojpeg.h']]], + ['tjbufsizeyuv2',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#ga2be2b9969d4df9ecce9b05deed273194',1,'turbojpeg.h']]], + ['tjcompress2',['tjCompress2',['../group___turbo_j_p_e_g.html#gafbdce0112fd78fd38efae841443a9bcf',1,'turbojpeg.h']]], + ['tjcompressfromyuv',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga7622a459b79aa1007e005b58783f875b',1,'turbojpeg.h']]], + ['tjcompressfromyuvplanes',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#ga29ec5dfbd2d84b8724e951d6fa0d5d9e',1,'turbojpeg.h']]], + ['tjdecodeyuv',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga70abbf38f77a26fd6da8813bef96f695',1,'turbojpeg.h']]], + ['tjdecodeyuvplanes',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga10e837c07fa9d25770565b237d3898d9',1,'turbojpeg.h']]], + ['tjdecompress2',['tjDecompress2',['../group___turbo_j_p_e_g.html#gae9eccef8b682a48f43a9117c231ed013',1,'turbojpeg.h']]], + ['tjdecompressheader3',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#ga0595681096bba7199cc6f3533cb25f77',1,'turbojpeg.h']]], + ['tjdecompresstoyuv2',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga04d1e839ff9a0860dd1475cff78d3364',1,'turbojpeg.h']]], + ['tjdecompresstoyuvplanes',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#gaa59f901a5258ada5bd0185ad59368540',1,'turbojpeg.h']]], + ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga75f355fa27225ba1a4ee392c852394d2',1,'turbojpeg.h']]], + ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gac519b922cdf446e97d0cdcba513636bf',1,'turbojpeg.h']]], + ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#gae2d04c72457fe7f4d60cf78ab1b1feb1',1,'turbojpeg.h']]], + ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#gaea863d2da0cdb609563aabdf9196514b',1,'turbojpeg.h']]], + ['tjgeterrorcode',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga414feeffbf860ebd31c745df203de410',1,'turbojpeg.h']]], + ['tjgeterrorstr2',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga1ead8574f9f39fbafc6b497124e7aafa',1,'turbojpeg.h']]], + ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#gac3854476006b10787bd128f7ede48057',1,'turbojpeg.h']]], + ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga9d63a05fc6d813f4aae06107041a37e8',1,'turbojpeg.h']]], + ['tjinitdecompress',['tjInitDecompress',['../group___turbo_j_p_e_g.html#ga52300eac3f3d9ef4bab303bc244f62d3',1,'turbojpeg.h']]], + ['tjinittransform',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga928beff6ac248ceadf01089fc6b41957',1,'turbojpeg.h']]], + ['tjloadimage',['tjLoadImage',['../group___turbo_j_p_e_g.html#gaffbd83c375e79f5db4b5c5d8ad4466e7',1,'turbojpeg.h']]], ['tjplaneheight',['tjPlaneHeight',['../group___turbo_j_p_e_g.html#ga1a209696c6a80748f20e134b3c64789f',1,'turbojpeg.h']]], - ['tjplanesizeyuv',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#ga6f98d977bfa9d167c97172e876ba61e2',1,'turbojpeg.h']]], + ['tjplanesizeyuv',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#gab4ab7b24f6e797d79abaaa670373961d',1,'turbojpeg.h']]], ['tjplanewidth',['tjPlaneWidth',['../group___turbo_j_p_e_g.html#ga63fb66bb1e36c74008c4634360becbb1',1,'turbojpeg.h']]], - ['tjsaveimage',['tjSaveImage',['../group___turbo_j_p_e_g.html#ga2e78b7b79796e74584028da880a6a29c',1,'turbojpeg.h']]], - ['tjtransform',['tjTransform',['../group___turbo_j_p_e_g.html#gad02cd42b69f193a0623a9c801788df3a',1,'turbojpeg.h']]] + ['tjsaveimage',['tjSaveImage',['../group___turbo_j_p_e_g.html#ga6f445b22d8933ae4815b3370a538d879',1,'turbojpeg.h']]], + ['tjtransform',['tjTransform',['../group___turbo_j_p_e_g.html#ga9cb8abf4cc91881e04a0329b2270be25',1,'turbojpeg.h']]] ]; diff --git a/doc/html/structtjregion.html b/doc/html/structtjregion.html index 36c0afa..50a9adb 100644 --- a/doc/html/structtjregion.html +++ b/doc/html/structtjregion.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/structtjscalingfactor.html b/doc/html/structtjscalingfactor.html index 2f54900..d7fa67b 100644 --- a/doc/html/structtjscalingfactor.html +++ b/doc/html/structtjscalingfactor.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index d9536a3..fcf72ee 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -24,7 +24,7 @@

TurboJPEG - 1.6 + 2.0

@@ -133,7 +133,7 @@ Data Fields arrayRegiontjregion structure containing the width and height of the array pointed to by coeffs as well as its offset relative to the component plane. TurboJPEG implementations may choose to split each component plane into multiple DCT coefficient arrays and call the callback function once for each array. planeRegiontjregion structure containing the width and height of the component plane to which coeffs belongs componentIDID number of the component plane to which coeffs belongs (Y, Cb, and Cr have, respectively, ID's of 0, 1, and 2 in typical JPEG images.) - transformIDID number of the transformed image to which coeffs belongs. This is the same as the index of the transform in the transforms array that was passed to tjTransform(). + transformIDID number of the transformed image to which coeffs belongs. This is the same as the index of the transform in the transforms array that was passed to tjTransform(). transforma pointer to a tjtransform structure that specifies the parameters and/or cropping region for this transform diff --git a/doxygen.config b/doxygen.config index 2f2ab66..cb884f9 100644 --- a/doxygen.config +++ b/doxygen.config @@ -1,5 +1,5 @@ PROJECT_NAME = TurboJPEG -PROJECT_NUMBER = 1.6 +PROJECT_NUMBER = 2.0 OUTPUT_DIRECTORY = doc/ USE_WINDOWS_ENCODING = NO OPTIMIZE_OUTPUT_FOR_C = YES diff --git a/turbojpeg-mapfile b/turbojpeg-mapfile index b1381ed..5477fed 100755 --- a/turbojpeg-mapfile +++ b/turbojpeg-mapfile @@ -55,7 +55,7 @@ TURBOJPEG_1.4 tjPlaneWidth; } TURBOJPEG_1.2; -TURBOJPEG_1.6 +TURBOJPEG_2.0 { global: tjGetErrorCode; diff --git a/turbojpeg-mapfile.jni b/turbojpeg-mapfile.jni index ce8913c..4432791 100755 --- a/turbojpeg-mapfile.jni +++ b/turbojpeg-mapfile.jni @@ -91,7 +91,7 @@ TURBOJPEG_1.4 Java_org_libjpegturbo_turbojpeg_TJ_planeWidth__III; } TURBOJPEG_1.3; -TURBOJPEG_1.6 +TURBOJPEG_2.0 { global: tjGetErrorCode;

Functions

Variables

Function Documentation