This option will discard any partial MCU blocks that cannot be diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html index cf65bd2..86fafa3 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html @@ -217,31 +217,45 @@ extends java.awt.Rectangle static int +OPT_COPYNONE +

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

+ + + +static int OPT_CROP

This option will enable lossless cropping.

- + static int OPT_GRAY

This option will discard the color data in the input image and produce a grayscale output image.

- + static int OPT_NOOUTPUT

This option will prevent TJTransformer.transform() from outputting a JPEG image for this particular transform.

- + static int OPT_PERFECT

This option will cause TJTransformer.transform() to throw an exception if the transform is not perfect.

+ +static int +OPT_PROGRESSIVE +

This option will enable progressive entropy coding in the output image + generated by this particular transform.

+ + static int OPT_TRIM @@ -548,6 +562,33 @@ extends java.awt.Rectangle

See Also:: Constant Field Values

+ + + +

+
OPT_PROGRESSIVE
+
```
public static final int OPT_PROGRESSIVE
```
+
This option will enable progressive entropy coding in the output 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 + considerably.
+
See Also:
Constant Field Values
+

+ + + +

+
OPT_COPYNONE
+
```
public static final int OPT_COPYNONE
```
+
This option will prevent TJTransformer.transform() from copying any extra markers (including EXIF + and ICC profile data) from the source image to the output image.
+
See Also:
Constant Field Values
+

diff --git a/java/org/libjpegturbo/turbojpeg/TJTransform.java b/java/org/libjpegturbo/turbojpeg/TJTransform.java index 7381f36..1b10d3d 100644 --- a/java/org/libjpegturbo/turbojpeg/TJTransform.java +++ b/java/org/libjpegturbo/turbojpeg/TJTransform.java @@ -103,21 +103,21 @@ public class TJTransform extends Rectangle { * 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; + public static final int OPT_PERFECT = 1; /** * This option will discard any partial MCU blocks that cannot be * transformed. */ - public static final int OPT_TRIM = 2; + public static final int OPT_TRIM = 2; /** * This option will enable lossless cropping. */ - public static final int OPT_CROP = 4; + public static final int OPT_CROP = 4; /** * This option will discard the color data in the input image and produce * a grayscale output image. */ - public static final int OPT_GRAY = 8; + public static final int OPT_GRAY = 8; /** * This option will prevent {@link TJTransformer#transform * TJTransformer.transform()} from outputting a JPEG image for this @@ -125,7 +125,21 @@ public class TJTransform extends Rectangle { * filter to capture the transformed DCT coefficients without transcoding * them. */ - public static final int OPT_NOOUTPUT = 16; + public static final int OPT_NOOUTPUT = 16; + /** + * This option will enable progressive entropy coding in the output 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 + * considerably. + */ + public static final int OPT_PROGRESSIVE = 32; + /** + * 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. + */ + public static final int OPT_COPYNONE = 64; /** diff --git a/tjbench.c b/tjbench.c index a5be7d4..450e128 100644 --- a/tjbench.c +++ b/tjbench.c @@ -785,6 +785,8 @@ void usage(char *progname) printf(" decompression (these options are mutually exclusive)\n"); printf("-grayscale = Perform lossless grayscale conversion prior to decompression\n"); printf(" test (can be combined with the other transforms above)\n"); + printf("-copynone = Do not copy any extra markers (including EXIF and ICC profile data)\n"); + printf(" when transforming the image.\n"); printf("-benchtime = Run each benchmark for at least seconds (default = 5.0)\n"); printf("-warmup = Run each benchmark for seconds (default = 1.0) prior to\n"); printf(" starting the timer, in order to prime the caches and thus improve the\n"); @@ -902,6 +904,7 @@ int main(int argc, char *argv[]) if(!strcasecmp(argv[i], "-grayscale")) xformopt|=TJXOPT_GRAY; if(!strcasecmp(argv[i], "-custom")) customFilter=dummyDCTFilter; if(!strcasecmp(argv[i], "-nooutput")) xformopt|=TJXOPT_NOOUTPUT; + if(!strcasecmp(argv[i], "-copynone")) xformopt|=TJXOPT_COPYNONE; if(!strcasecmp(argv[i], "-benchtime") && ijerr.stopOnWarning=(flags & TJFLAG_STOPONWARNING) ? TRUE : FALSE; @@ -2140,9 +2140,10 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, } else xinfo[i].crop_height=JCROP_UNSET; } + if(!(t[i].options&TJXOPT_COPYNONE)) saveMarkers=1; } - jcopy_markers_setup(dinfo, JCOPYOPT_ALL); + jcopy_markers_setup(dinfo, saveMarkers ? JCOPYOPT_ALL:JCOPYOPT_NONE); jpeg_read_header(dinfo, TRUE); jpegSubsamp=getSubsamp(dinfo); if(jpegSubsamp<0) @@ -2189,12 +2190,13 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, jpeg_copy_critical_parameters(dinfo, cinfo); dstcoefs=jtransform_adjust_parameters(dinfo, cinfo, srccoefs, &xinfo[i]); - if(flags&TJFLAG_PROGRESSIVE) + if(flags&TJFLAG_PROGRESSIVE || t[i].options&TJXOPT_PROGRESSIVE) jpeg_simple_progression(cinfo); if(!(t[i].options&TJXOPT_NOOUTPUT)) { jpeg_write_coefficients(cinfo, dstcoefs); - jcopy_markers_execute(dinfo, cinfo, JCOPYOPT_ALL); + jcopy_markers_execute(dinfo, cinfo, + t[i].options&TJXOPT_COPYNONE ? JCOPYOPT_NONE:JCOPYOPT_ALL); } else jinit_c_master_control(cinfo, TRUE); jtransform_execute_transformation(dinfo, cinfo, srccoefs, diff --git a/turbojpeg.h b/turbojpeg.h index 8b4a4da..c4e48cc 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -488,29 +488,43 @@ enum TJXOP * that cannot be transformed will be left in place, which will create * odd-looking strips on the right or bottom edge of the image. */ -#define TJXOPT_PERFECT 1 +#define TJXOPT_PERFECT 1 /** * This option will cause #tjTransform() to discard any partial MCU blocks that * cannot be transformed. */ -#define TJXOPT_TRIM 2 +#define TJXOPT_TRIM 2 /** * This option will enable lossless cropping. See #tjTransform() for more * information. */ -#define TJXOPT_CROP 4 +#define TJXOPT_CROP 4 /** * This option will discard the color data in the input image and produce * a grayscale output image. */ -#define TJXOPT_GRAY 8 +#define TJXOPT_GRAY 8 /** * 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.) */ -#define TJXOPT_NOOUTPUT 16 +#define TJXOPT_NOOUTPUT 16 +/** + * This option will enable progressive entropy coding in the output 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 + * considerably. + */ +#define TJXOPT_PROGRESSIVE 32 +/** + * This option will prevent #tjTransform() from copying any extra markers + * (including EXIF and ICC profile data) from the source image to the output + * image. + */ +#define TJXOPT_COPYNONE 64 /** -- 2.40.0