From 8d76e4e5504fbc2cb73c40a7406607c30cec22e4 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 31 Aug 2024 15:33:55 -0400 Subject: [PATCH] Doc: "EXIF" = "Exif" --- ChangeLog.md | 6 +++--- doc/html/group___turbo_j_p_e_g.html | 6 +++--- java/TJBench.java | 2 +- java/doc/index-all.html | 2 +- java/doc/member-search-index.zip | Bin 1951 -> 1951 bytes .../libjpegturbo/turbojpeg/TJTransform.html | 4 ++-- java/doc/package-search-index.zip | Bin 237 -> 237 bytes java/doc/type-search-index.zip | Bin 311 -> 311 bytes .../libjpegturbo/turbojpeg/TJTransform.java | 2 +- tjbench.c | 2 +- turbojpeg.h | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index f90a0531..48a9ecbd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1071,7 +1071,7 @@ generated by selected transforms in a multi-transform operation. 6. Introduced a new transform option in the TurboJPEG API (`TJXOPT_COPYNONE` in the C API and `TJTransform.OPT_COPYNONE` in the Java API) that allows the -copying of markers (including EXIF and ICC profile data) to be disabled for a +copying of markers (including Exif and ICC profile data) to be disabled for a particular transform. 7. Added two functions to the TurboJPEG C API (`tjLoadImage()` and @@ -1202,13 +1202,13 @@ bug that has existed since the introduction of libjpeg v7/v8 API/ABI emulation in libjpeg-turbo v1.1. 7. The lossless transform features in jpegtran and the TurboJPEG API will now -always attempt to adjust the EXIF image width and height tags if the image size +always attempt to adjust the Exif image width and height tags if the image size changed as a result of the transform. This behavior has always existed when using libjpeg v8 API/ABI emulation. It was supposed to be available with libjpeg v7 API/ABI emulation as well but did not work properly due to a bug. Furthermore, there was never any good reason not to enable it with libjpeg v6b API/ABI emulation, since the behavior is entirely internal. Note that -`-copy all` must be passed to jpegtran in order to transfer the EXIF tags from +`-copy all` must be passed to jpegtran in order to transfer the Exif tags from the source image to the destination image. 8. Fixed several memory leaks in the TurboJPEG API library that could occur diff --git a/doc/html/group___turbo_j_p_e_g.html b/doc/html/group___turbo_j_p_e_g.html index b71dbcc6..f55c748b 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -135,7 +135,7 @@ Macros  Generate a progressive destination image instead of a single-scan destination image.
  #define TJXOPT_COPYNONE - Do not copy any extra markers (including EXIF and ICC profile data) from the source image to the destination image.
+ Do not copy any extra markers (including Exif and ICC profile data) from the source image to the destination image.
  #define TJXOPT_ARITHMETIC  Enable arithmetic entropy coding in the destination image.
@@ -580,7 +580,7 @@ scalingFactor).

-

Do not copy any extra markers (including EXIF and ICC profile data) from the source image to the destination image.

+

Do not copy any extra markers (including Exif and ICC profile data) from the source image to the destination image.

