Merge branch 'main' into dev
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (C)2011, 2013, 2018, 2022 D. R. Commander. All Rights Reserved.
|
||||
* 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:
|
||||
@@ -97,7 +98,7 @@ public class TJTransform extends Rectangle {
|
||||
* 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}
|
||||
* and {@link 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
|
||||
* 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
|
||||
@@ -114,8 +115,8 @@ public class TJTransform extends Rectangle {
|
||||
*/
|
||||
public static final int OPT_CROP = (1 << 2);
|
||||
/**
|
||||
* This option will discard the color data in the input image and produce
|
||||
* a grayscale output image.
|
||||
* 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);
|
||||
/**
|
||||
@@ -127,7 +128,7 @@ public class TJTransform extends Rectangle {
|
||||
*/
|
||||
public static final int OPT_NOOUTPUT = (1 << 4);
|
||||
/**
|
||||
* This option will enable progressive entropy coding in the output image
|
||||
* 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 compression and decompression performance
|
||||
@@ -137,11 +138,11 @@ public class TJTransform extends Rectangle {
|
||||
/**
|
||||
* 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 output image.
|
||||
* 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 output image
|
||||
* 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 compression and decompression performance
|
||||
@@ -173,10 +174,10 @@ public class TJTransform extends Rectangle {
|
||||
* equivalent of setting it to (height of the source JPEG image -
|
||||
* <code>y</code>).
|
||||
*
|
||||
* @param op one of the transform operations (<code>OP_*</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
|
||||
* (<code>OPT_*</code>)
|
||||
* ({@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
|
||||
@@ -198,10 +199,10 @@ public class TJTransform extends Rectangle {
|
||||
* #TJTransform(int, int, int, int, int, int, TJCustomFilter)} for more
|
||||
* detail.
|
||||
*
|
||||
* @param op one of the transform operations (<code>OP_*</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
|
||||
* (<code>OPT_*</code>)
|
||||
* ({@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
|
||||
@@ -216,13 +217,14 @@ public class TJTransform extends Rectangle {
|
||||
}
|
||||
|
||||
/**
|
||||
* Transform operation (one of <code>OP_*</code>)
|
||||
* Transform operation (one of {@link #OP_NONE OP_*})
|
||||
*/
|
||||
@SuppressWarnings("checkstyle:VisibilityModifier")
|
||||
public int op = 0;
|
||||
|
||||
/**
|
||||
* Transform options (bitwise OR of one or more of <code>OPT_*</code>)
|
||||
* Transform options (bitwise OR of one or more of
|
||||
* {@link #OPT_PERFECT OPT_*})
|
||||
*/
|
||||
@SuppressWarnings("checkstyle:VisibilityModifier")
|
||||
public int options = 0;
|
||||
|
||||
Reference in New Issue
Block a user