Merge branch 'master' into dev

This commit is contained in:
DRC
2020-10-01 18:17:46 -05:00
2 changed files with 22 additions and 19 deletions

View File

@@ -813,15 +813,16 @@ extends java.lang.Object</pre>
mathematical transformation of RGB designed solely for storage and mathematical transformation of RGB designed solely for storage and
transmission. YCbCr images must be converted to RGB before they can transmission. YCbCr images must be converted to RGB before they can
actually be displayed. In the YCbCr colorspace, the Y (luminance) actually be displayed. In the YCbCr colorspace, the Y (luminance)
component represents the black & white portion of the original image, and component represents the black &amp; white portion of the original image,
the Cb and Cr (chrominance) components represent the color portion of the and the Cb and Cr (chrominance) components represent the color portion of
original image. Originally, the analog equivalent of this transformation the original image. Originally, the analog equivalent of this
allowed the same signal to drive both black & white and color televisions, transformation allowed the same signal to drive both black &amp; white and
but JPEG images use YCbCr primarily because it allows the color data to be color televisions, but JPEG images use YCbCr primarily because it allows
optionally subsampled for the purposes of reducing bandwidth or disk the color data to be optionally subsampled for the purposes of reducing
space. YCbCr is the most common JPEG colorspace, and YCbCr JPEG images bandwidth or disk space. YCbCr is the most common JPEG colorspace, and
can be compressed from and decompressed to any of the extended RGB pixel YCbCr JPEG images can be compressed from and decompressed to any of the
formats or grayscale, or they can be decompressed to YUV planar images.</div> extended RGB pixel formats or grayscale, or they can be decompressed to
YUV planar images.</div>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.CS_YCbCr">Constant Field Values</a></dd></dl> <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.CS_YCbCr">Constant Field Values</a></dd></dl>
</li> </li>
</ul> </ul>

View File

@@ -1,5 +1,6 @@
/* /*
* Copyright (C)2011-2013, 2017-2018 D. R. Commander. All Rights Reserved. * Copyright (C)2011-2013, 2017-2018, 2020 D. R. Commander.
* All Rights Reserved.
* Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -332,15 +333,16 @@ public final class TJ {
* mathematical transformation of RGB designed solely for storage and * mathematical transformation of RGB designed solely for storage and
* transmission. YCbCr images must be converted to RGB before they can * transmission. YCbCr images must be converted to RGB before they can
* actually be displayed. In the YCbCr colorspace, the Y (luminance) * actually be displayed. In the YCbCr colorspace, the Y (luminance)
* component represents the black & white portion of the original image, and * component represents the black &amp; white portion of the original image,
* the Cb and Cr (chrominance) components represent the color portion of the * and the Cb and Cr (chrominance) components represent the color portion of
* original image. Originally, the analog equivalent of this transformation * the original image. Originally, the analog equivalent of this
* allowed the same signal to drive both black & white and color televisions, * transformation allowed the same signal to drive both black &amp; white and
* but JPEG images use YCbCr primarily because it allows the color data to be * color televisions, but JPEG images use YCbCr primarily because it allows
* optionally subsampled for the purposes of reducing bandwidth or disk * the color data to be optionally subsampled for the purposes of reducing
* space. YCbCr is the most common JPEG colorspace, and YCbCr JPEG images * bandwidth or disk space. YCbCr is the most common JPEG colorspace, and
* can be compressed from and decompressed to any of the extended RGB pixel * YCbCr JPEG images can be compressed from and decompressed to any of the
* formats or grayscale, or they can be decompressed to YUV planar images. * extended RGB pixel formats or grayscale, or they can be decompressed to
* YUV planar images.
*/ */
@SuppressWarnings("checkstyle:ConstantName") @SuppressWarnings("checkstyle:ConstantName")
public static final int CS_YCbCr = 1; public static final int CS_YCbCr = 1;