@@ -3173,7 +3173,7 @@ If you choose option 1, then *jpegSize should be set to the size of dstBufspointer to an array of n byte buffers. dstBufs[i] will receive a JPEG image that has been transformed using the parameters in transforms[i]. TurboJPEG has the ability to reallocate the JPEG destination buffer to accommodate the size of the transformed JPEG image. Thus, you can choose to:
  1. pre-allocate the JPEG destination buffer with an arbitrary size using tj3Alloc() and let TurboJPEG grow the buffer as needed,
  2. set dstBufs[i] to NULL to tell TurboJPEG to allocate the buffer for you, or
    3. -
  3. pre-allocate the buffer to a "worst case" size determined by calling tj3JPEGBufSize() with the transformed or cropped width and height and the level of subsampling used in the source image. Under normal circumstances, this should ensure that the buffer never has to be re-allocated. (Setting TJPARAM_NOREALLOC guarantees that it won't be.) Note, however, that there are some rare cases (such as transforming images with a large amount of embedded EXIF or ICC profile data) in which the transformed JPEG image will be larger than the worst-case size, and TJPARAM_NOREALLOC cannot be used in those cases.
    4. +
  4. pre-allocate the buffer to a "worst case" size determined by calling tj3JPEGBufSize() with the transformed or cropped width and height and the level of subsampling used in the source image. Under normal circumstances, this should ensure that the buffer never has to be re-allocated. (Setting TJPARAM_NOREALLOC guarantees that it won't be.) Note, however, that there are some rare cases (such as transforming images with a large amount of embedded Exif or ICC profile data) in which the transformed JPEG image will be larger than the worst-case size, and TJPARAM_NOREALLOC cannot be used in those cases.
If you choose option 1, then dstSizes[i] should be set to the size of your pre-allocated buffer. In any case, unless you have set TJPARAM_NOREALLOC, you should always check dstBufs[i] upon return from this function, as it may have changed. dstSizespointer to an array of n size_t variables that will receive the actual sizes (in bytes) of each transformed JPEG image. If dstBufs[i] points to a pre-allocated buffer, then dstSizes[i] should be set to the size of the buffer. Upon return, dstSizes[i] will contain the size of the transformed JPEG image (in bytes.) diff --git a/java/TJBench.java b/java/TJBench.java index 7fc3377c..e42142c5 100644 --- a/java/TJBench.java +++ b/java/TJBench.java @@ -852,7 +852,7 @@ final class TJBench { System.out.println(" prior to decompression (these operations are mutually exclusive)"); System.out.println("-grayscale = Transform the input image into a grayscale JPEG image prior to"); System.out.println(" decompression (can be combined with the other transform operations above)"); - System.out.println("-copynone = Do not copy any extra markers (including EXIF and ICC profile data)"); + System.out.println("-copynone = Do not copy any extra markers (including Exif and ICC profile data)"); System.out.println(" when transforming the input image"); System.out.println("-yuv = Compress from/decompress to intermediate planar YUV images"); System.out.println(" ** 8-bit data precision only **"); diff --git a/java/doc/index-all.html b/java/doc/index-all.html index c6ee8b4d..b08dcddb 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -672,7 +672,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
OPT_COPYNONE - Static variable in class org.libjpegturbo.turbojpeg.TJTransform
-
Do not copy any extra markers (including EXIF and ICC profile data) from +
Do not copy any extra markers (including Exif and ICC profile data) from the source image to the destination image.
OPT_CROP - Static variable in class org.libjpegturbo.turbojpeg.TJTransform
diff --git a/java/doc/member-search-index.zip b/java/doc/member-search-index.zip index 3d25c5cc18ab07d61033d46e9d2732ed469cb323..8a463469d650bd97f55a6c3b1e5eff782cefb6d3 100644 GIT binary patch delta 28 jcmbQwKcAl`z?+#xgn@&DgF(DzBabsXlX%VKKz2U>Pd^2p delta 28 jcmbQwKcAl`z?+#xgn@&DgF!HJBabsXlVIlLKz2U>O^O9= diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html index 07a89ad2..0c4cf150 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html @@ -276,7 +276,7 @@ extends java.awt.Rectangle static int OPT_COPYNONE -
Do not copy any extra markers (including EXIF and ICC profile data) from +
Do not copy any extra markers (including Exif and ICC profile data) from the source image to the destination image.
@@ -710,7 +710,7 @@ extends java.awt.Rectangle

  • OPT_COPYNONE

    public static final int OPT_COPYNONE
    -
    Do not copy any extra markers (including EXIF and ICC profile data) from +
    Do not copy any extra markers (including Exif and ICC profile data) from the source image to the destination image.
    See Also:
    diff --git a/java/doc/package-search-index.zip b/java/doc/package-search-index.zip index 801c3a7becfc8d1ecf44b6f9e70fd33d33e6ff69..929c54dd2fcdaedd10377ea676ddb38adfc6f5c5 100644 GIT binary patch delta 26 gcmaFM_?D3;z?+#xgn@&DgF(DzBF_XSAUV$;08|(TiU0rr delta 26 gcmaFM_?D3;z?+#xgn@&DgF!HJBF_XSAUV$;08*|7SO5S3 diff --git a/java/doc/type-search-index.zip b/java/doc/type-search-index.zip index 62d70e25d236ddbf601e642d4195fc94c5fb401e..bc0a78c5ebcde41ce8164adf6f07c2741bbcda50 100644 GIT binary patch delta 26 gcmdnaw4I43z?+#xgn@&DgF(DzBF|kWAo