(ChangeLog update forthcoming)
- Prefix all function names with "tj3" and remove version suffixes from
function names. (Future API overhauls will increment the prefix to
"tj4", etc., thus retaining backward API/ABI compatibility without
versioning each individual function.)
- Replace stateless boolean flags (including TJ*FLAG_ARITHMETIC and
TJ*FLAG_LOSSLESS, which were never released) with stateful integer
parameters, the value of which persists between function calls.
* Use parameters for the JPEG quality and subsampling as well, in
order to eliminate the awkwardness of specifying function arguments
that weren't relevant for lossless compression.
* tj3DecompressHeader() now stores all relevant information about the
JPEG image, including the width, height, subsampling type, entropy
coding type, etc. in parameters rather than returning that
information in its arguments.
* TJ*FLAG_LIMITSCANS has been reimplemented as an integer parameter
(TJ*PARAM_SCANLIMIT) that allows the number of scans to be
specified.
- Use the const keyword for all pointer arguments to unmodified
buffers, as well as for both dimensions of 2D pointers. Addresses
#395.
- Use size_t rather than unsigned long to represent buffer sizes, since
unsigned long is a 32-bit type on Windows. Addresses #24.
- Return 0 from all buffer size functions if an error occurs, rather
than awkwardly trying to return -1 in an unsigned data type.
- Implement 12-bit and 16-bit data precision using dedicated
compression, decompression, and image I/O functions/methods.
* Suffix the names of all data-precision-specific functions with 8,
12, or 16.
* Because the YUV functions are intended to be used for video, they
are currently only implemented with 8-bit data precision, but they
can be expanded to 12-bit data precision in the future, if
necessary.
* Extend TJUnitTest and TJBench to test 12-bit and 16-bit data
precision, using a new -precision option.
* Add appropriate regression tests for all of the above to the 'test'
target.
* Extend tjbenchtest to test 12-bit and 16-bit data precision, and
add separate 'tjtest12' and 'tjtest16' targets.
* BufferedImage I/O in the Java API is currently limited to 8-bit
data precision, since the BufferedImage class does not
straightforwardly support higher data precisions.
* Extend the PPM reader to convert 12-bit and 16-bit PBMPLUS files
to grayscale or CMYK pixels, as it already does for 8-bit files.
- Properly accommodate lossless JPEG using dedicated parameters
(TJ*PARAM_LOSSLESS, TJ*PARAM_LOSSLESSPSV, and TJ*PARAM_LOSSLESSPT),
rather than using a flag and awkwardly repurposing the JPEG quality.
Update TJBench to properly reflect whether a JPEG image is lossless.
- Re-organize the TJBench usage screen.
- Update the Java docs using Java 11, to improve the formatting and
eliminate HTML frames.
- Use the accurate integer DCT algorithm by default for both
compression and decompression, since the "fast" algorithm is a legacy
feature, it does not pass the ISO compliance tests, and it is not
actually faster on modern x86 CPUs.
* Remove the -accuratedct option from TJBench and TJExample.
- Re-implement the 'tjtest' target using a CMake script that enables
the appropriate tests, depending on the data precision and whether or
not the Java API is part of the build.
- Consolidate the C and Java versions of tjbenchtest into one script.
- Consolidate the C and Java versions of tjexampletest into one script.
- Combine all initialization functions into a single function
(tj3Init()) that accepts an integer parameter specifying the
subsystems to initialize.
- Enable decompression scaling explicitly, using a new function/method
(tj3SetScalingFactor()/TJDecompressor.setScalingFactor()), rather
than implicitly using awkward "desired width"/"desired height"
parameters.
- Introduce a new macro/constant (TJUNSCALED/TJ.UNSCALED) that maps to
a scaling factor of 1/1.
- Implement partial image decompression, using a new function/method
(tj3SetCroppingRegion()/TJDecompressor.setCroppingRegion()) and
TJBench option (-crop). Extend tjbenchtest to test the new feature.
Addresses #1.
- Allow the JPEG colorspace to be specified explicitly when
compressing, using a new parameter (TJ*PARAM_COLORSPACE). This
allows JPEG images with the RGB and CMYK colorspaces to be created.
- Remove the error/difference image feature from TJBench. Identical
images to the ones that TJBench created can be generated using
ImageMagick with
'magick composite <original_image> <output_image> -compose difference <diff_image>'
- Handle JPEG images with unknown subsampling types. TJ*PARAM_SUBSAMP
is set to TJ*SAMP_UNKNOWN (== -1) for such images, but they can still
be decompressed fully into packed-pixel images or losslessly
transformed (with the exception of lossless cropping.) They cannot
be partially decompressed or decompressed into planar YUV images.
Note also that TJBench, due to its lack of support for imperfect
transforms, requires that the subsampling type be known when
rotating, flipping, or transversely transposing an image. Addresses
#436
- The Java version of TJBench now has identical functionality to the C
version. This was accomplished by (somewhat hackishly) calling the
TurboJPEG C image I/O functions through JNI and copying the pixels
between the C heap and the Java heap.
- Add parameters (TJ*PARAM_RESTARTROWS and TJ*PARAM_RESTARTBLOCKS) and
a TJBench option (-restart) to allow the restart marker interval to
be specified when compressing. Eliminate the undocumented TJ_RESTART
environment variable.
- Add a parameter (TJ*PARAM_OPTIMIZE), a transform option
(TJ*OPT_OPTIMIZE), and a TJBench option (-optimize) to allow
optimized baseline Huffman coding to be specified when compressing.
Eliminate the undocumented TJ_OPTIMIZE environment variable.
- Add parameters (TJ*PARAM_XDENSITY, TJ*PARAM_DENSITY, and
TJ*DENSITYUNITS) to allow the pixel density to be specified when
compressing or saving a Windows BMP image and to be queried when
decompressing or loading a Windows BMP image. Addresses #77.
- Refactor the fuzz targets to use the new API.
* Extend decompression coverage to 12-bit and 16-bit data precision.
* Replace the awkward cjpeg12 and cjpeg16 targets with proper
TurboJPEG-based compress12, compress12-lossless, and
compress16-lossless targets
- Fix innocuous UBSan warnings uncovered by the new fuzzers.
- Implement previous versions of the TurboJPEG API by wrapping the new
functions (tested by running the 2.1.x versions of TJBench, via
tjbenchtest, and TJUnitTest against the new implementation.)
* Remove all JNI functions for deprecated Java methods and implement
the deprecated methods using pure Java wrappers. It should be
understood that backward API compatibility in Java applies only to
the Java classes and that one cannot mix and match a JAR file from
one version of libjpeg-turbo with a JNI library from another
version.
- tj3Destroy() now silently accepts a NULL handle.
- tj3Alloc() and tj3Free() now return/accept void pointers, as malloc()
and free() do.
- The image I/O functions now accept a TurboJPEG instance handle, which
is used to transmit/receive parameters and to receive error
information.
Closes #517
248 lines
9.3 KiB
Java
248 lines
9.3 KiB
Java
/*
|
|
* Copyright (C)2011, 2013, 2018, 2022-2023 D. R. Commander.
|
|
* All Rights Reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* - Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* - Neither the name of the libjpeg-turbo Project nor the names of its
|
|
* contributors may be used to endorse or promote products derived from this
|
|
* software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
package org.libjpegturbo.turbojpeg;
|
|
|
|
import java.awt.*;
|
|
|
|
/**
|
|
* Lossless transform parameters
|
|
*/
|
|
public class TJTransform extends Rectangle {
|
|
|
|
private static final long serialVersionUID = -127367705761430371L;
|
|
|
|
/**
|
|
* The number of lossless transform operations
|
|
*/
|
|
public static final int NUMOP = 8;
|
|
/**
|
|
* Do not transform the position of the image pixels.
|
|
*/
|
|
public static final int OP_NONE = 0;
|
|
/**
|
|
* Flip (mirror) image horizontally. This transform is imperfect if there
|
|
* are any partial MCU blocks on the right edge.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_HFLIP = 1;
|
|
/**
|
|
* Flip (mirror) image vertically. This transform is imperfect if there are
|
|
* any partial MCU blocks on the bottom edge.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_VFLIP = 2;
|
|
/**
|
|
* Transpose image (flip/mirror along upper left to lower right axis). This
|
|
* transform is always perfect.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_TRANSPOSE = 3;
|
|
/**
|
|
* Transverse transpose image (flip/mirror along upper right to lower left
|
|
* axis). This transform is imperfect if there are any partial MCU blocks in
|
|
* the image.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_TRANSVERSE = 4;
|
|
/**
|
|
* Rotate image clockwise by 90 degrees. This transform is imperfect if
|
|
* there are any partial MCU blocks on the bottom edge.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_ROT90 = 5;
|
|
/**
|
|
* Rotate image 180 degrees. This transform is imperfect if there are any
|
|
* partial MCU blocks in the image.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_ROT180 = 6;
|
|
/**
|
|
* Rotate image counter-clockwise by 90 degrees. This transform is imperfect
|
|
* if there are any partial MCU blocks on the right edge.
|
|
* @see #OPT_PERFECT
|
|
*/
|
|
public static final int OP_ROT270 = 7;
|
|
|
|
|
|
/**
|
|
* This option will cause {@link TJTransformer#transform
|
|
* TJTransformer.transform()} to throw an exception if the transform is not
|
|
* perfect. Lossless transforms operate on MCU blocks, whose size depends on
|
|
* the level of chrominance subsampling used. If the image's width or height
|
|
* is not evenly divisible by the MCU block size (see {@link TJ#getMCUWidth
|
|
* TJ.getMCUWidth()} and {@link TJ#getMCUHeight TJ.getMCUHeight()}), 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.
|
|
*/
|
|
public static final int OPT_PERFECT = (1 << 0);
|
|
/**
|
|
* This option will discard any partial MCU blocks that cannot be
|
|
* transformed.
|
|
*/
|
|
public static final int OPT_TRIM = (1 << 1);
|
|
/**
|
|
* This option will enable lossless cropping.
|
|
*/
|
|
public static final int OPT_CROP = (1 << 2);
|
|
/**
|
|
* This option will discard the color data in the source image and produce a
|
|
* grayscale destination image.
|
|
*/
|
|
public static final int OPT_GRAY = (1 << 3);
|
|
/**
|
|
* This option will prevent {@link TJTransformer#transform
|
|
* TJTransformer.transform()} 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.
|
|
*/
|
|
public static final int OPT_NOOUTPUT = (1 << 4);
|
|
/**
|
|
* This option will enable progressive entropy coding in the JPEG image
|
|
* generated by this particular transform. Progressive entropy coding will
|
|
* generally improve compression relative to baseline entropy coding (the
|
|
* default), but it will reduce decompression performance considerably.
|
|
* Implies {@link #OPT_OPTIMIZE}. Can be combined with
|
|
* {@link #OPT_ARITHMETIC}.
|
|
*/
|
|
public static final int OPT_PROGRESSIVE = (1 << 5);
|
|
/**
|
|
* This option will prevent {@link TJTransformer#transform
|
|
* TJTransformer.transform()} from copying any extra markers (including EXIF
|
|
* and ICC profile data) from the source image to the destination image.
|
|
*/
|
|
public static final int OPT_COPYNONE = (1 << 6);
|
|
/**
|
|
* This option will enable arithmetic entropy coding in the JPEG image
|
|
* generated by this particular transform. Arithmetic entropy coding will
|
|
* generally improve compression relative to Huffman entropy coding (the
|
|
* default), but it will reduce decompression performance considerably. Can
|
|
* be combined with {@link #OPT_PROGRESSIVE}.
|
|
*/
|
|
public static final int OPT_ARITHMETIC = (1 << 7);
|
|
/**
|
|
* This option will enable optimized baseline entropy coding in the JPEG
|
|
* image generated by this particular transform. Optimized baseline entropy
|
|
* coding will improve compression slightly (generally 5% or less.)
|
|
*/
|
|
public static final int OPT_OPTIMIZE = (1 << 8);
|
|
|
|
|
|
/**
|
|
* Create a new lossless transform instance.
|
|
*/
|
|
public TJTransform() {
|
|
}
|
|
|
|
/**
|
|
* Create a new lossless transform instance with the given parameters.
|
|
*
|
|
* @param x the left boundary of the cropping region. This must be evenly
|
|
* divisible by the MCU block width (see {@link TJ#getMCUWidth
|
|
* TJ.getMCUWidth()})
|
|
*
|
|
* @param y the upper boundary of the cropping region. This must be evenly
|
|
* divisible by the MCU block height (see {@link TJ#getMCUHeight
|
|
* TJ.getMCUHeight()})
|
|
*
|
|
* @param w the width of the cropping region. Setting this to 0 is the
|
|
* equivalent of setting it to (width of the source JPEG image -
|
|
* <code>x</code>).
|
|
*
|
|
* @param h the height of the cropping region. Setting this to 0 is the
|
|
* equivalent of setting it to (height of the source JPEG image -
|
|
* <code>y</code>).
|
|
*
|
|
* @param op one of the transform operations ({@link #OP_NONE OP_*})
|
|
*
|
|
* @param options the bitwise OR of one or more of the transform options
|
|
* ({@link #OPT_PERFECT OPT_*})
|
|
*
|
|
* @param cf an instance of an object that implements the
|
|
* {@link TJCustomFilter} interface, or null if no custom filter is needed
|
|
*/
|
|
@SuppressWarnings("checkstyle:HiddenField")
|
|
public TJTransform(int x, int y, int w, int h, int op, int options,
|
|
TJCustomFilter cf) {
|
|
super(x, y, w, h);
|
|
this.op = op;
|
|
this.options = options;
|
|
this.cf = cf;
|
|
}
|
|
|
|
/**
|
|
* Create a new lossless transform instance with the given parameters.
|
|
*
|
|
* @param r a <code>java.awt.Rectangle</code> instance that specifies the
|
|
* cropping region. See
|
|
* {@link #TJTransform(int, int, int, int, int, int, TJCustomFilter)} for
|
|
* more details.
|
|
*
|
|
* @param op one of the transform operations ({@link #OP_NONE OP_*})
|
|
*
|
|
* @param options the bitwise OR of one or more of the transform options
|
|
* ({@link #OPT_PERFECT OPT_*})
|
|
*
|
|
* @param cf an instance of an object that implements the
|
|
* {@link TJCustomFilter} interface, or null if no custom filter is needed
|
|
*/
|
|
@SuppressWarnings("checkstyle:HiddenField")
|
|
public TJTransform(Rectangle r, int op, int options,
|
|
TJCustomFilter cf) {
|
|
super(r);
|
|
this.op = op;
|
|
this.options = options;
|
|
this.cf = cf;
|
|
}
|
|
|
|
/**
|
|
* Transform operation (one of {@link #OP_NONE OP_*})
|
|
*/
|
|
@SuppressWarnings("checkstyle:VisibilityModifier")
|
|
public int op = 0;
|
|
|
|
/**
|
|
* Transform options (bitwise OR of one or more of
|
|
* {@link #OPT_PERFECT OPT_*})
|
|
*/
|
|
@SuppressWarnings("checkstyle:VisibilityModifier")
|
|
public int options = 0;
|
|
|
|
/**
|
|
* Custom filter instance
|
|
*/
|
|
@SuppressWarnings("checkstyle:VisibilityModifier")
|
|
public TJCustomFilter cf = null;
|
|
}
|