From b3a028e356fe85b217b7ea02b4b1e5c11153af3c Mon Sep 17 00:00:00 2001 From: DRC Date: Mon, 25 Nov 2013 21:08:47 +0000 Subject: [PATCH] Per the conventions of the image compression and digital video communities, use "YCbCr" to describe the JPEG colorspace and "YUV" to describe an image format consisting of Y, Cb, and Cr planes (this partially reverts r959.) git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1092 632fc199-4ca6-4c93-a231-07263d6284db --- doc/html/structtjtransform.html | 2 +- java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html | 4 ++-- java/org/libjpegturbo/turbojpeg/TJCustomFilter.java | 4 ++-- turbojpeg.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/html/structtjtransform.html b/doc/html/structtjtransform.html index 59198bb..3199343 100644 --- a/doc/html/structtjtransform.html +++ b/doc/html/structtjtransform.html @@ -131,7 +131,7 @@ Data Fields coeffspointer to an array of transformed DCT coefficients. (NOTE: this pointer is not guaranteed to be valid once the callback returns, so applications wishing to hand off the DCT coefficients to another function or library should make a copy of them within the body of the callback.) 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, U, and V have, respectively, ID's of 0, 1, and 2 in typical JPEG images.) + 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(). transforma pointer to a tjtransform structure that specifies the parameters and/or cropping region for this transform diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html index 4cb2615..707b58d 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html @@ -165,8 +165,8 @@ void customFilter(java.nio.ShortBuffer coeffBuffer, into multiple DCT coefficient buffers and call the callback function once for each buffer.
planeRegion - rectangle containing the width and height of the component plane to which coeffBuffer belongs
componentID - ID number of the component plane to which - coeffBuffer belongs (Y, U, and V have, respectively, ID's of - 0, 1, and 2 in typical JPEG images.)
transformID - ID number of the transformed image to which + coeffBuffer belongs (Y, Cb, and Cr have, respectively, ID's + of 0, 1, and 2 in typical JPEG images.)
transformID - ID number of the transformed image to which coeffBuffer belongs. This is the same as the index of the transform in the transforms array that was passed to TJTransformer.transform().
transform - a TJTransform instance that specifies the parameters and/or cropping region for this transform diff --git a/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java b/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java index 6e46fa1..5615b4e 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java +++ b/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java @@ -58,8 +58,8 @@ public interface TJCustomFilter { * component plane to which coeffBuffer belongs * * @param componentID ID number of the component plane to which - * coeffBuffer belongs (Y, U, and V have, respectively, ID's of - * 0, 1, and 2 in typical JPEG images.) + * coeffBuffer belongs (Y, Cb, and Cr have, respectively, ID's + * of 0, 1, and 2 in typical JPEG images.) * * @param transformID ID number of the transformed image to which * coeffBuffer belongs. This is the same as the index of the diff --git a/turbojpeg.h b/turbojpeg.h index 941aa57..c778556 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -461,7 +461,7 @@ typedef struct tjtransform * @param planeRegion #tjregion structure containing the width and height of * the component plane to which coeffs belongs * @param componentID ID number of the component plane to which - * coeffs belongs (Y, U, and V have, respectively, ID's of + * coeffs belongs (Y, Cb, and Cr have, respectively, ID's of * 0, 1, and 2 in typical JPEG images.) * @param transformID ID number of the transformed image to which * coeffs belongs. This is the same as the index of the -- 2.40.0