TurboJPEG: ICC profile support

2025-03-28 21:13:18 +00:00 · 2024-09-03 07:54:17 -04:00 · 2024-09-03 07:54:17 -04:00 · a272858212
commit a272858212
parent c6de7d87ad
42 changed files with 1336 additions and 375 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -378,8 +378,9 @@ set(TURBOJPEG_SO_MAJOR_VERSION 0)
 #    function so that it accepts "abbreviated table specification" (AKA
 #    "tables-only") datastreams as well as JPEG images, but that did not affect
 #    forward API/ABI compatibility.
-# 3: TurboJPEG 3 API
-set(TURBOJPEG_SO_AGE 3)
+# 3: TurboJPEG 3.0.x API
+# 4: TurboJPEG 3.1.x API
+set(TURBOJPEG_SO_AGE 4)
 set(TURBOJPEG_SO_VERSION 0.${TURBOJPEG_SO_AGE}.0)


--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -75,6 +75,14 @@ C API.
 restart markers to all destination images if
 `TJPARAM_RESTARTBLOCKS`/`TJ.PARAM_RESTARTBLOCKS` or
 `TJPARAM_RESTARTROWS`/`TJ.PARAM_RESTARTROWS` is set.
+     - New functions/methods (`tj3SetICCProfile()` /
+`TJCompressor.setICCProfile()` / `TJTransformer.setICCProfile()` and
+`tj3GetICCProfile()` / `TJDecompressor.getICCProfile()`) can be used to embed
+and retrieve ICC profiles.
+     - A new parameter (`TJPARAM_SAVEMARKERS`/`TJ.PARAM_SAVEMARKERS`) can be
+used to specify the types of markers that will be copied from the source image
+to the destination image during lossless transformation if
+`TJXOPT_COPYNONE`/`TJTransform.OPT_COPYNONE` is not specified.

 9. TJExample has been replaced with three programs (TJComp, TJDecomp, and
 TJTran) that demonstrate how to approximate the functionality of cjpeg, djpeg,
--- a/doc/turbojpeg/group___turbo_j_p_e_g.html
+++ b/doc/turbojpeg/group___turbo_j_p_e_g.html
@ -242,6 +242,7 @@ Enumerations</h2></td></tr>
 , <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0de0a8281da45d1fc984edc8918f7dd2">TJPARAM_MAXMEMORY</a>
 , <br />
 &#160;&#160;<a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac4e95dd2ecd766854feee579406eae68">TJPARAM_MAXPIXELS</a>
+, <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1">TJPARAM_SAVEMARKERS</a>
 <br />
 }</td></tr>
 <tr class="memdesc:gaa0f6be63ba78278299c9f5c12031fe82"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameters.  <a href="group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82">More...</a><br /></td></tr>
@ -307,6 +308,9 @@ Functions</h2></td></tr>
 <tr class="memitem:ga969767ec8180cc3edd99cf507f87299b" id="r_ga969767ec8180cc3edd99cf507f87299b"><td class="memItemLeft" align="right" valign="top">DLLEXPORT int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b">tj3YUVPlaneHeight</a> (int componentID, int height, int subsamp)</td></tr>
 <tr class="memdesc:ga969767ec8180cc3edd99cf507f87299b"><td class="mdescLeft">&#160;</td><td class="mdescRight">The plane height of a YUV image plane with the given parameters.  <br /></td></tr>
 <tr class="separator:ga969767ec8180cc3edd99cf507f87299b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga5852aa6e9ee3a457798a1741642dec40" id="r_ga5852aa6e9ee3a457798a1741642dec40"><td class="memItemLeft" align="right" valign="top">DLLEXPORT int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40">tj3SetICCProfile</a> (<a class="el" href="group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763">tjhandle</a> handle, unsigned char *iccBuf, size_t iccSize)</td></tr>
+<tr class="memdesc:ga5852aa6e9ee3a457798a1741642dec40"><td class="mdescLeft">&#160;</td><td class="mdescRight">Embed an ICC (International Color Consortium) color management profile in JPEG images generated by subsequent compression and lossless transformation operations.  <br /></td></tr>
+<tr class="separator:ga5852aa6e9ee3a457798a1741642dec40"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga2cc418a2dab709ad7f30f5b25905f138" id="r_ga2cc418a2dab709ad7f30f5b25905f138"><td class="memItemLeft" align="right" valign="top">DLLEXPORT int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group___turbo_j_p_e_g.html#ga2cc418a2dab709ad7f30f5b25905f138">tj3Compress8</a> (<a class="el" href="group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763">tjhandle</a> handle, const unsigned char *srcBuf, int width, int pitch, int height, int pixelFormat, unsigned char **jpegBuf, size_t *jpegSize)</td></tr>
 <tr class="memdesc:ga2cc418a2dab709ad7f30f5b25905f138"><td class="mdescLeft">&#160;</td><td class="mdescRight">Compress a packed-pixel RGB, grayscale, or CMYK image with 2 to 8 bits of data precision per sample into a JPEG image with the same data precision.  <br /></td></tr>
 <tr class="separator:ga2cc418a2dab709ad7f30f5b25905f138"><td class="memSeparator" colspan="2">&#160;</td></tr>
@ -331,6 +335,9 @@ Functions</h2></td></tr>
 <tr class="memitem:ga96d2c4b3432f9d88ad14758ae240b8d1" id="r_ga96d2c4b3432f9d88ad14758ae240b8d1"><td class="memItemLeft" align="right" valign="top">DLLEXPORT int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group___turbo_j_p_e_g.html#ga96d2c4b3432f9d88ad14758ae240b8d1">tj3DecompressHeader</a> (<a class="el" href="group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763">tjhandle</a> handle, const unsigned char *jpegBuf, size_t jpegSize)</td></tr>
 <tr class="memdesc:ga96d2c4b3432f9d88ad14758ae240b8d1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve information about a JPEG image without decompressing it, or prime the decompressor with quantization and Huffman tables.  <br /></td></tr>
 <tr class="separator:ga96d2c4b3432f9d88ad14758ae240b8d1"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga63dc21a762b26aa217e8f48ac748bef7" id="r_ga63dc21a762b26aa217e8f48ac748bef7"><td class="memItemLeft" align="right" valign="top">DLLEXPORT int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group___turbo_j_p_e_g.html#ga63dc21a762b26aa217e8f48ac748bef7">tj3GetICCProfile</a> (<a class="el" href="group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763">tjhandle</a> handle, unsigned char **iccBuf, size_t *iccSize)</td></tr>
+<tr class="memdesc:ga63dc21a762b26aa217e8f48ac748bef7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the ICC (International Color Consortium) color management profile (if any) that was previously extracted from a JPEG image.  <br /></td></tr>
+<tr class="separator:ga63dc21a762b26aa217e8f48ac748bef7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gaf9253e0c2e9f464142d389673da085fa" id="r_gaf9253e0c2e9f464142d389673da085fa"><td class="memItemLeft" align="right" valign="top">DLLEXPORT <a class="el" href="structtjscalingfactor.html">tjscalingfactor</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa">tj3GetScalingFactors</a> (int *numScalingFactors)</td></tr>
 <tr class="memdesc:gaf9253e0c2e9f464142d389673da085fa"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns a list of fractional scaling factors that the JPEG decompressor supports.  <br /></td></tr>
 <tr class="separator:gaf9253e0c2e9f464142d389673da085fa"><td class="memSeparator" colspan="2">&#160;</td></tr>
@ -1022,6 +1029,17 @@ scalingFactor)</code>. </p>
 <li>maximum number of pixels that the decompression, transform, and image loading functions will process <em>[default: <code>0</code> (no limit)]</em> </li>
 </ul>
 </td></tr>
+<tr><td class="fieldname"><a id="ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1" name="ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1"></a>TJPARAM_SAVEMARKERS&#160;</td><td class="fielddoc"><p>Marker copying behavior [decompression, lossless transformation]. </p>
+<p><b>Value [lossless transformation]</b></p><ul>
+<li><code>0</code> Do not copy any extra markers (including comments, JFIF thumbnails, Exif data, and ICC profile data) from the source image to the destination image.</li>
+<li><code>1</code> Do not copy any extra markers, except comment (COM) markers, from the source image to the destination image.</li>
+<li><code>2</code> <em>[default]</em> Copy all extra markers from the source image to the destination image.</li>
+<li><code>3</code> Copy all extra markers, except ICC profile data (APP2 markers), from the source image to the destination image.</li>
+<li><code>4</code> Do not copy any extra markers, except ICC profile data (APP2 markers), from the source image to the destination image.</li>
+</ul>
+<p><a class="el" href="group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8" title="Do not copy any extra markers (including Exif and ICC profile data) from the source image to the dest...">TJXOPT_COPYNONE</a> overrides this parameter for a particular transform. This parameter overrides any ICC profile that was previously associated with the TurboJPEG instance using <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>.</p>
+<p>When decompressing, <a class="el" href="group___turbo_j_p_e_g.html#ga96d2c4b3432f9d88ad14758ae240b8d1" title="Retrieve information about a JPEG image without decompressing it, or prime the decompressor with quan...">tj3DecompressHeader()</a> extracts the ICC profile from a JPEG image if this parameter is set to <code>2</code> or <code>4</code>. <a class="el" href="group___turbo_j_p_e_g.html#ga63dc21a762b26aa217e8f48ac748bef7" title="Retrieve the ICC (International Color Consortium) color management profile (if any) that was previous...">tj3GetICCProfile()</a> can then be used to retrieve the profile. </p>
+</td></tr>
 </table>

 </div>
@ -1276,7 +1294,7 @@ scalingFactor)</code>. </p>
    <tr><td class="paramname">jpegBuf</td><td>address of a pointer to a byte buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:<ol type="1">
 <li>pre-allocate the JPEG buffer with an arbitrary size using <a class="el" href="group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57" title="Allocate a byte buffer for use with TurboJPEG.">tj3Alloc()</a> and let TurboJPEG grow the buffer as needed,</li>
 <li>set <code>*jpegBuf</code> to NULL to tell TurboJPEG to allocate the buffer for you, or</li>
-<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a>. This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
+<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> and adding the return value to the size of the ICC profile (if any) that was previously associated with the TurboJPEG instance (see <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>.) This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
 </ol>
 If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the size of your pre-allocated buffer. In any case, unless you have set <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a>, you should always check <code>*jpegBuf</code> upon return from this function, as it may have changed.</td></tr>
    <tr><td class="paramname">jpegSize</td><td>pointer to a size_t variable that holds the size of the JPEG buffer. If <code>*jpegBuf</code> points to a pre-allocated buffer, then <code>*jpegSize</code> should be set to the size of the buffer. Upon return, <code>*jpegSize</code> will contain the size of the JPEG image (in bytes.) If <code>*jpegBuf</code> points to a JPEG buffer that is being reused from a previous call to one of the JPEG compression functions, then <code>*jpegSize</code> is ignored.</td></tr>
@ -1361,7 +1379,7 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
    <tr><td class="paramname">jpegBuf</td><td>address of a pointer to a byte buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:<ol type="1">
 <li>pre-allocate the JPEG buffer with an arbitrary size using <a class="el" href="group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57" title="Allocate a byte buffer for use with TurboJPEG.">tj3Alloc()</a> and let TurboJPEG grow the buffer as needed,</li>
 <li>set <code>*jpegBuf</code> to NULL to tell TurboJPEG to allocate the buffer for you, or</li>
-<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a>. This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
+<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> and adding the return value to the size of the ICC profile (if any) that was previously associated with the TurboJPEG instance (see <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>.) This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
 </ol>
 If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the size of your pre-allocated buffer. In any case, unless you have set <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a>, you should always check <code>*jpegBuf</code> upon return from this function, as it may have changed.</td></tr>
    <tr><td class="paramname">jpegSize</td><td>pointer to a size_t variable that holds the size of the JPEG buffer. If <code>*jpegBuf</code> points to a pre-allocated buffer, then <code>*jpegSize</code> should be set to the size of the buffer. Upon return, <code>*jpegSize</code> will contain the size of the JPEG image (in bytes.) If <code>*jpegBuf</code> points to a JPEG buffer that is being reused from a previous call to one of the JPEG compression functions, then <code>*jpegSize</code> is ignored.</td></tr>
@ -1446,7 +1464,7 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
    <tr><td class="paramname">jpegBuf</td><td>address of a pointer to a byte buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:<ol type="1">
 <li>pre-allocate the JPEG buffer with an arbitrary size using <a class="el" href="group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57" title="Allocate a byte buffer for use with TurboJPEG.">tj3Alloc()</a> and let TurboJPEG grow the buffer as needed,</li>
 <li>set <code>*jpegBuf</code> to NULL to tell TurboJPEG to allocate the buffer for you, or</li>
-<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a>. This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
+<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> and adding the return value to the size of the ICC profile (if any) that was previously associated with the TurboJPEG instance (see <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>.) This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
 </ol>
 If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the size of your pre-allocated buffer. In any case, unless you have set <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a>, you should always check <code>*jpegBuf</code> upon return from this function, as it may have changed.</td></tr>
    <tr><td class="paramname">jpegSize</td><td>pointer to a size_t variable that holds the size of the JPEG buffer. If <code>*jpegBuf</code> points to a pre-allocated buffer, then <code>*jpegSize</code> should be set to the size of the buffer. Upon return, <code>*jpegSize</code> will contain the size of the JPEG image (in bytes.) If <code>*jpegBuf</code> points to a JPEG buffer that is being reused from a previous call to one of the JPEG compression functions, then <code>*jpegSize</code> is ignored.</td></tr>
@ -1524,7 +1542,7 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
    <tr><td class="paramname">jpegBuf</td><td>address of a pointer to a byte buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:<ol type="1">
 <li>pre-allocate the JPEG buffer with an arbitrary size using <a class="el" href="group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57" title="Allocate a byte buffer for use with TurboJPEG.">tj3Alloc()</a> and let TurboJPEG grow the buffer as needed,</li>
 <li>set <code>*jpegBuf</code> to NULL to tell TurboJPEG to allocate the buffer for you, or</li>
-<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a>. This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
+<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> and adding the return value to the size of the ICC profile (if any) that was previously associated with the TurboJPEG instance (see <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>.) This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
 </ol>
 If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the size of your pre-allocated buffer. In any case, unless you have set <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a>, you should always check <code>*jpegBuf</code> upon return from this function, as it may have changed.</td></tr>
    <tr><td class="paramname">jpegSize</td><td>pointer to a size_t variable that holds the size of the JPEG buffer. If <code>*jpegBuf</code> points to a pre-allocated buffer, then <code>*jpegSize</code> should be set to the size of the buffer. Upon return, <code>*jpegSize</code> will contain the size of the JPEG image (in bytes.) If <code>*jpegBuf</code> points to a JPEG buffer that is being reused from a previous call to one of the JPEG compression functions, then <code>*jpegSize</code> is ignored.</td></tr>
@ -1602,7 +1620,7 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
    <tr><td class="paramname">jpegBuf</td><td>address of a pointer to a byte buffer that will receive the JPEG image. TurboJPEG has the ability to reallocate the JPEG buffer to accommodate the size of the JPEG image. Thus, you can choose to:<ol type="1">
 <li>pre-allocate the JPEG buffer with an arbitrary size using <a class="el" href="group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57" title="Allocate a byte buffer for use with TurboJPEG.">tj3Alloc()</a> and let TurboJPEG grow the buffer as needed,</li>
 <li>set <code>*jpegBuf</code> to NULL to tell TurboJPEG to allocate the buffer for you, or</li>
-<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a>. This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
+<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> and adding the return value to the size of the ICC profile (if any) that was previously associated with the TurboJPEG instance (see <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>.) This should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> guarantees that it won't be.)</li>
 </ol>
 If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the size of your pre-allocated buffer. In any case, unless you have set <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a>, you should always check <code>*jpegBuf</code> upon return from this function, as it may have changed.</td></tr>
    <tr><td class="paramname">jpegSize</td><td>pointer to a size_t variable that holds the size of the JPEG buffer. If <code>*jpegBuf</code> points to a pre-allocated buffer, then <code>*jpegSize</code> should be set to the size of the buffer. Upon return, <code>*jpegSize</code> will contain the size of the JPEG image (in bytes.) If <code>*jpegBuf</code> points to a JPEG buffer that is being reused from a previous call to one of the JPEG compression functions, then <code>*jpegSize</code> is ignored.</td></tr>
@ -2009,7 +2027,7 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
 </div><div class="memdoc">

 <p>Retrieve information about a JPEG image without decompressing it, or prime the decompressor with quantization and Huffman tables. </p>
-<p>If a JPEG image is passed to this function, then the <a class="el" href="group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82">parameters</a> that describe the JPEG image will be set when the function returns.</p>
+<p>If a JPEG image is passed to this function, then the <a class="el" href="group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82">parameters</a> that describe the JPEG image will be set when the function returns. If a JPEG image is passed to this function and <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1" title="Marker copying behavior [decompression, lossless transformation].">TJPARAM_SAVEMARKERS</a> is set to <code>2</code> or <code>4</code>, then the ICC profile (if any) will be extracted from the JPEG image. (<a class="el" href="group___turbo_j_p_e_g.html#ga63dc21a762b26aa217e8f48ac748bef7" title="Retrieve the ICC (International Color Consortium) color management profile (if any) that was previous...">tj3GetICCProfile()</a> can then be used to retrieve the profile.)</p>
 <dl class="params"><dt>Parameters</dt><dd>
  <table class="params">
    <tr><td class="paramname">handle</td><td>handle to a TurboJPEG instance that has been initialized for decompression</td></tr>
@ -2449,6 +2467,57 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>a descriptive error message explaining why the last command failed. </dd></dl>

+</div>
+</div>
+<a id="ga63dc21a762b26aa217e8f48ac748bef7" name="ga63dc21a762b26aa217e8f48ac748bef7"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga63dc21a762b26aa217e8f48ac748bef7">&#9670;&#160;</a></span>tj3GetICCProfile()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DLLEXPORT int tj3GetICCProfile </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763">tjhandle</a>&#160;</td>
+          <td class="paramname"><em>handle</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char **&#160;</td>
+          <td class="paramname"><em>iccBuf</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&#160;</td>
+          <td class="paramname"><em>iccSize</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Retrieve the ICC (International Color Consortium) color management profile (if any) that was previously extracted from a JPEG image. </p>
+<dl class="section note"><dt>Note</dt><dd>To extract the ICC profile from a JPEG image, call <a class="el" href="group___turbo_j_p_e_g.html#ga96d2c4b3432f9d88ad14758ae240b8d1" title="Retrieve information about a JPEG image without decompressing it, or prime the decompressor with quan...">tj3DecompressHeader()</a> with <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1" title="Marker copying behavior [decompression, lossless transformation].">TJPARAM_SAVEMARKERS</a> set to <code>2</code> or <code>4</code>. Once the ICC profile is retrieved, it must be re-extracted before it can be retrieved again.</dd></dl>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">handle</td><td>handle to a TurboJPEG instance that has been initialized for decompression</td></tr>
+    <tr><td class="paramname">iccBuf</td><td>address of a pointer to a byte buffer. Upon return:<ul>
+<li>If <code>iccBuf</code> is not NULL and there is an ICC profile to retrieve, then <code>*iccBuf</code> will point to a byte buffer containing the ICC profile. This buffer should be freed using <a class="el" href="group___turbo_j_p_e_g.html#gaddb84fb6c81769e9faa0f5a63b296606" title="Free a byte buffer previously allocated by TurboJPEG.">tj3Free()</a>.</li>
+<li>If <code>iccBuf</code> is not NULL and there is no ICC profile to retrieve, then <code>*iccBuf</code> will be NULL.</li>
+<li>If <code>iccBuf</code> is NULL, then only the ICC profile size will be retrieved, and the ICC profile can be retrieved later.</li>
+</ul>
+</td></tr>
+    <tr><td class="paramname">iccSize</td><td>address of a size_t variable. Upon return, the variable will contain the ICC profile size (or 0 if there is no ICC profile to retrieve.)</td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>0 if successful, or -1 if an error occurred (see <a class="el" href="group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29" title="Returns a descriptive error message explaining why the last command failed.">tj3GetErrorStr()</a> and <a class="el" href="group___turbo_j_p_e_g.html#gab8c8279f1415fe425ff30dbbc56013bd" title="Returns a code indicating the severity of the last error.">tj3GetErrorCode()</a>.) </dd></dl>
+
 </div>
 </div>
 <a id="gaf9253e0c2e9f464142d389673da085fa" name="gaf9253e0c2e9f464142d389673da085fa"></a>
@ -3067,6 +3136,51 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>0 if successful, or -1 if an error occurred (see <a class="el" href="group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29" title="Returns a descriptive error message explaining why the last command failed.">tj3GetErrorStr()</a>.) </dd></dl>

+</div>
+</div>
+<a id="ga5852aa6e9ee3a457798a1741642dec40" name="ga5852aa6e9ee3a457798a1741642dec40"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga5852aa6e9ee3a457798a1741642dec40">&#9670;&#160;</a></span>tj3SetICCProfile()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DLLEXPORT int tj3SetICCProfile </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763">tjhandle</a>&#160;</td>
+          <td class="paramname"><em>handle</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&#160;</td>
+          <td class="paramname"><em>iccBuf</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&#160;</td>
+          <td class="paramname"><em>iccSize</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Embed an ICC (International Color Consortium) color management profile in JPEG images generated by subsequent compression and lossless transformation operations. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">handle</td><td>handle to a TurboJPEG instance that has been initialized for compression</td></tr>
+    <tr><td class="paramname">iccBuf</td><td>pointer to a byte buffer containing an ICC profile. A copy is made of the ICC profile, so this buffer can be freed or reused as soon as this function returns. Setting this parameter to NULL or setting <code>iccSize</code> to 0 removes any ICC profile that was previously associated with the TurboJPEG instance.</td></tr>
+    <tr><td class="paramname">iccSize</td><td>size of the ICC profile (in bytes.) Setting this parameter to 0 or setting <code>iccBuf</code> to NULL removes any ICC profile that was previously associated with the TurboJPEG instance.</td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>0 if successful, or -1 if an error occurred (see <a class="el" href="group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29" title="Returns a descriptive error message explaining why the last command failed.">tj3GetErrorStr()</a>.) </dd></dl>
+
 </div>
 </div>
 <a id="ga89da17ee1e43ff423382cbc145803c75" name="ga89da17ee1e43ff423382cbc145803c75"></a>
@ -3174,7 +3288,7 @@ If you choose option 1 or 3, then <code>*jpegSize</code> should be set to the si
    <tr><td class="paramname">dstBufs</td><td>pointer to an array of n byte buffers. <code>dstBufs[i]</code> will receive a JPEG image that has been transformed using the parameters in <code>transforms[i]</code>. TurboJPEG has the ability to reallocate the JPEG destination buffer to accommodate the size of the transformed JPEG image. Thus, you can choose to:<ol type="1">
 <li>pre-allocate the JPEG destination buffer with an arbitrary size using <a class="el" href="group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57" title="Allocate a byte buffer for use with TurboJPEG.">tj3Alloc()</a> and let TurboJPEG grow the buffer as needed,</li>
 <li>set <code>dstBufs[i]</code> to NULL to tell TurboJPEG to allocate the buffer for you, or</li>
-<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> with the transformed or cropped width and height and the level of subsampling used in the destination image (taking into account grayscale conversion and transposition of the width and height.) Under normal circumstances, this should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> 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 <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> cannot be used in those cases unless the embedded data is discarded using <a class="el" href="group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8" title="Do not copy any extra markers (including Exif and ICC profile data) from the source image to the dest...">TJXOPT_COPYNONE</a>.</li>
+<li>pre-allocate the buffer to a "worst case" size determined by calling <a class="el" href="group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters.">tj3JPEGBufSize()</a> with the transformed or cropped width and height and the level of subsampling used in the destination image (taking into account grayscale conversion and transposition of the width and height), then adding the return value to the size of the ICC profile (if any) that was previously associated with the TurboJPEG instance (see <a class="el" href="group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40" title="Embed an ICC (International Color Consortium) color management profile in JPEG images generated by su...">tj3SetICCProfile()</a>) or extracted from the source image (see <a class="el" href="group___turbo_j_p_e_g.html#ga63dc21a762b26aa217e8f48ac748bef7" title="Retrieve the ICC (International Color Consortium) color management profile (if any) that was previous...">tj3GetICCProfile()</a> and <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1" title="Marker copying behavior [decompression, lossless transformation].">TJPARAM_SAVEMARKERS</a>.) Under normal circumstances, this should ensure that the buffer never has to be re-allocated. (Setting <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> 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 data) in which the transformed JPEG image will be larger than the worst-case size, and <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a> cannot be used in those cases unless the embedded data is discarded using <a class="el" href="group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8" title="Do not copy any extra markers (including Exif and ICC profile data) from the source image to the dest...">TJXOPT_COPYNONE</a> or <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1" title="Marker copying behavior [decompression, lossless transformation].">TJPARAM_SAVEMARKERS</a>.</li>
 </ol>
 If you choose option 1 or 3, then <code>dstSizes[i]</code> should be set to the size of your pre-allocated buffer. In any case, unless you have set <a class="el" href="group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b" title="JPEG destination buffer (re)allocation [compression, lossless transformation].">TJPARAM_NOREALLOC</a>, you should always check <code>dstBufs[i]</code> upon return from this function, as it may have changed.</td></tr>
    <tr><td class="paramname">dstSizes</td><td>pointer to an array of n size_t variables that will receive the actual sizes (in bytes) of each transformed JPEG image. If <code>dstBufs[i]</code> points to a pre-allocated buffer, then <code>dstSizes[i]</code> should be set to the size of the buffer. Upon return, <code>dstSizes[i]</code> will contain the size of the transformed JPEG image (in bytes.)</td></tr>
--- a/doc/turbojpeg/search/all_8.js
+++ b/doc/turbojpeg/search/all_8.js
@ -21,122 +21,125 @@ var searchData=
  ['tj3get_18',['tj3Get',['../group___turbo_j_p_e_g.html#ga34af9ba3183bdf0ec7c8f47bb9a4c84f',1,'turbojpeg.h']]],
  ['tj3geterrorcode_19',['tj3GetErrorCode',['../group___turbo_j_p_e_g.html#gab8c8279f1415fe425ff30dbbc56013bd',1,'turbojpeg.h']]],
  ['tj3geterrorstr_20',['tj3GetErrorStr',['../group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29',1,'turbojpeg.h']]],
-  ['tj3getscalingfactors_21',['tj3GetScalingFactors',['../group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa',1,'turbojpeg.h']]],
-  ['tj3init_22',['tj3Init',['../group___turbo_j_p_e_g.html#ga69c09d39f97ec30250ad3605ace7e5df',1,'turbojpeg.h']]],
-  ['tj3jpegbufsize_23',['tj3JPEGBufSize',['../group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4',1,'turbojpeg.h']]],
-  ['tj3loadimage12_24',['tj3LoadImage12',['../group___turbo_j_p_e_g.html#gaa1d3772cfdb53afa21aae3c606238d44',1,'turbojpeg.h']]],
-  ['tj3loadimage16_25',['tj3LoadImage16',['../group___turbo_j_p_e_g.html#gace4240b665dc47742cbb3b76b03dfd69',1,'turbojpeg.h']]],
-  ['tj3loadimage8_26',['tj3LoadImage8',['../group___turbo_j_p_e_g.html#ga884023536e70985616126a073f662001',1,'turbojpeg.h']]],
-  ['tj3saveimage12_27',['tj3SaveImage12',['../group___turbo_j_p_e_g.html#ga7c64b5106d04267a46aad85f9714ad90',1,'turbojpeg.h']]],
-  ['tj3saveimage16_28',['tj3SaveImage16',['../group___turbo_j_p_e_g.html#ga0fd87851f4266aca24bf4594dd0c0e71',1,'turbojpeg.h']]],
-  ['tj3saveimage8_29',['tj3SaveImage8',['../group___turbo_j_p_e_g.html#gaa4ec838988e469cc15618e4690cc8722',1,'turbojpeg.h']]],
-  ['tj3set_30',['tj3Set',['../group___turbo_j_p_e_g.html#gaddf92640bfee3e8622218c713e77e7db',1,'turbojpeg.h']]],
-  ['tj3setcroppingregion_31',['tj3SetCroppingRegion',['../group___turbo_j_p_e_g.html#gaa49c7bd4c9431667a043cfc93388ba1c',1,'turbojpeg.h']]],
-  ['tj3setscalingfactor_32',['tj3SetScalingFactor',['../group___turbo_j_p_e_g.html#ga89da17ee1e43ff423382cbc145803c75',1,'turbojpeg.h']]],
-  ['tj3transform_33',['tj3Transform',['../group___turbo_j_p_e_g.html#gaff23ba1dcabed456794b844791613920',1,'turbojpeg.h']]],
-  ['tj3yuvbufsize_34',['tj3YUVBufSize',['../group___turbo_j_p_e_g.html#gaaebaa16973a0f550a66eca5765ed0546',1,'turbojpeg.h']]],
-  ['tj3yuvplaneheight_35',['tj3YUVPlaneHeight',['../group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b',1,'turbojpeg.h']]],
-  ['tj3yuvplanesize_36',['tj3YUVPlaneSize',['../group___turbo_j_p_e_g.html#gacc19d265edce76b46146f59579f9438d',1,'turbojpeg.h']]],
-  ['tj3yuvplanewidth_37',['tj3YUVPlaneWidth',['../group___turbo_j_p_e_g.html#gac99d1933ede1d59fcada9a826e88eb2d',1,'turbojpeg.h']]],
-  ['tj_5fnumcs_38',['TJ_NUMCS',['../group___turbo_j_p_e_g.html#ga39f57a6fb02d9cf32e7b6890099b5a71',1,'turbojpeg.h']]],
-  ['tj_5fnumerr_39',['TJ_NUMERR',['../group___turbo_j_p_e_g.html#ga79bde1b4a3e2351e00887e47781b966e',1,'turbojpeg.h']]],
-  ['tj_5fnuminit_40',['TJ_NUMINIT',['../group___turbo_j_p_e_g.html#ga5e0e8c784295c636f0bf8dab93c4bddf',1,'turbojpeg.h']]],
-  ['tj_5fnumpf_41',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]],
-  ['tj_5fnumsamp_42',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]],
-  ['tj_5fnumxop_43',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]],
-  ['tjalphaoffset_44',['tjAlphaOffset',['../group___turbo_j_p_e_g.html#ga5af0ab065feefd526debf1e20c43e837',1,'turbojpeg.h']]],
-  ['tjblueoffset_45',['tjBlueOffset',['../group___turbo_j_p_e_g.html#ga84e2e35d3f08025f976ec1ec53693dea',1,'turbojpeg.h']]],
-  ['tjcs_46',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
-  ['tjcs_5fcmyk_47',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
-  ['tjcs_5fgray_48',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
-  ['tjcs_5frgb_49',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
-  ['tjcs_5fycbcr_50',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
-  ['tjcs_5fycck_51',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
-  ['tjerr_52',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]],
-  ['tjerr_5ffatal_53',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]],
-  ['tjerr_5fwarning_54',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]],
-  ['tjgreenoffset_55',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]],
-  ['tjhandle_56',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]],
-  ['tjinit_57',['TJINIT',['../group___turbo_j_p_e_g.html#ga3850bbee1313e752e667b4eb08b1e086',1,'turbojpeg.h']]],
-  ['tjinit_5fcompress_58',['TJINIT_COMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086aa45ac279e3dc6ffabc4b0f45864da796',1,'turbojpeg.h']]],
-  ['tjinit_5fdecompress_59',['TJINIT_DECOMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a4b8ca1ef700699b71350700bf95c2167',1,'turbojpeg.h']]],
-  ['tjinit_5ftransform_60',['TJINIT_TRANSFORM',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a8d58a2a4c45b3e0cd349746544a6e0c2',1,'turbojpeg.h']]],
-  ['tjmcuheight_61',['tjMCUHeight',['../group___turbo_j_p_e_g.html#gabd247bb9fecb393eca57366feb8327bf',1,'turbojpeg.h']]],
-  ['tjmcuwidth_62',['tjMCUWidth',['../group___turbo_j_p_e_g.html#ga9e61e7cd47a15a173283ba94e781308c',1,'turbojpeg.h']]],
-  ['tjparam_63',['TJPARAM',['../group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82',1,'turbojpeg.h']]],
-  ['tjparam_5farithmetic_64',['TJPARAM_ARITHMETIC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1c756757384308145602c040524aebf7',1,'turbojpeg.h']]],
-  ['tjparam_5fbottomup_65',['TJPARAM_BOTTOMUP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a924657172695ed6cb0b128219546fcce',1,'turbojpeg.h']]],
-  ['tjparam_5fcolorspace_66',['TJPARAM_COLORSPACE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a46a10d46309514907d0c39fcd86c324c',1,'turbojpeg.h']]],
-  ['tjparam_5fdensityunits_67',['TJPARAM_DENSITYUNITS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4c045981bd8a303521a401dbbe1df208',1,'turbojpeg.h']]],
-  ['tjparam_5ffastdct_68',['TJPARAM_FASTDCT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a6914692ac6ec5567787d592b7563f627',1,'turbojpeg.h']]],
-  ['tjparam_5ffastupsample_69',['TJPARAM_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0e051ac106f7b7402b690a5daf4869c0',1,'turbojpeg.h']]],
-  ['tjparam_5fjpegheight_70',['TJPARAM_JPEGHEIGHT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f76673be73f2b659440a9572a65a95f',1,'turbojpeg.h']]],
-  ['tjparam_5fjpegwidth_71',['TJPARAM_JPEGWIDTH',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a02ab77fb294a0c9061a78cd424c82dd8',1,'turbojpeg.h']]],
-  ['tjparam_5flossless_72',['TJPARAM_LOSSLESS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a249f35f0770792b19f995e603bb17c6f',1,'turbojpeg.h']]],
-  ['tjparam_5flosslesspsv_73',['TJPARAM_LOSSLESSPSV',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abcc997d40e5bec84817c12b76ef84159',1,'turbojpeg.h']]],
-  ['tjparam_5flosslesspt_74',['TJPARAM_LOSSLESSPT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4a6c6f25764ecaf4231a36bff844e46a',1,'turbojpeg.h']]],
-  ['tjparam_5fmaxmemory_75',['TJPARAM_MAXMEMORY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0de0a8281da45d1fc984edc8918f7dd2',1,'turbojpeg.h']]],
-  ['tjparam_5fmaxpixels_76',['TJPARAM_MAXPIXELS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac4e95dd2ecd766854feee579406eae68',1,'turbojpeg.h']]],
-  ['tjparam_5fnorealloc_77',['TJPARAM_NOREALLOC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b',1,'turbojpeg.h']]],
-  ['tjparam_5foptimize_78',['TJPARAM_OPTIMIZE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f0af9afc0b36443751f9ee82b760aa6',1,'turbojpeg.h']]],
-  ['tjparam_5fprecision_79',['TJPARAM_PRECISION',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a781db82741934e8cd008d308597c59d8',1,'turbojpeg.h']]],
-  ['tjparam_5fprogressive_80',['TJPARAM_PROGRESSIVE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1716f242b3859905b4a317dae8cfb75f',1,'turbojpeg.h']]],
-  ['tjparam_5fquality_81',['TJPARAM_QUALITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0467e8792621f2d817dc2af563d3186c',1,'turbojpeg.h']]],
-  ['tjparam_5frestartblocks_82',['TJPARAM_RESTARTBLOCKS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a343c72883b7160f23f3ef46fc548a0ec',1,'turbojpeg.h']]],
-  ['tjparam_5frestartrows_83',['TJPARAM_RESTARTROWS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a714367585952fe5c863f0dba5bd37e5c',1,'turbojpeg.h']]],
-  ['tjparam_5fscanlimit_84',['TJPARAM_SCANLIMIT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac478910e20ecf61b914f9824d80f8167',1,'turbojpeg.h']]],
-  ['tjparam_5fstoponwarning_85',['TJPARAM_STOPONWARNING',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a555e2212079fa49b30bcd2879c6c8ddb',1,'turbojpeg.h']]],
-  ['tjparam_5fsubsamp_86',['TJPARAM_SUBSAMP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a2a3494a8215d3de4fdbaeb2ba6f6b03a',1,'turbojpeg.h']]],
-  ['tjparam_5fxdensity_87',['TJPARAM_XDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4de5c9d7cab5be806143a43c3b0e0877',1,'turbojpeg.h']]],
-  ['tjparam_5fydensity_88',['TJPARAM_YDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abda48f2df7eb9b88e2b7621efb017eba',1,'turbojpeg.h']]],
-  ['tjpf_89',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
-  ['tjpf_5fabgr_90',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
-  ['tjpf_5fargb_91',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
-  ['tjpf_5fbgr_92',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
-  ['tjpf_5fbgra_93',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
-  ['tjpf_5fbgrx_94',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
-  ['tjpf_5fcmyk_95',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
-  ['tjpf_5fgray_96',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
-  ['tjpf_5frgb_97',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
-  ['tjpf_5frgba_98',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
-  ['tjpf_5frgbx_99',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
-  ['tjpf_5funknown_100',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
-  ['tjpf_5fxbgr_101',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
-  ['tjpf_5fxrgb_102',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
-  ['tjpixelsize_103',['tjPixelSize',['../group___turbo_j_p_e_g.html#gad77cf8fe5b2bfd3cb3f53098146abb4c',1,'turbojpeg.h']]],
-  ['tjredoffset_104',['tjRedOffset',['../group___turbo_j_p_e_g.html#gadd9b446742ac8a3923f7992c7988fea8',1,'turbojpeg.h']]],
-  ['tjregion_105',['tjregion',['../structtjregion.html',1,'']]],
-  ['tjsamp_106',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
-  ['tjsamp_5f411_107',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
-  ['tjsamp_5f420_108',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
-  ['tjsamp_5f422_109',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
-  ['tjsamp_5f440_110',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
-  ['tjsamp_5f441_111',['TJSAMP_441',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3351696e1dd34a083a35b6be8b90122d',1,'turbojpeg.h']]],
-  ['tjsamp_5f444_112',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
-  ['tjsamp_5fgray_113',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
-  ['tjsamp_5funknown_114',['TJSAMP_UNKNOWN',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074ac124fa8f6cb41147e3d670dfbdfb7173',1,'turbojpeg.h']]],
-  ['tjscaled_115',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]],
-  ['tjscalingfactor_116',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
-  ['tjtransform_117',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#ga504805ec0161f1b505397ca0118bf8fd',1,'tjtransform:&#160;turbojpeg.h']]],
-  ['tjuncropped_118',['TJUNCROPPED',['../group___turbo_j_p_e_g.html#ga6f192ad58a5a5802e145149d83c643bf',1,'turbojpeg.h']]],
-  ['tjunscaled_119',['TJUNSCALED',['../group___turbo_j_p_e_g.html#ga7880644a0849161ad20933536169ee19',1,'turbojpeg.h']]],
-  ['tjxop_120',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]],
-  ['tjxop_5fhflip_121',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
-  ['tjxop_5fnone_122',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
-  ['tjxop_5frot180_123',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
-  ['tjxop_5frot270_124',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
-  ['tjxop_5frot90_125',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
-  ['tjxop_5ftranspose_126',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
-  ['tjxop_5ftransverse_127',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
-  ['tjxop_5fvflip_128',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]],
-  ['tjxopt_5farithmetic_129',['TJXOPT_ARITHMETIC',['../group___turbo_j_p_e_g.html#gaecaaa3b7e2af812592c015d83207f010',1,'turbojpeg.h']]],
-  ['tjxopt_5fcopynone_130',['TJXOPT_COPYNONE',['../group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8',1,'turbojpeg.h']]],
-  ['tjxopt_5fcrop_131',['TJXOPT_CROP',['../group___turbo_j_p_e_g.html#ga9c771a757fc1294add611906b89ab2d2',1,'turbojpeg.h']]],
-  ['tjxopt_5fgray_132',['TJXOPT_GRAY',['../group___turbo_j_p_e_g.html#ga3acee7b48ade1b99e5588736007c2589',1,'turbojpeg.h']]],
-  ['tjxopt_5fnooutput_133',['TJXOPT_NOOUTPUT',['../group___turbo_j_p_e_g.html#gafbf992bbf6e006705886333703ffab31',1,'turbojpeg.h']]],
-  ['tjxopt_5foptimize_134',['TJXOPT_OPTIMIZE',['../group___turbo_j_p_e_g.html#ga6bedf37aa9e1122f3ec9f7302ca59117',1,'turbojpeg.h']]],
-  ['tjxopt_5fperfect_135',['TJXOPT_PERFECT',['../group___turbo_j_p_e_g.html#ga50e03cb5ed115330e212417429600b00',1,'turbojpeg.h']]],
-  ['tjxopt_5fprogressive_136',['TJXOPT_PROGRESSIVE',['../group___turbo_j_p_e_g.html#gad2371c80674584ecc1a7d75e564cf026',1,'turbojpeg.h']]],
-  ['tjxopt_5ftrim_137',['TJXOPT_TRIM',['../group___turbo_j_p_e_g.html#ga319826b7eb1583c0595bbe7b95428709',1,'turbojpeg.h']]],
-  ['turbojpeg_138',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
+  ['tj3geticcprofile_21',['tj3GetICCProfile',['../group___turbo_j_p_e_g.html#ga63dc21a762b26aa217e8f48ac748bef7',1,'turbojpeg.h']]],
+  ['tj3getscalingfactors_22',['tj3GetScalingFactors',['../group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa',1,'turbojpeg.h']]],
+  ['tj3init_23',['tj3Init',['../group___turbo_j_p_e_g.html#ga69c09d39f97ec30250ad3605ace7e5df',1,'turbojpeg.h']]],
+  ['tj3jpegbufsize_24',['tj3JPEGBufSize',['../group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4',1,'turbojpeg.h']]],
+  ['tj3loadimage12_25',['tj3LoadImage12',['../group___turbo_j_p_e_g.html#gaa1d3772cfdb53afa21aae3c606238d44',1,'turbojpeg.h']]],
+  ['tj3loadimage16_26',['tj3LoadImage16',['../group___turbo_j_p_e_g.html#gace4240b665dc47742cbb3b76b03dfd69',1,'turbojpeg.h']]],
+  ['tj3loadimage8_27',['tj3LoadImage8',['../group___turbo_j_p_e_g.html#ga884023536e70985616126a073f662001',1,'turbojpeg.h']]],
+  ['tj3saveimage12_28',['tj3SaveImage12',['../group___turbo_j_p_e_g.html#ga7c64b5106d04267a46aad85f9714ad90',1,'turbojpeg.h']]],
+  ['tj3saveimage16_29',['tj3SaveImage16',['../group___turbo_j_p_e_g.html#ga0fd87851f4266aca24bf4594dd0c0e71',1,'turbojpeg.h']]],
+  ['tj3saveimage8_30',['tj3SaveImage8',['../group___turbo_j_p_e_g.html#gaa4ec838988e469cc15618e4690cc8722',1,'turbojpeg.h']]],
+  ['tj3set_31',['tj3Set',['../group___turbo_j_p_e_g.html#gaddf92640bfee3e8622218c713e77e7db',1,'turbojpeg.h']]],
+  ['tj3setcroppingregion_32',['tj3SetCroppingRegion',['../group___turbo_j_p_e_g.html#gaa49c7bd4c9431667a043cfc93388ba1c',1,'turbojpeg.h']]],
+  ['tj3seticcprofile_33',['tj3SetICCProfile',['../group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40',1,'turbojpeg.h']]],
+  ['tj3setscalingfactor_34',['tj3SetScalingFactor',['../group___turbo_j_p_e_g.html#ga89da17ee1e43ff423382cbc145803c75',1,'turbojpeg.h']]],
+  ['tj3transform_35',['tj3Transform',['../group___turbo_j_p_e_g.html#gaff23ba1dcabed456794b844791613920',1,'turbojpeg.h']]],
+  ['tj3yuvbufsize_36',['tj3YUVBufSize',['../group___turbo_j_p_e_g.html#gaaebaa16973a0f550a66eca5765ed0546',1,'turbojpeg.h']]],
+  ['tj3yuvplaneheight_37',['tj3YUVPlaneHeight',['../group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b',1,'turbojpeg.h']]],
+  ['tj3yuvplanesize_38',['tj3YUVPlaneSize',['../group___turbo_j_p_e_g.html#gacc19d265edce76b46146f59579f9438d',1,'turbojpeg.h']]],
+  ['tj3yuvplanewidth_39',['tj3YUVPlaneWidth',['../group___turbo_j_p_e_g.html#gac99d1933ede1d59fcada9a826e88eb2d',1,'turbojpeg.h']]],
+  ['tj_5fnumcs_40',['TJ_NUMCS',['../group___turbo_j_p_e_g.html#ga39f57a6fb02d9cf32e7b6890099b5a71',1,'turbojpeg.h']]],
+  ['tj_5fnumerr_41',['TJ_NUMERR',['../group___turbo_j_p_e_g.html#ga79bde1b4a3e2351e00887e47781b966e',1,'turbojpeg.h']]],
+  ['tj_5fnuminit_42',['TJ_NUMINIT',['../group___turbo_j_p_e_g.html#ga5e0e8c784295c636f0bf8dab93c4bddf',1,'turbojpeg.h']]],
+  ['tj_5fnumpf_43',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]],
+  ['tj_5fnumsamp_44',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]],
+  ['tj_5fnumxop_45',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]],
+  ['tjalphaoffset_46',['tjAlphaOffset',['../group___turbo_j_p_e_g.html#ga5af0ab065feefd526debf1e20c43e837',1,'turbojpeg.h']]],
+  ['tjblueoffset_47',['tjBlueOffset',['../group___turbo_j_p_e_g.html#ga84e2e35d3f08025f976ec1ec53693dea',1,'turbojpeg.h']]],
+  ['tjcs_48',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
+  ['tjcs_5fcmyk_49',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
+  ['tjcs_5fgray_50',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
+  ['tjcs_5frgb_51',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
+  ['tjcs_5fycbcr_52',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
+  ['tjcs_5fycck_53',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
+  ['tjerr_54',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]],
+  ['tjerr_5ffatal_55',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]],
+  ['tjerr_5fwarning_56',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]],
+  ['tjgreenoffset_57',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]],
+  ['tjhandle_58',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]],
+  ['tjinit_59',['TJINIT',['../group___turbo_j_p_e_g.html#ga3850bbee1313e752e667b4eb08b1e086',1,'turbojpeg.h']]],
+  ['tjinit_5fcompress_60',['TJINIT_COMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086aa45ac279e3dc6ffabc4b0f45864da796',1,'turbojpeg.h']]],
+  ['tjinit_5fdecompress_61',['TJINIT_DECOMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a4b8ca1ef700699b71350700bf95c2167',1,'turbojpeg.h']]],
+  ['tjinit_5ftransform_62',['TJINIT_TRANSFORM',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a8d58a2a4c45b3e0cd349746544a6e0c2',1,'turbojpeg.h']]],
+  ['tjmcuheight_63',['tjMCUHeight',['../group___turbo_j_p_e_g.html#gabd247bb9fecb393eca57366feb8327bf',1,'turbojpeg.h']]],
+  ['tjmcuwidth_64',['tjMCUWidth',['../group___turbo_j_p_e_g.html#ga9e61e7cd47a15a173283ba94e781308c',1,'turbojpeg.h']]],
+  ['tjparam_65',['TJPARAM',['../group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82',1,'turbojpeg.h']]],
+  ['tjparam_5farithmetic_66',['TJPARAM_ARITHMETIC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1c756757384308145602c040524aebf7',1,'turbojpeg.h']]],
+  ['tjparam_5fbottomup_67',['TJPARAM_BOTTOMUP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a924657172695ed6cb0b128219546fcce',1,'turbojpeg.h']]],
+  ['tjparam_5fcolorspace_68',['TJPARAM_COLORSPACE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a46a10d46309514907d0c39fcd86c324c',1,'turbojpeg.h']]],
+  ['tjparam_5fdensityunits_69',['TJPARAM_DENSITYUNITS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4c045981bd8a303521a401dbbe1df208',1,'turbojpeg.h']]],
+  ['tjparam_5ffastdct_70',['TJPARAM_FASTDCT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a6914692ac6ec5567787d592b7563f627',1,'turbojpeg.h']]],
+  ['tjparam_5ffastupsample_71',['TJPARAM_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0e051ac106f7b7402b690a5daf4869c0',1,'turbojpeg.h']]],
+  ['tjparam_5fjpegheight_72',['TJPARAM_JPEGHEIGHT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f76673be73f2b659440a9572a65a95f',1,'turbojpeg.h']]],
+  ['tjparam_5fjpegwidth_73',['TJPARAM_JPEGWIDTH',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a02ab77fb294a0c9061a78cd424c82dd8',1,'turbojpeg.h']]],
+  ['tjparam_5flossless_74',['TJPARAM_LOSSLESS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a249f35f0770792b19f995e603bb17c6f',1,'turbojpeg.h']]],
+  ['tjparam_5flosslesspsv_75',['TJPARAM_LOSSLESSPSV',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abcc997d40e5bec84817c12b76ef84159',1,'turbojpeg.h']]],
+  ['tjparam_5flosslesspt_76',['TJPARAM_LOSSLESSPT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4a6c6f25764ecaf4231a36bff844e46a',1,'turbojpeg.h']]],
+  ['tjparam_5fmaxmemory_77',['TJPARAM_MAXMEMORY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0de0a8281da45d1fc984edc8918f7dd2',1,'turbojpeg.h']]],
+  ['tjparam_5fmaxpixels_78',['TJPARAM_MAXPIXELS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac4e95dd2ecd766854feee579406eae68',1,'turbojpeg.h']]],
+  ['tjparam_5fnorealloc_79',['TJPARAM_NOREALLOC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b',1,'turbojpeg.h']]],
+  ['tjparam_5foptimize_80',['TJPARAM_OPTIMIZE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f0af9afc0b36443751f9ee82b760aa6',1,'turbojpeg.h']]],
+  ['tjparam_5fprecision_81',['TJPARAM_PRECISION',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a781db82741934e8cd008d308597c59d8',1,'turbojpeg.h']]],
+  ['tjparam_5fprogressive_82',['TJPARAM_PROGRESSIVE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1716f242b3859905b4a317dae8cfb75f',1,'turbojpeg.h']]],
+  ['tjparam_5fquality_83',['TJPARAM_QUALITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0467e8792621f2d817dc2af563d3186c',1,'turbojpeg.h']]],
+  ['tjparam_5frestartblocks_84',['TJPARAM_RESTARTBLOCKS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a343c72883b7160f23f3ef46fc548a0ec',1,'turbojpeg.h']]],
+  ['tjparam_5frestartrows_85',['TJPARAM_RESTARTROWS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a714367585952fe5c863f0dba5bd37e5c',1,'turbojpeg.h']]],
+  ['tjparam_5fsavemarkers_86',['TJPARAM_SAVEMARKERS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1',1,'turbojpeg.h']]],
+  ['tjparam_5fscanlimit_87',['TJPARAM_SCANLIMIT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac478910e20ecf61b914f9824d80f8167',1,'turbojpeg.h']]],
+  ['tjparam_5fstoponwarning_88',['TJPARAM_STOPONWARNING',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a555e2212079fa49b30bcd2879c6c8ddb',1,'turbojpeg.h']]],
+  ['tjparam_5fsubsamp_89',['TJPARAM_SUBSAMP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a2a3494a8215d3de4fdbaeb2ba6f6b03a',1,'turbojpeg.h']]],
+  ['tjparam_5fxdensity_90',['TJPARAM_XDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4de5c9d7cab5be806143a43c3b0e0877',1,'turbojpeg.h']]],
+  ['tjparam_5fydensity_91',['TJPARAM_YDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abda48f2df7eb9b88e2b7621efb017eba',1,'turbojpeg.h']]],
+  ['tjpf_92',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
+  ['tjpf_5fabgr_93',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
+  ['tjpf_5fargb_94',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
+  ['tjpf_5fbgr_95',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
+  ['tjpf_5fbgra_96',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
+  ['tjpf_5fbgrx_97',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
+  ['tjpf_5fcmyk_98',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
+  ['tjpf_5fgray_99',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
+  ['tjpf_5frgb_100',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
+  ['tjpf_5frgba_101',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
+  ['tjpf_5frgbx_102',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
+  ['tjpf_5funknown_103',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
+  ['tjpf_5fxbgr_104',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
+  ['tjpf_5fxrgb_105',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
+  ['tjpixelsize_106',['tjPixelSize',['../group___turbo_j_p_e_g.html#gad77cf8fe5b2bfd3cb3f53098146abb4c',1,'turbojpeg.h']]],
+  ['tjredoffset_107',['tjRedOffset',['../group___turbo_j_p_e_g.html#gadd9b446742ac8a3923f7992c7988fea8',1,'turbojpeg.h']]],
+  ['tjregion_108',['tjregion',['../structtjregion.html',1,'']]],
+  ['tjsamp_109',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
+  ['tjsamp_5f411_110',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
+  ['tjsamp_5f420_111',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
+  ['tjsamp_5f422_112',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
+  ['tjsamp_5f440_113',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
+  ['tjsamp_5f441_114',['TJSAMP_441',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3351696e1dd34a083a35b6be8b90122d',1,'turbojpeg.h']]],
+  ['tjsamp_5f444_115',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
+  ['tjsamp_5fgray_116',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
+  ['tjsamp_5funknown_117',['TJSAMP_UNKNOWN',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074ac124fa8f6cb41147e3d670dfbdfb7173',1,'turbojpeg.h']]],
+  ['tjscaled_118',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]],
+  ['tjscalingfactor_119',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
+  ['tjtransform_120',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#ga504805ec0161f1b505397ca0118bf8fd',1,'tjtransform:&#160;turbojpeg.h']]],
+  ['tjuncropped_121',['TJUNCROPPED',['../group___turbo_j_p_e_g.html#ga6f192ad58a5a5802e145149d83c643bf',1,'turbojpeg.h']]],
+  ['tjunscaled_122',['TJUNSCALED',['../group___turbo_j_p_e_g.html#ga7880644a0849161ad20933536169ee19',1,'turbojpeg.h']]],
+  ['tjxop_123',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]],
+  ['tjxop_5fhflip_124',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
+  ['tjxop_5fnone_125',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
+  ['tjxop_5frot180_126',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
+  ['tjxop_5frot270_127',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
+  ['tjxop_5frot90_128',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
+  ['tjxop_5ftranspose_129',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
+  ['tjxop_5ftransverse_130',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
+  ['tjxop_5fvflip_131',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]],
+  ['tjxopt_5farithmetic_132',['TJXOPT_ARITHMETIC',['../group___turbo_j_p_e_g.html#gaecaaa3b7e2af812592c015d83207f010',1,'turbojpeg.h']]],
+  ['tjxopt_5fcopynone_133',['TJXOPT_COPYNONE',['../group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8',1,'turbojpeg.h']]],
+  ['tjxopt_5fcrop_134',['TJXOPT_CROP',['../group___turbo_j_p_e_g.html#ga9c771a757fc1294add611906b89ab2d2',1,'turbojpeg.h']]],
+  ['tjxopt_5fgray_135',['TJXOPT_GRAY',['../group___turbo_j_p_e_g.html#ga3acee7b48ade1b99e5588736007c2589',1,'turbojpeg.h']]],
+  ['tjxopt_5fnooutput_136',['TJXOPT_NOOUTPUT',['../group___turbo_j_p_e_g.html#gafbf992bbf6e006705886333703ffab31',1,'turbojpeg.h']]],
+  ['tjxopt_5foptimize_137',['TJXOPT_OPTIMIZE',['../group___turbo_j_p_e_g.html#ga6bedf37aa9e1122f3ec9f7302ca59117',1,'turbojpeg.h']]],
+  ['tjxopt_5fperfect_138',['TJXOPT_PERFECT',['../group___turbo_j_p_e_g.html#ga50e03cb5ed115330e212417429600b00',1,'turbojpeg.h']]],
+  ['tjxopt_5fprogressive_139',['TJXOPT_PROGRESSIVE',['../group___turbo_j_p_e_g.html#gad2371c80674584ecc1a7d75e564cf026',1,'turbojpeg.h']]],
+  ['tjxopt_5ftrim_140',['TJXOPT_TRIM',['../group___turbo_j_p_e_g.html#ga319826b7eb1583c0595bbe7b95428709',1,'turbojpeg.h']]],
+  ['turbojpeg_141',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
 ];
--- a/doc/turbojpeg/search/enumvalues_0.js
+++ b/doc/turbojpeg/search/enumvalues_0.js
@ -30,38 +30,39 @@ var searchData=
  ['tjparam_5fquality_27',['TJPARAM_QUALITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0467e8792621f2d817dc2af563d3186c',1,'turbojpeg.h']]],
  ['tjparam_5frestartblocks_28',['TJPARAM_RESTARTBLOCKS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a343c72883b7160f23f3ef46fc548a0ec',1,'turbojpeg.h']]],
  ['tjparam_5frestartrows_29',['TJPARAM_RESTARTROWS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a714367585952fe5c863f0dba5bd37e5c',1,'turbojpeg.h']]],
-  ['tjparam_5fscanlimit_30',['TJPARAM_SCANLIMIT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac478910e20ecf61b914f9824d80f8167',1,'turbojpeg.h']]],
-  ['tjparam_5fstoponwarning_31',['TJPARAM_STOPONWARNING',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a555e2212079fa49b30bcd2879c6c8ddb',1,'turbojpeg.h']]],
-  ['tjparam_5fsubsamp_32',['TJPARAM_SUBSAMP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a2a3494a8215d3de4fdbaeb2ba6f6b03a',1,'turbojpeg.h']]],
-  ['tjparam_5fxdensity_33',['TJPARAM_XDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4de5c9d7cab5be806143a43c3b0e0877',1,'turbojpeg.h']]],
-  ['tjparam_5fydensity_34',['TJPARAM_YDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abda48f2df7eb9b88e2b7621efb017eba',1,'turbojpeg.h']]],
-  ['tjpf_5fabgr_35',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
-  ['tjpf_5fargb_36',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
-  ['tjpf_5fbgr_37',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
-  ['tjpf_5fbgra_38',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
-  ['tjpf_5fbgrx_39',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
-  ['tjpf_5fcmyk_40',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
-  ['tjpf_5fgray_41',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
-  ['tjpf_5frgb_42',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
-  ['tjpf_5frgba_43',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
-  ['tjpf_5frgbx_44',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
-  ['tjpf_5funknown_45',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
-  ['tjpf_5fxbgr_46',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
-  ['tjpf_5fxrgb_47',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
-  ['tjsamp_5f411_48',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
-  ['tjsamp_5f420_49',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
-  ['tjsamp_5f422_50',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
-  ['tjsamp_5f440_51',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
-  ['tjsamp_5f441_52',['TJSAMP_441',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3351696e1dd34a083a35b6be8b90122d',1,'turbojpeg.h']]],
-  ['tjsamp_5f444_53',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
-  ['tjsamp_5fgray_54',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
-  ['tjsamp_5funknown_55',['TJSAMP_UNKNOWN',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074ac124fa8f6cb41147e3d670dfbdfb7173',1,'turbojpeg.h']]],
-  ['tjxop_5fhflip_56',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
-  ['tjxop_5fnone_57',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
-  ['tjxop_5frot180_58',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
-  ['tjxop_5frot270_59',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
-  ['tjxop_5frot90_60',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
-  ['tjxop_5ftranspose_61',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
-  ['tjxop_5ftransverse_62',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
-  ['tjxop_5fvflip_63',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]]
+  ['tjparam_5fsavemarkers_30',['TJPARAM_SAVEMARKERS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a259b376e3ea795834c5cdccd7a3fdeb1',1,'turbojpeg.h']]],
+  ['tjparam_5fscanlimit_31',['TJPARAM_SCANLIMIT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac478910e20ecf61b914f9824d80f8167',1,'turbojpeg.h']]],
+  ['tjparam_5fstoponwarning_32',['TJPARAM_STOPONWARNING',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a555e2212079fa49b30bcd2879c6c8ddb',1,'turbojpeg.h']]],
+  ['tjparam_5fsubsamp_33',['TJPARAM_SUBSAMP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a2a3494a8215d3de4fdbaeb2ba6f6b03a',1,'turbojpeg.h']]],
+  ['tjparam_5fxdensity_34',['TJPARAM_XDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4de5c9d7cab5be806143a43c3b0e0877',1,'turbojpeg.h']]],
+  ['tjparam_5fydensity_35',['TJPARAM_YDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abda48f2df7eb9b88e2b7621efb017eba',1,'turbojpeg.h']]],
+  ['tjpf_5fabgr_36',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
+  ['tjpf_5fargb_37',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
+  ['tjpf_5fbgr_38',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
+  ['tjpf_5fbgra_39',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
+  ['tjpf_5fbgrx_40',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
+  ['tjpf_5fcmyk_41',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
+  ['tjpf_5fgray_42',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
+  ['tjpf_5frgb_43',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
+  ['tjpf_5frgba_44',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
+  ['tjpf_5frgbx_45',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
+  ['tjpf_5funknown_46',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
+  ['tjpf_5fxbgr_47',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
+  ['tjpf_5fxrgb_48',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
+  ['tjsamp_5f411_49',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
+  ['tjsamp_5f420_50',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
+  ['tjsamp_5f422_51',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
+  ['tjsamp_5f440_52',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
+  ['tjsamp_5f441_53',['TJSAMP_441',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3351696e1dd34a083a35b6be8b90122d',1,'turbojpeg.h']]],
+  ['tjsamp_5f444_54',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
+  ['tjsamp_5fgray_55',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
+  ['tjsamp_5funknown_56',['TJSAMP_UNKNOWN',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074ac124fa8f6cb41147e3d670dfbdfb7173',1,'turbojpeg.h']]],
+  ['tjxop_5fhflip_57',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
+  ['tjxop_5fnone_58',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
+  ['tjxop_5frot180_59',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
+  ['tjxop_5frot270_60',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
+  ['tjxop_5frot90_61',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
+  ['tjxop_5ftranspose_62',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
+  ['tjxop_5ftransverse_63',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
+  ['tjxop_5fvflip_64',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]]
 ];
--- a/doc/turbojpeg/search/functions_0.js
+++ b/doc/turbojpeg/search/functions_0.js
@ -21,21 +21,23 @@ var searchData=
  ['tj3get_18',['tj3Get',['../group___turbo_j_p_e_g.html#ga34af9ba3183bdf0ec7c8f47bb9a4c84f',1,'turbojpeg.h']]],
  ['tj3geterrorcode_19',['tj3GetErrorCode',['../group___turbo_j_p_e_g.html#gab8c8279f1415fe425ff30dbbc56013bd',1,'turbojpeg.h']]],
  ['tj3geterrorstr_20',['tj3GetErrorStr',['../group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29',1,'turbojpeg.h']]],
-  ['tj3getscalingfactors_21',['tj3GetScalingFactors',['../group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa',1,'turbojpeg.h']]],
-  ['tj3init_22',['tj3Init',['../group___turbo_j_p_e_g.html#ga69c09d39f97ec30250ad3605ace7e5df',1,'turbojpeg.h']]],
-  ['tj3jpegbufsize_23',['tj3JPEGBufSize',['../group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4',1,'turbojpeg.h']]],
-  ['tj3loadimage12_24',['tj3LoadImage12',['../group___turbo_j_p_e_g.html#gaa1d3772cfdb53afa21aae3c606238d44',1,'turbojpeg.h']]],
-  ['tj3loadimage16_25',['tj3LoadImage16',['../group___turbo_j_p_e_g.html#gace4240b665dc47742cbb3b76b03dfd69',1,'turbojpeg.h']]],
-  ['tj3loadimage8_26',['tj3LoadImage8',['../group___turbo_j_p_e_g.html#ga884023536e70985616126a073f662001',1,'turbojpeg.h']]],
-  ['tj3saveimage12_27',['tj3SaveImage12',['../group___turbo_j_p_e_g.html#ga7c64b5106d04267a46aad85f9714ad90',1,'turbojpeg.h']]],
-  ['tj3saveimage16_28',['tj3SaveImage16',['../group___turbo_j_p_e_g.html#ga0fd87851f4266aca24bf4594dd0c0e71',1,'turbojpeg.h']]],
-  ['tj3saveimage8_29',['tj3SaveImage8',['../group___turbo_j_p_e_g.html#gaa4ec838988e469cc15618e4690cc8722',1,'turbojpeg.h']]],
-  ['tj3set_30',['tj3Set',['../group___turbo_j_p_e_g.html#gaddf92640bfee3e8622218c713e77e7db',1,'turbojpeg.h']]],
-  ['tj3setcroppingregion_31',['tj3SetCroppingRegion',['../group___turbo_j_p_e_g.html#gaa49c7bd4c9431667a043cfc93388ba1c',1,'turbojpeg.h']]],
-  ['tj3setscalingfactor_32',['tj3SetScalingFactor',['../group___turbo_j_p_e_g.html#ga89da17ee1e43ff423382cbc145803c75',1,'turbojpeg.h']]],
-  ['tj3transform_33',['tj3Transform',['../group___turbo_j_p_e_g.html#gaff23ba1dcabed456794b844791613920',1,'turbojpeg.h']]],
-  ['tj3yuvbufsize_34',['tj3YUVBufSize',['../group___turbo_j_p_e_g.html#gaaebaa16973a0f550a66eca5765ed0546',1,'turbojpeg.h']]],
-  ['tj3yuvplaneheight_35',['tj3YUVPlaneHeight',['../group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b',1,'turbojpeg.h']]],
-  ['tj3yuvplanesize_36',['tj3YUVPlaneSize',['../group___turbo_j_p_e_g.html#gacc19d265edce76b46146f59579f9438d',1,'turbojpeg.h']]],
-  ['tj3yuvplanewidth_37',['tj3YUVPlaneWidth',['../group___turbo_j_p_e_g.html#gac99d1933ede1d59fcada9a826e88eb2d',1,'turbojpeg.h']]]
+  ['tj3geticcprofile_21',['tj3GetICCProfile',['../group___turbo_j_p_e_g.html#ga63dc21a762b26aa217e8f48ac748bef7',1,'turbojpeg.h']]],
+  ['tj3getscalingfactors_22',['tj3GetScalingFactors',['../group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa',1,'turbojpeg.h']]],
+  ['tj3init_23',['tj3Init',['../group___turbo_j_p_e_g.html#ga69c09d39f97ec30250ad3605ace7e5df',1,'turbojpeg.h']]],
+  ['tj3jpegbufsize_24',['tj3JPEGBufSize',['../group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4',1,'turbojpeg.h']]],
+  ['tj3loadimage12_25',['tj3LoadImage12',['../group___turbo_j_p_e_g.html#gaa1d3772cfdb53afa21aae3c606238d44',1,'turbojpeg.h']]],
+  ['tj3loadimage16_26',['tj3LoadImage16',['../group___turbo_j_p_e_g.html#gace4240b665dc47742cbb3b76b03dfd69',1,'turbojpeg.h']]],
+  ['tj3loadimage8_27',['tj3LoadImage8',['../group___turbo_j_p_e_g.html#ga884023536e70985616126a073f662001',1,'turbojpeg.h']]],
+  ['tj3saveimage12_28',['tj3SaveImage12',['../group___turbo_j_p_e_g.html#ga7c64b5106d04267a46aad85f9714ad90',1,'turbojpeg.h']]],
+  ['tj3saveimage16_29',['tj3SaveImage16',['../group___turbo_j_p_e_g.html#ga0fd87851f4266aca24bf4594dd0c0e71',1,'turbojpeg.h']]],
+  ['tj3saveimage8_30',['tj3SaveImage8',['../group___turbo_j_p_e_g.html#gaa4ec838988e469cc15618e4690cc8722',1,'turbojpeg.h']]],
+  ['tj3set_31',['tj3Set',['../group___turbo_j_p_e_g.html#gaddf92640bfee3e8622218c713e77e7db',1,'turbojpeg.h']]],
+  ['tj3setcroppingregion_32',['tj3SetCroppingRegion',['../group___turbo_j_p_e_g.html#gaa49c7bd4c9431667a043cfc93388ba1c',1,'turbojpeg.h']]],
+  ['tj3seticcprofile_33',['tj3SetICCProfile',['../group___turbo_j_p_e_g.html#ga5852aa6e9ee3a457798a1741642dec40',1,'turbojpeg.h']]],
+  ['tj3setscalingfactor_34',['tj3SetScalingFactor',['../group___turbo_j_p_e_g.html#ga89da17ee1e43ff423382cbc145803c75',1,'turbojpeg.h']]],
+  ['tj3transform_35',['tj3Transform',['../group___turbo_j_p_e_g.html#gaff23ba1dcabed456794b844791613920',1,'turbojpeg.h']]],
+  ['tj3yuvbufsize_36',['tj3YUVBufSize',['../group___turbo_j_p_e_g.html#gaaebaa16973a0f550a66eca5765ed0546',1,'turbojpeg.h']]],
+  ['tj3yuvplaneheight_37',['tj3YUVPlaneHeight',['../group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b',1,'turbojpeg.h']]],
+  ['tj3yuvplanesize_38',['tj3YUVPlaneSize',['../group___turbo_j_p_e_g.html#gacc19d265edce76b46146f59579f9438d',1,'turbojpeg.h']]],
+  ['tj3yuvplanewidth_39',['tj3YUVPlaneWidth',['../group___turbo_j_p_e_g.html#gac99d1933ede1d59fcada9a826e88eb2d',1,'turbojpeg.h']]]
 ];
--- a/java/TJBench.java
+++ b/java/TJBench.java
@ -528,7 +528,7 @@ final class TJBench {
    byte[][] jpegBufs = null;
    byte[] srcBuf;
    int[] jpegSizes = null;
-    int totalJpegSize;
+    int iccSize = 0, totalJpegSize;
    double start, elapsed;
    int ps = TJ.getPixelSize(pf), tile, x, y, iter;
    // Original image
@ -571,6 +571,8 @@ final class TJBench {
      System.out.println("JPEG image is progressive\n");
    if (tjt.get(TJ.PARAM_ARITHMETIC) == 1)
      System.out.println("JPEG image uses arithmetic entropy coding\n");
+    if ((xformOpt & TJTransform.OPT_COPYNONE) == 0)
+      iccSize = tjt.getICCSize();
    tjt.set(TJ.PARAM_PROGRESSIVE, progressive ? 1 : 0);
    tjt.set(TJ.PARAM_ARITHMETIC, arithmetic ? 1 : 0);

@ -687,7 +689,8 @@ final class TJBench {
            t[tile].cf = customFilter;
            if ((t[tile].options & TJTransform.OPT_NOOUTPUT) == 0)
              jpegBufs[tile] =
-                new byte[TJ.bufSize(t[tile].width, t[tile].height, tsubsamp)];
+                new byte[TJ.bufSize(t[tile].width, t[tile].height, tsubsamp) +
+                         iccSize];
          }
        }

@ -736,7 +739,7 @@ final class TJBench {
      } else {
        if (quiet == 1)
          System.out.print("N/A     N/A     ");
-        jpegBufs = new byte[1][TJ.bufSize(ttilew, ttileh, tsubsamp)];
+        jpegBufs = new byte[1][TJ.bufSize(ttilew, ttileh, tsubsamp) + iccSize];
        jpegSizes = new int[1];
        jpegBufs[0] = srcBuf;
        jpegSizes[0] = srcSize;
--- a/java/TJComp.java
+++ b/java/TJComp.java
@ -35,7 +35,6 @@
 * - GIF and Targa input file formats [legacy feature]
 * - Separate quality settings for luminance and chrominance
 * - The floating-point DCT method [legacy feature]
- * - Embedding an ICC color management profile
 * - Input image smoothing
 * - Progress reporting
 * - Debug output
@ -75,6 +74,9 @@ final class TJComp {

    System.out.println("GENERAL OPTIONS (CAN BE ABBREVIATED)");
    System.out.println("------------------------------------");
+    System.out.println("-icc FILE");
+    System.out.println("    Embed the ICC (International Color Consortium) color management profile");
+    System.out.println("    from the specified file into the JPEG image");
    System.out.println("-lossless PSV[,Pt]");
    System.out.println("    Create a lossless JPEG image (implies -subsamp 444) using predictor");
    System.out.println("    selection value PSV (1-7) and optional point transform Pt (0 through");
@ -136,6 +138,7 @@ final class TJComp {
  public static void main(String[] argv) {
    int exitStatus = 0;
    TJCompressor tjc = null;
+    FileInputStream fis = null;
    FileOutputStream fos = null;

    try {
@ -145,7 +148,8 @@ final class TJComp {
        pixelFormat = TJ.PF_UNKNOWN, precision = -1, progressive = -1,
        quality = DEFAULT_QUALITY, restartIntervalBlocks = -1,
        restartIntervalRows = -1, subsamp = DEFAULT_SUBSAMP;
-      byte[] jpegBuf;
+      String iccFilename = null;
+      byte[] iccBuf, jpegBuf;

      for (i = 0; i < argv.length; i++) {
        if (matchArg(argv[i], "-arithmetic", 2))
@ -159,6 +163,8 @@ final class TJComp {
        } else if (matchArg(argv[i], "-grayscale", 2) ||
                   matchArg(argv[i], "-greyscale", 2))
          colorspace = TJ.CS_GRAY;
+        else if (matchArg(argv[i], "-icc", 2) && i < argv.length - 1)
+          iccFilename = argv[++i];
        else if (matchArg(argv[i], "-lossless", 2) && i < argv.length - 1) {
          Scanner scanner = new Scanner(argv[++i]).useDelimiter(",");

@ -280,6 +286,18 @@ final class TJComp {
      if (colorspace >= 0)
        tjc.set(TJ.PARAM_COLORSPACE, colorspace);

+      if (iccFilename != null) {
+        File iccFile = new File(iccFilename);
+        fis = new FileInputStream(iccFile);
+        int iccSize = fis.available();
+        if (iccSize < 1)
+          throw new Exception("ICC profile contains no data");
+        iccBuf = new byte[iccSize];
+        fis.read(iccBuf);
+        fis.close();  fis = null;
+        tjc.setICCProfile(iccBuf);
+      }
+
      jpegBuf = tjc.compress();

      File outFile = new File(argv[++i]);
@ -291,6 +309,7 @@ final class TJComp {
    }

    try {
+      if (fis != null) fis.close();
      if (fos != null) fos.close();
      if (tjc != null) tjc.close();
    } catch (Exception e) {}
--- a/java/TJDecomp.java
+++ b/java/TJDecomp.java
@ -93,6 +93,9 @@ final class TJDecomp {

    System.out.println("GENERAL OPTIONS (CAN BE ABBREVBIATED)");
    System.out.println("-------------------------------------");
+    System.out.println("-icc FILE");
+    System.out.println("    Extract the ICC (International Color Consortium) color profile from the");
+    System.out.println("    JPEG image to the specified file");
    System.out.println("-strict");
    System.out.println("    Treat all warnings as fatal; abort immediately if incomplete or corrupt");
    System.out.println("    data is encountered in the JPEG image, rather than trying to salvage the");
@ -158,6 +161,7 @@ final class TJDecomp {
    int exitStatus = 0;
    TJDecompressor tjd = null;
    FileInputStream fis = null;
+    FileOutputStream fos = null;

    try {

@ -166,9 +170,10 @@ final class TJDecomp {
        maxScans = -1, pixelFormat = TJ.PF_UNKNOWN, precision,
        stopOnWarning = -1, subsamp;
      java.awt.Rectangle croppingRegion = TJ.UNCROPPED;
+      String iccFilename = null;
      TJScalingFactor scalingFactor = TJ.UNSCALED;
      int width, height;
-      byte[] jpegBuf;
+      byte[] jpegBuf, iccBuf = null;
      Object dstBuf = null;

      for (i = 0; i < argv.length; i++) {
@ -198,6 +203,8 @@ final class TJDecomp {
        } else if (matchArg(argv[i], "-grayscale", 2) ||
                   matchArg(argv[i], "-greyscale", 2))
          pixelFormat = TJ.PF_GRAY;
+        else if (matchArg(argv[i], "-icc", 2) && i < argv.length - 1)
+          iccFilename = argv[++i];
        else if (matchArg(argv[i], "-maxscans", 5) && i < argv.length - 1) {
          int temp = -1;

@ -282,6 +289,17 @@ final class TJDecomp {
      precision = tjd.get(TJ.PARAM_PRECISION);
      colorspace = tjd.get(TJ.PARAM_COLORSPACE);

+      if (iccFilename != null) {
+        try {
+          iccBuf = tjd.getICCProfile();
+        } catch (TJException e) { handleTJException(e, stopOnWarning); }
+        if (iccBuf != null) {
+          File iccFile = new File(iccFilename);
+          fos = new FileOutputStream(iccFile);
+          fos.write(iccBuf, 0, iccBuf.length);
+        }
+      }
+
      if (pixelFormat == TJ.PF_UNKNOWN) {
        if (colorspace == TJ.CS_GRAY)
          pixelFormat = TJ.PF_GRAY;
@ -332,8 +350,9 @@ final class TJDecomp {
    }

    try {
-      if (fis != null) fis.close();
      if (tjd != null) tjd.close();
+      if (fis != null) fis.close();
+      if (fos != null) fos.close();
    } catch (Exception e) {}
    System.exit(exitStatus);
  }
--- a/java/TJTran.java
+++ b/java/TJTran.java
@ -80,9 +80,15 @@ final class TJTran {
    System.out.println("    entropy coding (can be combined with -progressive)");
    System.out.println("-copy all");
    System.out.println("    Copy all extra markers (including comments, JFIF thumbnails, Exif data, and");
-    System.out.println("    ICC profile data) from the input image to the output image [default]");
+    System.out.println("    ICC profile data) from the input image to the output image");
+    System.out.println("-copy comments");
+    System.out.println("    Do not copy any extra markers, except comment markers, from the input");
+    System.out.println("    image to the output image [default]");
+    System.out.println("-copy icc");
+    System.out.println("    Do not copy any extra markers, except ICC profile data, from the input");
+    System.out.println("    image to the output image");
    System.out.println("-copy none");
-    System.out.println("    Copy no extra markers from the input image to the output image");
+    System.out.println("    Do not copy any extra markers from the input image to the output image");
    System.out.println("-crop WxH+X+Y");
    System.out.println("    Include only the specified region of the input image.  (W, H, X, and Y are");
    System.out.println("    the width, height, left boundary, and upper boundary of the region, all");
@ -94,6 +100,9 @@ final class TJTran {
    System.out.println("    mutually exclusive)");
    System.out.println("-grayscale");
    System.out.println("    Create a grayscale output image from a full-color input image");
+    System.out.println("-icc FILE");
+    System.out.println("    Embed the ICC (International Color Consortium) color management profile");
+    System.out.println("    from the specified file into the output image");
    System.out.println("-maxmemory N");
    System.out.println("    Memory limit (in megabytes) for intermediate buffers used with progressive");
    System.out.println("    JPEG compression, Huffman table optimization, and lossless transformation");
@ -145,11 +154,12 @@ final class TJTran {
      int i;
      int arithmetic = 0, maxMemory = -1, maxScans = -1, optimize = -1,
        progressive = 0, restartIntervalBlocks = -1, restartIntervalRows = -1,
-        subsamp;
+        saveMarkers = 1, subsamp;
      TJTransform[] xform = new TJTransform[1];
      xform[0] = new TJTransform();
-      byte[] srcBuf;
-      int width, height;
+      String iccFilename = null;
+      byte[] srcBuf, iccBuf;
+      int width, height, iccSize = 0;
      byte[][] dstBuf;

      for (i = 0; i < argv.length; i++) {
@ -175,9 +185,13 @@ final class TJTran {
          xform[0].y = tempY;
        } else if (matchArg(argv[i], "-copy", 2) && i < argv.length - 1) {
          i++;
-          if (matchArg(argv[i], "none", 1))
-            xform[0].options |= TJTransform.OPT_COPYNONE;
-          else if (!matchArg(argv[i], "all", 1))
+          if (matchArg(argv[i], "all", 1))
+            saveMarkers = 2;
+          else if (matchArg(argv[i], "icc", 1))
+            saveMarkers = 4;
+          else if (matchArg(argv[i], "none", 1))
+            saveMarkers = 0;
+          else if (!matchArg(argv[i], "comments", 1))
            usage();
        } else if (matchArg(argv[i], "-flip", 2) && i < argv.length - 1) {
          i++;
@ -190,6 +204,8 @@ final class TJTran {
        } else if (matchArg(argv[i], "-grayscale", 2) ||
                   matchArg(argv[i], "-greyscale", 2))
          xform[0].options |= TJTransform.OPT_GRAY;
+        else if (matchArg(argv[i], "-icc", 2) && i < argv.length - 1)
+          iccFilename = argv[++i];
        else if (matchArg(argv[i], "-maxscans", 5) && i < argv.length - 1) {
          int temp = -1;

@ -252,6 +268,11 @@ final class TJTran {
      if (i != argv.length - 2)
        usage();

+      if (iccFilename != null) {
+        if (saveMarkers == 2) saveMarkers = 3;
+        else if (saveMarkers == 4) saveMarkers = 0;
+      }
+
      tjt = new TJTransformer();

      if (optimize >= 0)
@ -264,6 +285,7 @@ final class TJTran {
        tjt.set(TJ.PARAM_RESTARTROWS, restartIntervalRows);
      if (maxMemory >= 0)
        tjt.set(TJ.PARAM_MAXMEMORY, maxMemory);
+      tjt.set(TJ.PARAM_SAVEMARKERS, saveMarkers);

      File inFile = new File(argv[i++]);
      fis = new FileInputStream(inFile);
@ -315,13 +337,23 @@ final class TJTran {
        xform[0].height += yAdjust;
      }

-      dstBuf = new byte[1][TJ.bufSize(width, height, subsamp)];
+      if (iccFilename != null) {
+        File iccFile = new File(iccFilename);
+        fis = new FileInputStream(iccFile);
+        iccSize = fis.available();
+        if (iccSize < 1)
+          throw new Exception("ICC profile contains no data");
+        iccBuf = new byte[iccSize];
+        fis.read(iccBuf);
+        fis.close();  fis = null;
+        tjt.setICCProfile(iccBuf);
+      }

-      tjt.transform(dstBuf, xform);
+      TJDecompressor[] tjd = tjt.transform(xform);

      File outFile = new File(argv[i]);
      fos = new FileOutputStream(outFile);
-      fos.write(dstBuf[0], 0, tjt.getTransformedSizes()[0]);
+      fos.write(tjd[0].getJPEGBuf(), 0, tjd[0].getJPEGSize());
    } catch (Exception e) {
      e.printStackTrace();
      exitStatus = -1;
--- a/java/doc/constant-values.html
+++ b/java/doc/constant-values.html
@ -326,181 +326,188 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast"><code>19</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PARAM_SAVEMARKERS">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_SAVEMARKERS">PARAM_SAVEMARKERS</a></code></th>
+<td class="colLast"><code>25</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PARAM_SCANLIMIT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_SCANLIMIT">PARAM_SCANLIMIT</a></code></th>
 <td class="colLast"><code>13</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PARAM_STOPONWARNING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_STOPONWARNING">PARAM_STOPONWARNING</a></code></th>
 <td class="colLast"><code>0</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PARAM_SUBSAMP">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_SUBSAMP">PARAM_SUBSAMP</a></code></th>
 <td class="colLast"><code>4</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PARAM_XDENSITY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_XDENSITY">PARAM_XDENSITY</a></code></th>
 <td class="colLast"><code>20</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PARAM_YDENSITY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_YDENSITY">PARAM_YDENSITY</a></code></th>
 <td class="colLast"><code>21</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_ABGR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_ABGR">PF_ABGR</a></code></th>
 <td class="colLast"><code>9</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_ARGB">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_ARGB">PF_ARGB</a></code></th>
 <td class="colLast"><code>10</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_BGR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_BGR">PF_BGR</a></code></th>
 <td class="colLast"><code>1</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_BGRA">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_BGRA">PF_BGRA</a></code></th>
 <td class="colLast"><code>8</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_BGRX">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_BGRX">PF_BGRX</a></code></th>
 <td class="colLast"><code>3</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_CMYK">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_CMYK">PF_CMYK</a></code></th>
 <td class="colLast"><code>11</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_GRAY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_GRAY">PF_GRAY</a></code></th>
 <td class="colLast"><code>6</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_RGB">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_RGB">PF_RGB</a></code></th>
 <td class="colLast"><code>0</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_RGBA">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_RGBA">PF_RGBA</a></code></th>
 <td class="colLast"><code>7</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_RGBX">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_RGBX">PF_RGBX</a></code></th>
 <td class="colLast"><code>2</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_UNKNOWN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_UNKNOWN">PF_UNKNOWN</a></code></th>
 <td class="colLast"><code>-1</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_XBGR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_XBGR">PF_XBGR</a></code></th>
 <td class="colLast"><code>4</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.PF_XRGB">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#PF_XRGB">PF_XRGB</a></code></th>
 <td class="colLast"><code>5</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_411">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_411">SAMP_411</a></code></th>
 <td class="colLast"><code>5</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_420">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_420">SAMP_420</a></code></th>
 <td class="colLast"><code>2</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_422">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_422">SAMP_422</a></code></th>
 <td class="colLast"><code>1</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_440">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_440">SAMP_440</a></code></th>
 <td class="colLast"><code>4</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_441">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_441">SAMP_441</a></code></th>
 <td class="colLast"><code>6</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_444">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_444">SAMP_444</a></code></th>
 <td class="colLast"><code>0</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_GRAY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <th class="colSecond" scope="row"><code><a href="org/libjpegturbo/turbojpeg/TJ.html#SAMP_GRAY">SAMP_GRAY</a></code></th>
 <td class="colLast"><code>3</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a id="org.libjpegturbo.turbojpeg.TJ.SAMP_UNKNOWN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
--- a/java/doc/index-all.html
+++ b/java/doc/index-all.html
@ -359,6 +359,20 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Returns the height of the YUV image (or subregion.)</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJDecompressor.html#getICCProfile()">getICCProfile()</a></span> - Method in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg">TJDecompressor</a></dt>
+<dd>
+<div class="block">Retrieve the ICC (International Color Consortium) color management profile
+ (if any) that was previously extracted from the JPEG image associated with
+ this decompressor instance (see <a href="org/libjpegturbo/turbojpeg/TJDecompressor.html#setSourceImage(byte%5B%5D,int)"><code>TJDecompressor.setSourceImage(byte[], int)</code></a>), and
+ return a buffer containing the ICC profile.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJDecompressor.html#getICCSize()">getICCSize()</a></span> - Method in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg">TJDecompressor</a></dt>
+<dd>
+<div class="block">Returns the size of the ICC profile (if any) that was previously extracted
+ from the JPEG image associated with this decompressor instance
+ (see <a href="org/libjpegturbo/turbojpeg/TJDecompressor.html#setSourceImage(byte%5B%5D,int)"><code>TJDecompressor.setSourceImage(byte[], int)</code></a>), or 0 if there is no ICC
+ profile to retrieve.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJDecompressor.html#getJPEGBuf()">getJPEGBuf()</a></span> - Method in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg">TJDecompressor</a></dt>
 <dd>
 <div class="block">Returns the JPEG buffer associated with this decompressor instance.</div>
@ -680,6 +694,10 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">JPEG restart marker interval in MCU rows [compression only]</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_SAVEMARKERS">PARAM_SAVEMARKERS</a></span> - Static variable in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJ.html" title="class in org.libjpegturbo.turbojpeg">TJ</a></dt>
+<dd>
+<div class="block">Marker copying behavior [decompression, lossless transformation]</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJ.html#PARAM_SCANLIMIT">PARAM_SCANLIMIT</a></span> - Static variable in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJ.html" title="class in org.libjpegturbo.turbojpeg">TJ</a></dt>
 <dd>
 <div class="block">Progressive JPEG scan limit for lossy JPEG images [decompression, lossless
@ -834,6 +852,16 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <div class="block">Set the cropping region for partially decompressing a lossy JPEG image
 into a packed-pixel image.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJCompressor.html#setICCProfile(byte%5B%5D)">setICCProfile(byte[])</a></span> - Method in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJCompressor.html" title="class in org.libjpegturbo.turbojpeg">TJCompressor</a></dt>
+<dd>
+<div class="block">Embed an ICC (International Color Consortium) color management profile in
+ JPEG images generated by subsequent compression operations.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJTransformer.html#setICCProfile(byte%5B%5D)">setICCProfile(byte[])</a></span> - Method in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJTransformer.html" title="class in org.libjpegturbo.turbojpeg">TJTransformer</a></dt>
+<dd>
+<div class="block">Embed an ICC (International Color Consortium) color management profile in
+ JPEG images generated by subsequent transform operations.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/libjpegturbo/turbojpeg/TJDecompressor.html#setScalingFactor(org.libjpegturbo.turbojpeg.TJScalingFactor)">setScalingFactor(TJScalingFactor)</a></span> - Method in class org.libjpegturbo.turbojpeg.<a href="org/libjpegturbo/turbojpeg/TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg">TJDecompressor</a></dt>
 <dd>
 <div class="block">Set the scaling factor for subsequent lossy decompression operations.</div>
--- a/java/doc/member-search-index.js
+++ b/java/doc/member-search-index.js
--- a/java/doc/member-search-index.zip
+++ b/java/doc/member-search-index.zip
--- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html
+++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html
@ -366,83 +366,90 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PARAM_SAVEMARKERS">PARAM_SAVEMARKERS</a></span></code></th>
+<td class="colLast">
+<div class="block">Marker copying behavior [decompression, lossless transformation]</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PARAM_SCANLIMIT">PARAM_SCANLIMIT</a></span></code></th>
 <td class="colLast">
 <div class="block">Progressive JPEG scan limit for lossy JPEG images [decompression, lossless
 transformation]</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PARAM_STOPONWARNING">PARAM_STOPONWARNING</a></span></code></th>
 <td class="colLast">
 <div class="block">Error handling behavior</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PARAM_SUBSAMP">PARAM_SUBSAMP</a></span></code></th>
 <td class="colLast">
 <div class="block">Chrominance subsampling level</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PARAM_XDENSITY">PARAM_XDENSITY</a></span></code></th>
 <td class="colLast">
 <div class="block">JPEG horizontal pixel density</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PARAM_YDENSITY">PARAM_YDENSITY</a></span></code></th>
 <td class="colLast">
 <div class="block">JPEG vertical pixel density</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_ABGR">PF_ABGR</a></span></code></th>
 <td class="colLast">
 <div class="block">ABGR pixel format</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_ARGB">PF_ARGB</a></span></code></th>
 <td class="colLast">
 <div class="block">ARGB pixel format</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_BGR">PF_BGR</a></span></code></th>
 <td class="colLast">
 <div class="block">BGR pixel format</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_BGRA">PF_BGRA</a></span></code></th>
 <td class="colLast">
 <div class="block">BGRA pixel format</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_BGRX">PF_BGRX</a></span></code></th>
 <td class="colLast">
 <div class="block">BGRX pixel format</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_CMYK">PF_CMYK</a></span></code></th>
 <td class="colLast">
 <div class="block">CMYK pixel format</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_GRAY">PF_GRAY</a></span></code></th>
 <td class="colLast">
@ -453,112 +460,112 @@ extends java.lang.Object</pre>
 or 4095 for 12-bit samples or 65535 for 16-bit samples.)</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_RGB">PF_RGB</a></span></code></th>
 <td class="colLast">
 <div class="block">RGB pixel format</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_RGBA">PF_RGBA</a></span></code></th>
 <td class="colLast">
 <div class="block">RGBA pixel format</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_RGBX">PF_RGBX</a></span></code></th>
 <td class="colLast">
 <div class="block">RGBX pixel format</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_UNKNOWN">PF_UNKNOWN</a></span></code></th>
 <td class="colLast">
 <div class="block">Unknown pixel format</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_XBGR">PF_XBGR</a></span></code></th>
 <td class="colLast">
 <div class="block">XBGR pixel format</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#PF_XRGB">PF_XRGB</a></span></code></th>
 <td class="colLast">
 <div class="block">XRGB pixel format</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_411">SAMP_411</a></span></code></th>
 <td class="colLast">
 <div class="block">4:1:1 chrominance subsampling</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_420">SAMP_420</a></span></code></th>
 <td class="colLast">
 <div class="block">4:2:0 chrominance subsampling</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_422">SAMP_422</a></span></code></th>
 <td class="colLast">
 <div class="block">4:2:2 chrominance subsampling</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_440">SAMP_440</a></span></code></th>
 <td class="colLast">
 <div class="block">4:4:0 chrominance subsampling</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_441">SAMP_441</a></span></code></th>
 <td class="colLast">
 <div class="block">4:4:1 chrominance subsampling</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_444">SAMP_444</a></span></code></th>
 <td class="colLast">
 <div class="block">4:4:4 chrominance subsampling (no chrominance subsampling)</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_GRAY">SAMP_GRAY</a></span></code></th>
 <td class="colLast">
 <div class="block">Grayscale</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#SAMP_UNKNOWN">SAMP_UNKNOWN</a></span></code></th>
 <td class="colLast">
 <div class="block">Unknown subsampling</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.awt.Rectangle</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#UNCROPPED">UNCROPPED</a></span></code></th>
 <td class="colLast">
 <div class="block">A <code>java.awt.Rectangle</code> instance that specifies no cropping</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="TJScalingFactor.html" title="class in org.libjpegturbo.turbojpeg">TJScalingFactor</a></code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#UNSCALED">UNSCALED</a></span></code></th>
 <td class="colLast">
@ -1979,6 +1986,47 @@ extends java.lang.Object</pre>
 </dl>
 </li>
 </ul>
+<a id="PARAM_SAVEMARKERS">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>PARAM_SAVEMARKERS</h4>
+<pre>public static final&nbsp;int PARAM_SAVEMARKERS</pre>
+<div class="block">Marker copying behavior [decompression, lossless transformation]
+
+ <p><b>Value [lossless transformation]</b>
+ <ul>
+ <li> <code>0</code> Do not copy any extra markers (including comments,
+ JFIF thumbnails, Exif data, and ICC profile data) from the source image to
+ the destination image.
+ <li> <code>1</code> Do not copy any extra markers, except comment (COM)
+ markers, from the source image to the destination image.
+ <li> <code>2</code> <i>[default]</i> Copy all extra markers from the
+ source image to the destination image.
+ <li> <code>3</code> Copy all extra markers, except ICC profile data (APP2
+ markers), from the source image to the destination image.
+ <li> <code>4</code> Do not copy any extra markers, except ICC profile data
+ (APP2 markers), from the source image to the destination image.
+ </ul>
+
+ <p><a href="TJTransform.html#OPT_COPYNONE"><code>TJTransform.OPT_COPYNONE</code></a> overrides this parameter for a
+ particular transform.  This parameter overrides any ICC profile that was
+ previously associated with a compressor instance using
+ <a href="TJCompressor.html#setICCProfile(byte%5B%5D)"><code>TJCompressor.setICCProfile()</code></a> or with a
+ transformer instance using <a href="TJTransformer.html#setICCProfile(byte%5B%5D)"><code>TJTransformer.setICCProfile()</code></a>.
+
+ <p>When decompressing, associating a JPEG source image with the
+ decompressor instance extracts the ICC profile from the source image if
+ this parameter is set to <code>2</code> or <code>4</code>.
+ <a href="TJDecompressor.html#getICCProfile()"><code>TJDecompressor.getICCProfile()</code></a> can then be used to retrieve the
+ profile.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.PARAM_SAVEMARKERS">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a id="NUMERR">
 <!--   -->
 </a>
--- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
+++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
@ -27,7 +27,7 @@
    catch(err) {
    }
 //-->
-var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10};
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@ -340,6 +340,14 @@ implements java.io.Closeable</pre>
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setICCProfile(byte%5B%5D)">setICCProfile</a></span>&#8203;(byte[]&nbsp;iccBuf)</code></th>
+<td class="colLast">
+<div class="block">Embed an ICC (International Color Consortium) color management profile in
+ JPEG images generated by subsequent compression operations.</div>
+</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage(byte%5B%5D,int,int,int,int,int,int)">setSourceImage</a></span>&#8203;(byte[]&nbsp;srcImage,
              int&nbsp;x,
              int&nbsp;y,
@ -352,7 +360,7 @@ implements java.io.Closeable</pre>
 bits of data precision per sample with this compressor instance.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage(java.awt.image.BufferedImage,int,int,int,int)">setSourceImage</a></span>&#8203;(java.awt.image.BufferedImage&nbsp;srcImage,
              int&nbsp;x,
@ -364,7 +372,7 @@ implements java.io.Closeable</pre>
 with this compressor instance.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage(org.libjpegturbo.turbojpeg.YUVImage)">setSourceImage</a></span>&#8203;(<a href="YUVImage.html" title="class in org.libjpegturbo.turbojpeg">YUVImage</a>&nbsp;srcImage)</code></th>
 <td class="colLast">
@ -372,7 +380,7 @@ implements java.io.Closeable</pre>
 instance.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage12(short%5B%5D,int,int,int,int,int,int)">setSourceImage12</a></span>&#8203;(short[]&nbsp;srcImage,
                int&nbsp;x,
@ -386,7 +394,7 @@ implements java.io.Closeable</pre>
 bits of data precision per sample with this compressor instance.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage16(short%5B%5D,int,int,int,int,int,int)">setSourceImage16</a></span>&#8203;(short[]&nbsp;srcImage,
                int&nbsp;x,
@ -891,6 +899,28 @@ implements java.io.Closeable</pre>
 </dl>
 </li>
 </ul>
+<a id="setICCProfile(byte[])">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setICCProfile</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;setICCProfile&#8203;(byte[]&nbsp;iccBuf)
+                   throws <a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></pre>
+<div class="block">Embed an ICC (International Color Consortium) color management profile in
+ JPEG images generated by subsequent compression operations.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>iccBuf</code> - buffer containing an ICC profile.  (The size of the ICC
+ profile is assumed to be the length of the array.)  A copy is made of the
+ ICC profile, so this buffer can be reused as soon as this method returns.
+ Setting this parameter to null removes any ICC profile that was previously
+ associated with this compressor instance.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></code></dd>
+</dl>
+</li>
+</ul>
 <a id="compress(byte[])">
 <!--   -->
 </a>
@ -907,7 +937,9 @@ implements java.io.Closeable</pre>
 <dd><code>dstBuf</code> - buffer that will receive the JPEG image.  Use
 <a href="TJ.html#bufSize(int,int,int)"><code>TJ.bufSize()</code></a> to determine the maximum size for this
 buffer based on the source image's width and height and the desired level
- of chrominance subsampling (see <a href="TJ.html#PARAM_SUBSAMP"><code>TJ.PARAM_SUBSAMP</code></a>.)</dd>
+ of chrominance subsampling (see <a href="TJ.html#PARAM_SUBSAMP"><code>TJ.PARAM_SUBSAMP</code></a>), then add the
+ size of the ICC profile (if any) that was previously associated with this
+ compressor instance (see <a href="#setICCProfile(byte%5B%5D)"><code>setICCProfile()</code></a>.)</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></code></dd>
 </dl>
--- a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
+++ b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
@ -27,7 +27,7 @@
    catch(err) {
    }
 //-->
-var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10};
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@ -375,12 +375,32 @@ implements java.io.Closeable</pre>
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>byte[]</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getICCProfile()">getICCProfile</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieve the ICC (International Color Consortium) color management profile
+ (if any) that was previously extracted from the JPEG image associated with
+ this decompressor instance (see <a href="#setSourceImage(byte%5B%5D,int)"><code>setSourceImage(byte[], int)</code></a>), and
+ return a buffer containing the ICC profile.</div>
+</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getICCSize()">getICCSize</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Returns the size of the ICC profile (if any) that was previously extracted
+ from the JPEG image associated with this decompressor instance
+ (see <a href="#setSourceImage(byte%5B%5D,int)"><code>setSourceImage(byte[], int)</code></a>), or 0 if there is no ICC
+ profile to retrieve.</div>
+</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>byte[]</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getJPEGBuf()">getJPEGBuf</a></span>()</code></th>
 <td class="colLast">
 <div class="block">Returns the JPEG buffer associated with this decompressor instance.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getJPEGSize()">getJPEGSize</a></span>()</code></th>
 <td class="colLast">
@ -388,7 +408,7 @@ implements java.io.Closeable</pre>
 decompressor instance.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWidth()">getWidth</a></span>()</code></th>
 <td class="colLast">
@ -396,7 +416,7 @@ implements java.io.Closeable</pre>
 decompressor instance.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#saveImage(java.lang.String,java.lang.Object,int,int,int,int,int,int)">saveImage</a></span>&#8203;(java.lang.String&nbsp;fileName,
         java.lang.Object&nbsp;image,
@ -411,7 +431,7 @@ implements java.io.Closeable</pre>
 from memory to disk.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#set(int,int)">set</a></span>&#8203;(int&nbsp;param,
   int&nbsp;value)</code></th>
@ -419,7 +439,7 @@ implements java.io.Closeable</pre>
 <div class="block">Set the value of a decompression parameter.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setCroppingRegion(java.awt.Rectangle)">setCroppingRegion</a></span>&#8203;(java.awt.Rectangle&nbsp;croppingRegion)</code></th>
 <td class="colLast">
@ -427,14 +447,14 @@ implements java.io.Closeable</pre>
 into a packed-pixel image.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setScalingFactor(org.libjpegturbo.turbojpeg.TJScalingFactor)">setScalingFactor</a></span>&#8203;(<a href="TJScalingFactor.html" title="class in org.libjpegturbo.turbojpeg">TJScalingFactor</a>&nbsp;scalingFactor)</code></th>
 <td class="colLast">
 <div class="block">Set the scaling factor for subsequent lossy decompression operations.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage(byte%5B%5D,int)">setSourceImage</a></span>&#8203;(byte[]&nbsp;jpegImage,
              int&nbsp;imageSize)</code></th>
@ -444,7 +464,7 @@ implements java.io.Closeable</pre>
 <code>jpegImage</code> with this decompressor instance.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSourceImage(org.libjpegturbo.turbojpeg.YUVImage)">setSourceImage</a></span>&#8203;(<a href="YUVImage.html" title="class in org.libjpegturbo.turbojpeg">YUVImage</a>&nbsp;srcImage)</code></th>
 <td class="colLast">
@ -589,7 +609,11 @@ implements java.io.Closeable</pre>
 when decompressing video streams in which all frames share the same
 quantization and Huffman tables.  If a JPEG image is passed to this
 method, then the <a href="TJ.html#PARAM_STOPONWARNING"><code>parameters</code></a> that describe
- the JPEG image will be set when the method returns.</div>
+ the JPEG image will be set when the method returns.  If a JPEG image is
+ passed to this method and <a href="TJ.html#PARAM_SAVEMARKERS"><code>TJ.PARAM_SAVEMARKERS</code></a> is set to
+ <code>2</code> or <code>4</code>, then the ICC profile (if any) will be
+ extracted from the JPEG image.  (<a href="#getICCProfile()"><code>getICCProfile()</code></a> can then be used
+ to retrieve the profile.)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>jpegImage</code> - buffer containing a JPEG source image or tables-only
@ -686,6 +710,47 @@ implements java.io.Closeable</pre>
 </dl>
 </li>
 </ul>
+<a id="getICCProfile()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getICCProfile</h4>
+<pre class="methodSignature">public&nbsp;byte[]&nbsp;getICCProfile()
+                     throws <a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></pre>
+<div class="block">Retrieve the ICC (International Color Consortium) color management profile
+ (if any) that was previously extracted from the JPEG image associated with
+ this decompressor instance (see <a href="#setSourceImage(byte%5B%5D,int)"><code>setSourceImage(byte[], int)</code></a>), and
+ return a buffer containing the ICC profile.  Once the ICC profile is
+ retrieved, it must be re-extracted before it can be retrieved again.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a buffer containing the ICC profile</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a id="getICCSize()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getICCSize</h4>
+<pre class="methodSignature">public&nbsp;int&nbsp;getICCSize()</pre>
+<div class="block">Returns the size of the ICC profile (if any) that was previously extracted
+ from the JPEG image associated with this decompressor instance
+ (see <a href="#setSourceImage(byte%5B%5D,int)"><code>setSourceImage(byte[], int)</code></a>), or 0 if there is no ICC
+ profile to retrieve.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the size of the ICC profile (if any) that was previously extracted
+ from the JPEG image associated with this decompressor instance
+ (see <a href="#setSourceImage(byte%5B%5D,int)"><code>setSourceImage(byte[], int)</code></a>), or 0 if there is no ICC
+ profile to retrieve.</dd>
+</dl>
+</li>
+</ul>
 <a id="setScalingFactor(org.libjpegturbo.turbojpeg.TJScalingFactor)">
 <!--   -->
 </a>
--- a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
+++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
@ -27,7 +27,7 @@
    catch(err) {
    }
 //-->
-var data = {"i0":10,"i1":10,"i2":10};
+var data = {"i0":10,"i1":10,"i2":10,"i3":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@ -212,6 +212,14 @@ extends <a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setICCProfile(byte%5B%5D)">setICCProfile</a></span>&#8203;(byte[]&nbsp;iccBuf)</code></th>
+<td class="colLast">
+<div class="block">Embed an ICC (International Color Consortium) color management profile in
+ JPEG images generated by subsequent transform operations.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#transform(byte%5B%5D%5B%5D,org.libjpegturbo.turbojpeg.TJTransform%5B%5D)">transform</a></span>&#8203;(byte[][]&nbsp;dstBufs,
         <a href="TJTransform.html" title="class in org.libjpegturbo.turbojpeg">TJTransform</a>[]&nbsp;transforms)</code></th>
 <td class="colLast">
@ -220,7 +228,7 @@ extends <a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg
 destination buffers.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg">TJDecompressor</a>[]</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#transform(org.libjpegturbo.turbojpeg.TJTransform%5B%5D)">transform</a></span>&#8203;(<a href="TJTransform.html" title="class in org.libjpegturbo.turbojpeg">TJTransform</a>[]&nbsp;transforms)</code></th>
 <td class="colLast">
@ -235,7 +243,7 @@ extends <a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.libjpegturbo.turbojpeg.<a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg">TJDecompressor</a></h3>
-<code><a href="TJDecompressor.html#close()">close</a>, <a href="TJDecompressor.html#decompress12(int,int)">decompress12</a>, <a href="TJDecompressor.html#decompress12(short%5B%5D,int,int,int,int)">decompress12</a>, <a href="TJDecompressor.html#decompress16(int,int)">decompress16</a>, <a href="TJDecompressor.html#decompress16(short%5B%5D,int,int,int,int)">decompress16</a>, <a href="TJDecompressor.html#decompress8(byte%5B%5D,int,int,int,int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(int%5B%5D,int,int,int,int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(int,int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(java.awt.image.BufferedImage)">decompress8</a>, <a href="TJDecompressor.html#decompressToYUV(int)">decompressToYUV</a>, <a href="TJDecompressor.html#decompressToYUV(int%5B%5D)">decompressToYUV</a>, <a href="TJDecompressor.html#decompressToYUV(org.libjpegturbo.turbojpeg.YUVImage)">decompressToYUV</a>, <a href="TJDecompressor.html#finalize()">finalize</a>, <a href="TJDecompressor.html#get(int)">get</a>, <a href="TJDecompressor.html#getHeight()">getHeight</a>, <a href="TJDecompressor.html#getJPEGBuf()">getJPEGBuf</a>, <a href="TJDecompressor.html#getJPEGSize()">getJPEGSize</a>, <a href="TJDecompressor.html#getWidth()">getWidth</a>, <a href="TJDecompressor.html#saveImage(java.lang.String,java.lang.Object,int,int,int,int,int,int)">saveImage</a>, <a href="TJDecompressor.html#set(int,int)">set</a>, <a href="TJDecompressor.html#setCroppingRegion(java.awt.Rectangle)">setCroppingRegion</a>, <a href="TJDecompressor.html#setScalingFactor(org.libjpegturbo.turbojpeg.TJScalingFactor)">setScalingFactor</a>, <a href="TJDecompressor.html#setSourceImage(byte%5B%5D,int)">setSourceImage</a>, <a href="TJDecompressor.html#setSourceImage(org.libjpegturbo.turbojpeg.YUVImage)">setSourceImage</a></code></li>
+<code><a href="TJDecompressor.html#close()">close</a>, <a href="TJDecompressor.html#decompress12(int,int)">decompress12</a>, <a href="TJDecompressor.html#decompress12(short%5B%5D,int,int,int,int)">decompress12</a>, <a href="TJDecompressor.html#decompress16(int,int)">decompress16</a>, <a href="TJDecompressor.html#decompress16(short%5B%5D,int,int,int,int)">decompress16</a>, <a href="TJDecompressor.html#decompress8(byte%5B%5D,int,int,int,int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(int%5B%5D,int,int,int,int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(int,int)">decompress8</a>, <a href="TJDecompressor.html#decompress8(java.awt.image.BufferedImage)">decompress8</a>, <a href="TJDecompressor.html#decompressToYUV(int)">decompressToYUV</a>, <a href="TJDecompressor.html#decompressToYUV(int%5B%5D)">decompressToYUV</a>, <a href="TJDecompressor.html#decompressToYUV(org.libjpegturbo.turbojpeg.YUVImage)">decompressToYUV</a>, <a href="TJDecompressor.html#finalize()">finalize</a>, <a href="TJDecompressor.html#get(int)">get</a>, <a href="TJDecompressor.html#getHeight()">getHeight</a>, <a href="TJDecompressor.html#getICCProfile()">getICCProfile</a>, <a href="TJDecompressor.html#getICCSize()">getICCSize</a>, <a href="TJDecompressor.html#getJPEGBuf()">getJPEGBuf</a>, <a href="TJDecompressor.html#getJPEGSize()">getJPEGSize</a>, <a href="TJDecompressor.html#getWidth()">getWidth</a>, <a href="TJDecompressor.html#saveImage(java.lang.String,java.lang.Object,int,int,int,int,int,int)">saveImage</a>, <a href="TJDecompressor.html#set(int,int)">set</a>, <a href="TJDecompressor.html#setCroppingRegion(java.awt.Rectangle)">setCroppingRegion</a>, <a href="TJDecompressor.html#setScalingFactor(org.libjpegturbo.turbojpeg.TJScalingFactor)">setScalingFactor</a>, <a href="TJDecompressor.html#setSourceImage(byte%5B%5D,int)">setSourceImage</a>, <a href="TJDecompressor.html#setSourceImage(org.libjpegturbo.turbojpeg.YUVImage)">setSourceImage</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
@ -328,6 +336,28 @@ extends <a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a id="setICCProfile(byte[])">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setICCProfile</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;setICCProfile&#8203;(byte[]&nbsp;iccBuf)
+                   throws <a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></pre>
+<div class="block">Embed an ICC (International Color Consortium) color management profile in
+ JPEG images generated by subsequent transform operations.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>iccBuf</code> - buffer containing an ICC profile.  (The size of the ICC
+ profile is assumed to be the length of the array.)  A copy is made of the
+ ICC profile, so this buffer can be reused as soon as this method returns.
+ Setting this parameter to null removes any ICC profile that was previously
+ associated with this transformer instance.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="TJException.html" title="class in org.libjpegturbo.turbojpeg">TJException</a></code></dd>
+</dl>
+</li>
+</ul>
 <a id="transform(byte[][],org.libjpegturbo.turbojpeg.TJTransform[])">
 <!--   -->
 </a>
@ -357,7 +387,11 @@ extends <a href="TJDecompressor.html" title="class in org.libjpegturbo.turbojpeg
 <a href="TJ.html#bufSize(int,int,int)"><code>TJ.bufSize()</code></a> to determine the maximum size for each
 buffer based on the transformed or cropped width and height and the level
 of subsampling used in the destination image (taking into account
- grayscale conversion and transposition of the width and height.)</dd>
+ grayscale conversion and transposition of the width and height), then add
+ the size of the ICC profile (if any) that was previously associated with
+ this transformer instance (see <a href="#setICCProfile(byte%5B%5D)"><code>setICCProfile()</code></a>) or
+ extracted from the source image (see
+ <a href="TJDecompressor.html#getICCProfile()"><code>TJDecompressor.getICCProfile()</code></a> and <a href="TJ.html#PARAM_SAVEMARKERS"><code>TJ.PARAM_SAVEMARKERS</code></a>.)</dd>
 <dd><code>transforms</code> - an array of <a href="TJTransform.html" title="class in org.libjpegturbo.turbojpeg"><code>TJTransform</code></a> instances, each of
 which specifies the transform parameters and/or cropping region for the
 corresponding transformed JPEG image</dd>
--- a/java/doc/package-search-index.zip
+++ b/java/doc/package-search-index.zip
--- a/java/doc/type-search-index.zip
+++ b/java/doc/type-search-index.zip
--- a/java/org/libjpegturbo/turbojpeg/TJ.java
+++ b/java/org/libjpegturbo/turbojpeg/TJ.java
@ -951,6 +951,38 @@ public final class TJ {
   * </ul>
   */
  public static final int PARAM_MAXPIXELS = 24;
+  /**
+   * Marker copying behavior [decompression, lossless transformation]
+   *
+   * <p><b>Value [lossless transformation]</b>
+   * <ul>
+   * <li> <code>0</code> Do not copy any extra markers (including comments,
+   * JFIF thumbnails, Exif data, and ICC profile data) from the source image to
+   * the destination image.
+   * <li> <code>1</code> Do not copy any extra markers, except comment (COM)
+   * markers, from the source image to the destination image.
+   * <li> <code>2</code> <i>[default]</i> Copy all extra markers from the
+   * source image to the destination image.
+   * <li> <code>3</code> Copy all extra markers, except ICC profile data (APP2
+   * markers), from the source image to the destination image.
+   * <li> <code>4</code> Do not copy any extra markers, except ICC profile data
+   * (APP2 markers), from the source image to the destination image.
+   * </ul>
+   *
+   * <p>{@link TJTransform#OPT_COPYNONE} overrides this parameter for a
+   * particular transform.  This parameter overrides any ICC profile that was
+   * previously associated with a compressor instance using
+   * {@link TJCompressor#setICCProfile TJCompressor.setICCProfile()} or with a
+   * transformer instance using {@link TJTransformer#setICCProfile
+   * TJTransformer.setICCProfile()}.
+   *
+   * <p>When decompressing, associating a JPEG source image with the
+   * decompressor instance extracts the ICC profile from the source image if
+   * this parameter is set to <code>2</code> or <code>4</code>.
+   * {@link TJDecompressor#getICCProfile} can then be used to retrieve the
+   * profile.
+   */
+  public static final int PARAM_SAVEMARKERS = 25;


  /**
--- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java
+++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java
@ -552,6 +552,18 @@ public class TJCompressor implements Closeable {
   */
  public native int get(int param);

+  /**
+   * Embed an ICC (International Color Consortium) color management profile in
+   * JPEG images generated by subsequent compression operations.
+   *
+   * @param iccBuf buffer containing an ICC profile.  (The size of the ICC
+   * profile is assumed to be the length of the array.)  A copy is made of the
+   * ICC profile, so this buffer can be reused as soon as this method returns.
+   * Setting this parameter to null removes any ICC profile that was previously
+   * associated with this compressor instance.
+   */
+  public native void setICCProfile(byte[] iccBuf) throws TJException;
+
  /**
   * Compress the packed-pixel or planar YUV source image associated with this
   * compressor instance and output a JPEG image to the given destination
@ -560,7 +572,9 @@ public class TJCompressor implements Closeable {
   * @param dstBuf buffer that will receive the JPEG image.  Use
   * {@link TJ#bufSize TJ.bufSize()} to determine the maximum size for this
   * buffer based on the source image's width and height and the desired level
-   * of chrominance subsampling (see {@link TJ#PARAM_SUBSAMP}.)
+   * of chrominance subsampling (see {@link TJ#PARAM_SUBSAMP}), then add the
+   * size of the ICC profile (if any) that was previously associated with this
+   * compressor instance (see {@link #setICCProfile setICCProfile()}.)
   */
  public void compress(byte[] dstBuf) throws TJException {
    if (dstBuf == null)
@ -610,7 +624,7 @@ public class TJCompressor implements Closeable {
      int subsamp = get(TJ.PARAM_SUBSAMP);
      if (get(TJ.PARAM_LOSSLESS) == 1 && subsamp != TJ.SAMP_GRAY)
        subsamp = TJ.SAMP_444;
-      buf = new byte[TJ.bufSize(srcWidth, srcHeight, subsamp)];
+      buf = new byte[TJ.bufSize(srcWidth, srcHeight, subsamp) + iccSize];
    }
    compress(buf);
    return buf;
@ -803,4 +817,5 @@ public class TJCompressor implements Closeable {
  private YUVImage srcYUVImage = null;
  private int compressedSize = 0;
  private ByteOrder byteOrder = null;
+  private int iccSize = 0;
 }
--- a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java
+++ b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java
@ -110,7 +110,11 @@ public class TJDecompressor implements Closeable {
   * when decompressing video streams in which all frames share the same
   * quantization and Huffman tables.  If a JPEG image is passed to this
   * method, then the {@link TJ#PARAM_STOPONWARNING parameters} that describe
-   * the JPEG image will be set when the method returns.
+   * the JPEG image will be set when the method returns.  If a JPEG image is
+   * passed to this method and {@link TJ#PARAM_SAVEMARKERS} is set to
+   * <code>2</code> or <code>4</code>, then the ICC profile (if any) will be
+   * extracted from the JPEG image.  ({@link #getICCProfile()} can then be used
+   * to retrieve the profile.)
   *
   * @param jpegImage buffer containing a JPEG source image or tables-only
   * datastream.  This buffer is not modified.
@ -208,6 +212,30 @@ public class TJDecompressor implements Closeable {
   */
  public native int get(int param);

+  /**
+   * Retrieve the ICC (International Color Consortium) color management profile
+   * (if any) that was previously extracted from the JPEG image associated with
+   * this decompressor instance (see {@link #setSourceImage(byte[], int)}), and
+   * return a buffer containing the ICC profile.  Once the ICC profile is
+   * retrieved, it must be re-extracted before it can be retrieved again.
+   *
+   * @return a buffer containing the ICC profile
+   */
+  public native byte[] getICCProfile() throws TJException;
+
+  /**
+   * Returns the size of the ICC profile (if any) that was previously extracted
+   * from the JPEG image associated with this decompressor instance
+   * (see {@link #setSourceImage(byte[], int)}), or 0 if there is no ICC
+   * profile to retrieve.
+   *
+   * @return the size of the ICC profile (if any) that was previously extracted
+   * from the JPEG image associated with this decompressor instance
+   * (see {@link #setSourceImage(byte[], int)}), or 0 if there is no ICC
+   * profile to retrieve.
+   */
+  public native int getICCSize();
+
  /**
   * Set the scaling factor for subsequent lossy decompression operations.
   *
--- a/java/org/libjpegturbo/turbojpeg/TJTransformer.java
+++ b/java/org/libjpegturbo/turbojpeg/TJTransformer.java
@ -70,6 +70,18 @@ public class TJTransformer extends TJDecompressor {
    setSourceImage(jpegImage, imageSize);
  }

+  /**
+   * Embed an ICC (International Color Consortium) color management profile in
+   * JPEG images generated by subsequent transform operations.
+   *
+   * @param iccBuf buffer containing an ICC profile.  (The size of the ICC
+   * profile is assumed to be the length of the array.)  A copy is made of the
+   * ICC profile, so this buffer can be reused as soon as this method returns.
+   * Setting this parameter to null removes any ICC profile that was previously
+   * associated with this transformer instance.
+   */
+  public native void setICCProfile(byte[] iccBuf) throws TJException;
+
  /**
   * Losslessly transform the JPEG source image associated with this
   * transformer instance into one or more JPEG images stored in the given
@ -90,7 +102,11 @@ public class TJTransformer extends TJDecompressor {
   * {@link TJ#bufSize TJ.bufSize()} to determine the maximum size for each
   * buffer based on the transformed or cropped width and height and the level
   * of subsampling used in the destination image (taking into account
-   * grayscale conversion and transposition of the width and height.)
+   * grayscale conversion and transposition of the width and height), then add
+   * the size of the ICC profile (if any) that was previously associated with
+   * this transformer instance (see {@link #setICCProfile setICCProfile()}) or
+   * extracted from the source image (see
+   * {@link TJDecompressor#getICCProfile()} and {@link TJ#PARAM_SAVEMARKERS}.)
   *
   * @param transforms an array of {@link TJTransform} instances, each of
   * which specifies the transform parameters and/or cropping region for the
@ -120,9 +136,11 @@ public class TJTransformer extends TJDecompressor {
    if (getWidth() < 1 || getHeight() < 1)
      throw new IllegalStateException("JPEG buffer not initialized");
    int srcSubsamp = get(TJ.PARAM_SUBSAMP);
+    int saveMarkers = get(TJ.PARAM_SAVEMARKERS);
+    int extractedICCSize = getICCSize();
    for (int i = 0; i < transforms.length; i++) {
      int w = getWidth(), h = getHeight();
-      int dstSubsamp = srcSubsamp;
+      int dstSubsamp = srcSubsamp, iccLen = iccSize;

      if ((transforms[i].options & TJTransform.OPT_GRAY) != 0)
        dstSubsamp = TJ.SAMP_GRAY;
@ -145,7 +163,10 @@ public class TJTransformer extends TJDecompressor {
        if (transforms[i].width != 0) w = transforms[i].width;
        if (transforms[i].height != 0) h = transforms[i].height;
      }
-      dstBufs[i] = new byte[TJ.bufSize(w, h, dstSubsamp)];
+      if ((saveMarkers == 2 || saveMarkers == 4) &&
+          (transforms[i].options & TJTransform.OPT_COPYNONE) == 0)
+        iccLen = extractedICCSize;
+      dstBufs[i] = new byte[TJ.bufSize(w, h, dstSubsamp) + iccLen];
    }
    TJDecompressor[] tjd = new TJDecompressor[transforms.length];
    transform(dstBufs, transforms);
@ -177,4 +198,5 @@ public class TJTransformer extends TJDecompressor {
  }

  private int[] transformedSizes = null;
+  private int iccSize = 0;
 }
--- a/java/org_libjpegturbo_turbojpeg_TJ.h
+++ b/java/org_libjpegturbo_turbojpeg_TJ.h
@ -113,6 +113,8 @@ extern "C" {
 #define org_libjpegturbo_turbojpeg_TJ_PARAM_MAXMEMORY 23L
 #undef org_libjpegturbo_turbojpeg_TJ_PARAM_MAXPIXELS
 #define org_libjpegturbo_turbojpeg_TJ_PARAM_MAXPIXELS 24L
+#undef org_libjpegturbo_turbojpeg_TJ_PARAM_SAVEMARKERS
+#define org_libjpegturbo_turbojpeg_TJ_PARAM_SAVEMARKERS 25L
 #undef org_libjpegturbo_turbojpeg_TJ_NUMERR
 #define org_libjpegturbo_turbojpeg_TJ_NUMERR 2L
 #undef org_libjpegturbo_turbojpeg_TJ_ERR_WARNING
--- a/java/org_libjpegturbo_turbojpeg_TJCompressor.h
+++ b/java/org_libjpegturbo_turbojpeg_TJCompressor.h
@ -23,6 +23,14 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_set
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_get
  (JNIEnv *, jobject, jint);

+/*
+ * Class:     org_libjpegturbo_turbojpeg_TJCompressor
+ * Method:    setICCProfile
+ * Signature: ([B)V
+ */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_setICCProfile
+  (JNIEnv *, jobject, jbyteArray);
+
 /*
 * Class:     org_libjpegturbo_turbojpeg_TJCompressor
 * Method:    init
--- a/java/org_libjpegturbo_turbojpeg_TJDecompressor.h
+++ b/java/org_libjpegturbo_turbojpeg_TJDecompressor.h
@ -23,6 +23,22 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_set
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_get
  (JNIEnv *, jobject, jint);

+/*
+ * Class:     org_libjpegturbo_turbojpeg_TJDecompressor
+ * Method:    getICCProfile
+ * Signature: ()[B
+ */
+JNIEXPORT jbyteArray JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_getICCProfile
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_libjpegturbo_turbojpeg_TJDecompressor
+ * Method:    getICCSize
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_getICCSize
+  (JNIEnv *, jobject);
+
 /*
 * Class:     org_libjpegturbo_turbojpeg_TJDecompressor
 * Method:    init
--- a/java/org_libjpegturbo_turbojpeg_TJTransformer.h
+++ b/java/org_libjpegturbo_turbojpeg_TJTransformer.h
@ -7,6 +7,14 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+/*
+ * Class:     org_libjpegturbo_turbojpeg_TJTransformer
+ * Method:    setICCProfile
+ * Signature: ([B)V
+ */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_setICCProfile
+  (JNIEnv *, jobject, jbyteArray);
+
 /*
 * Class:     org_libjpegturbo_turbojpeg_TJTransformer
 * Method:    init
--- a/java/turbojpeg-jni.c
+++ b/java/turbojpeg-jni.c
@ -179,7 +179,7 @@ bailout:
  return;
 }

-/* TurboJPEG 3: TJCompressor.set() */
+/* TurboJPEG 3.0.x: TJCompressor.set() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_set
  (JNIEnv *env, jobject obj, jint param, jint value)
 {
@ -194,7 +194,7 @@ bailout:
  return;
 }

-/* TurboJPEG 3: TJCompressor.get() */
+/* TurboJPEG 3.0.x: TJCompressor.get() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_get
  (JNIEnv *env, jobject obj, jint param)
 {
@ -208,6 +208,38 @@ bailout:
  return -1;
 }

+/* TurboJPEG 3.1.x: TJCompressor.setICCProfile() */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_setICCProfile
+  (JNIEnv *env, jobject obj, jbyteArray icc)
+{
+  jclass cls;
+  jfieldID fid;
+  tjhandle handle = 0;
+  unsigned char *iccBuf = NULL;
+  size_t iccSize = 0;
+
+  GET_HANDLE();
+
+  if (icc != NULL) {
+    BAILIF0NOEC(iccBuf = (*env)->GetPrimitiveArrayCritical(env, icc, 0));
+    iccSize = (size_t)(*env)->GetArrayLength(env, icc);
+  }
+
+  BAILIF0(cls = (*env)->GetObjectClass(env, obj));
+  BAILIF0(fid = (*env)->GetFieldID(env, cls, "iccSize", "I"));
+
+  if (tj3SetICCProfile(handle, iccBuf, iccSize) == -1) {
+    (*env)->SetIntField(env, obj, fid, 0);
+    SAFE_RELEASE(icc, iccBuf);
+    THROW_TJ();
+  }
+
+  (*env)->SetIntField(env, obj, fid, (int)iccSize);
+
+bailout:
+  SAFE_RELEASE(icc, iccBuf);
+}
+
 static jint TJCompressor_compress
  (JNIEnv *env, jobject obj, jarray src, jint srcElementSize, jint precision,
   jint x, jint y, jint width, jint pitch, jint height, jint pf,
@ -277,7 +309,7 @@ bailout:
  return (jint)jpegSize;
 }

-/* TurboJPEG 3: TJCompressor.compress8() byte source */
+/* TurboJPEG 3.0.x: TJCompressor.compress8() byte source */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress8___3BIIIIII_3B
  (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
   jint pitch, jint height, jint pf, jbyteArray dst)
@ -286,7 +318,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress8___
                               pf, dst);
 }

-/* TurboJPEG 3: TJCompressor.compress12() */
+/* TurboJPEG 3.0.x: TJCompressor.compress12() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress12
  (JNIEnv *env, jobject obj, jshortArray src, jint x, jint y, jint width,
   jint pitch, jint height, jint pf, jbyteArray dst)
@ -295,7 +327,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress12
                               height, pf, dst);
 }

-/* TurboJPEG 3: TJCompressor.compress16() */
+/* TurboJPEG 3.0.x: TJCompressor.compress16() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress16
  (JNIEnv *env, jobject obj, jshortArray src, jint x, jint y, jint width,
   jint pitch, jint height, jint pf, jbyteArray dst)
@ -304,7 +336,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress16
                               height, pf, dst);
 }

-/* TurboJPEG 3: TJCompressor.compress8() int source */
+/* TurboJPEG 3.0.x: TJCompressor.compress8() int source */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress8___3IIIIIII_3B
  (JNIEnv *env, jobject obj, jintArray src, jint x, jint y, jint width,
   jint stride, jint height, jint pf, jbyteArray dst)
@ -321,7 +353,7 @@ bailout:
  return 0;
 }

-/* TurboJPEG 3: TJCompressor.compressFromYUV8() */
+/* TurboJPEG 3.0.x: TJCompressor.compressFromYUV8() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compressFromYUV8
  (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
   jint width, jintArray jSrcStrides, jint height, jbyteArray dst)
@ -499,7 +531,7 @@ bailout:
    SAFE_RELEASE(jDstPlanes[i], dstPlanesTmp[i]);
 }

-/* TurboJPEG 3: TJCompressor.encodeYUV8() byte source */
+/* TurboJPEG 3.0.x: TJCompressor.encodeYUV8() byte source */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8___3BIIIIII_3_3B_3I_3I
  (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
   jint pitch, jint height, jint pf, jobjectArray dstobjs,
@ -509,7 +541,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8__
                          dstobjs, jDstOffsets, jDstStrides);
 }

-/* TurboJPEG 3: TJCompressor.encodeYUV8() int source */
+/* TurboJPEG 3.0.x: TJCompressor.encodeYUV8() int source */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8___3IIIIIII_3_3B_3I_3I
  (JNIEnv *env, jobject obj, jintArray src, jint x, jint y, jint width,
   jint stride, jint height, jint pf, jobjectArray dstobjs,
@ -562,14 +594,14 @@ bailout:
  return;
 }

-/* TurboJPEG 3: TJDecompressor.set() */
+/* TurboJPEG 3.0.x: TJDecompressor.set() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_set
  (JNIEnv *env, jobject obj, jint param, jint value)
 {
  Java_org_libjpegturbo_turbojpeg_TJCompressor_set(env, obj, param, value);
 }

-/* TurboJPEG 3: TJDecompressor.get() */
+/* TurboJPEG 3.0.x: TJDecompressor.get() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_get
  (JNIEnv *env, jobject obj, jint param)
 {
@ -630,7 +662,46 @@ bailout:
  SAFE_RELEASE(src, jpegBuf);
 }

-/* TurboJPEG 3: TJDecompressor.setCroppingRegion() */
+/* TurboJPEG 3.1.x: TJDecompressor.getICCProfile() */
+JNIEXPORT jbyteArray JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_getICCProfile
+  (JNIEnv *env, jobject obj)
+{
+  tjhandle handle = 0;
+  unsigned char *iccBuf = NULL, *jICCBuf = NULL;
+  size_t iccSize = 0;
+  jbyteArray icc = NULL;
+
+  GET_HANDLE();
+
+  if (tj3GetICCProfile(handle, &iccBuf, &iccSize) == -1)
+    THROW_TJ();
+
+  BAILIF0(icc = (*env)->NewByteArray(env, iccSize));
+  BAILIF0NOEC(jICCBuf = (*env)->GetPrimitiveArrayCritical(env, icc, 0));
+  memcpy(jICCBuf, iccBuf, iccSize);
+
+bailout:
+  SAFE_RELEASE(icc, jICCBuf);
+  tj3Free(iccBuf);
+  return icc;
+}
+
+/* TurboJPEG 3.1.x: TJDecompressor.getICCSize() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_getICCSize
+  (JNIEnv *env, jobject obj)
+{
+  tjhandle handle = 0;
+  size_t iccSize = 0;
+
+  GET_HANDLE();
+
+  tj3GetICCProfile(handle, NULL, &iccSize);
+
+bailout:
+  return iccSize;
+}
+
+/* TurboJPEG 3.0.x: TJDecompressor.setCroppingRegion() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_setCroppingRegion
  (JNIEnv *env, jobject obj)
 {
@ -780,7 +851,7 @@ bailout:
  SAFE_RELEASE(src, jpegBuf);
 }

-/* TurboJPEG 3: TJDecompressor.decompress8() byte destination */
+/* TurboJPEG 3.0.x: TJDecompressor.decompress8() byte destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress8___3BI_3BIIII
  (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jbyteArray dst,
   jint x, jint y, jint pitch, jint pf)
@ -789,7 +860,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
                            pf);
 }

-/* TurboJPEG 3: TJDecompressor.decompress12() */
+/* TurboJPEG 3.0.x: TJDecompressor.decompress12() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress12
  (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jshortArray dst,
   jint x, jint y, jint pitch, jint pf)
@ -798,7 +869,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
                            pf);
 }

-/* TurboJPEG 3: TJDecompressor.decompress16() */
+/* TurboJPEG 3.0.x: TJDecompressor.decompress16() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress16
  (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jshortArray dst,
   jint x, jint y, jint pitch, jint pf)
@ -807,7 +878,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
                            pf);
 }

-/* TurboJPEG 3: TJDecompressor.decompress8() int destination */
+/* TurboJPEG 3.0.x: TJDecompressor.decompress8() int destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress8___3BI_3IIIII
  (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jintArray dst,
   jint x, jint y, jint stride, jint pf)
@ -824,7 +895,7 @@ bailout:
  return;
 }

-/* TurboJPEG 3: TJDecompressor.decompressToYUV8() */
+/* TurboJPEG 3.0.x: TJDecompressor.decompressToYUV8() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV8
  (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize,
   jobjectArray dstobjs, jintArray jDstOffsets, jintArray jDstStrides)
@ -1012,7 +1083,7 @@ bailout:
    SAFE_RELEASE(jSrcPlanes[i], srcPlanesTmp[i]);
 }

-/* TurboJPEG 3: TJDecompressor.decodeYUV8() byte destination */
+/* TurboJPEG 3.0.x: TJDecompressor.decodeYUV8() byte destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8___3_3B_3I_3I_3BIIIIII
  (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
   jintArray jSrcStrides, jbyteArray dst, jint x, jint y, jint width,
@ -1022,7 +1093,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8
                            1, x, y, width, pitch, height, pf);
 }

-/* TurboJPEG 3: TJDecompressor.decodeYUV8() int destination */
+/* TurboJPEG 3.0.x: TJDecompressor.decodeYUV8() int destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8___3_3B_3I_3I_3IIIIIII
  (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
   jintArray jSrcStrides, jintArray dst, jint x, jint y, jint width,
@ -1060,6 +1131,13 @@ bailout:
  return;
 }

+/* TurboJPEG 3.1.x: TJTransformer.setICCProfile() */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_setICCProfile
+  (JNIEnv *env, jobject obj, jbyteArray icc)
+{
+  Java_org_libjpegturbo_turbojpeg_TJCompressor_setICCProfile(env, obj, icc);
+}
+
 typedef struct _JNICustomFilterParams {
  JNIEnv *env;
  jobject tobj;
--- a/src/tjbench.c
+++ b/src/tjbench.c
@ -637,10 +637,12 @@ static int decompTest(char *fileName)
  FILE *file = NULL;
  tjhandle handle = NULL;
  unsigned char **jpegBufs = NULL, *srcBuf = NULL;
-  size_t *jpegBufSizes = NULL, *jpegSizes = NULL, srcSize, totalJpegSize;
+  size_t iccSize = 0, *jpegBufSizes = NULL, *jpegSizes = NULL, srcSize,
+    totalJpegSize;
  tjtransform *t = NULL;
  double start, elapsed;
-  int ps = tjPixelSize[pf], tile, row, col, i, iter, retval = 0, decompsrc = 0;
+  int ps = tjPixelSize[pf], tile, row, col, i, iter, retval = 0, decompsrc = 0,
+    doTransform = 0;
  char *temp = NULL, tempStr[80], tempStr2[80];
  /* Original image */
  int w = 0, h = 0, minTile = 16, tilew, tileh, ntilesw = 1, ntilesh = 1,
@ -648,6 +650,9 @@ static int decompTest(char *fileName)
  /* Transformed image */
  int tw, th, ttilew, ttileh, tntilesw, tntilesh, tsubsamp;

+  if (doTile || xformOp != TJXOP_NONE || xformOpt != 0 || customFilter)
+    doTransform = 1;
+
  if ((file = fopen(fileName, "rb")) == NULL)
    THROW_UNIX("opening file");
  if (fseek(file, 0, SEEK_END) < 0 ||
@ -697,6 +702,8 @@ static int decompTest(char *fileName)
    printf("JPEG image is progressive\n\n");
  if (tj3Get(handle, TJPARAM_ARITHMETIC) == 1)
    printf("JPEG image uses arithmetic entropy coding\n\n");
+  if (!(xformOpt & TJXOPT_COPYNONE))
+    tj3GetICCProfile(handle, NULL, &iccSize);
  if (tj3Set(handle, TJPARAM_PROGRESSIVE, progressive) == -1)
    THROW_TJ();
  if (tj3Set(handle, TJPARAM_ARITHMETIC, arithmetic) == -1)
@ -762,8 +769,7 @@ static int decompTest(char *fileName)
      else if (tsubsamp == TJSAMP_441) tsubsamp = TJSAMP_411;
    }

-    if (noRealloc &&
-        (doTile || xformOp != TJXOP_NONE || xformOpt != 0 || customFilter)) {
+    if (noRealloc && doTransform) {
      if ((jpegBufSizes = (size_t *)malloc(sizeof(size_t) * ntilesw *
                                           ntilesh)) == NULL)
        THROW_UNIX("allocating JPEG buffer size array");
@ -781,7 +787,7 @@ static int decompTest(char *fileName)
      printf("%-5d  %-5d   ", CROPPED_WIDTH(tilew), CROPPED_HEIGHT(tileh));
    }

-    if (doTile || xformOp != TJXOP_NONE || xformOpt != 0 || customFilter) {
+    if (doTransform) {
      if ((t = (tjtransform *)malloc(sizeof(tjtransform) * ntilesw *
                                     ntilesh)) == NULL)
        THROW_UNIX("allocating image transform array");
@ -818,6 +824,7 @@ static int decompTest(char *fileName)
              tj3JPEGBufSize(t[tile].r.w, t[tile].r.h, tsubsamp);
            if (jpegBufSize == 0)
              THROW_TJG();
+            jpegBufSize += iccSize;
            if ((jpegBufs[tile] = tj3Alloc(jpegBufSize)) == NULL)
              THROW_UNIX("allocating JPEG tiles");
            jpegBufSizes[tile] = jpegBufSize;
--- a/src/tjcomp.c
+++ b/src/tjcomp.c
@ -35,7 +35,6 @@
 * - GIF and Targa input file formats [legacy feature]
 * - Separate quality settings for luminance and chrominance
 * - The floating-point DCT method [legacy feature]
- * - Embedding an ICC color management profile
 * - Input image smoothing
 * - Progress reporting
 * - Debug output
@ -97,6 +96,9 @@ static void usage(char *programName)

  printf("GENERAL OPTIONS (CAN BE ABBREVIATED)\n");
  printf("------------------------------------\n");
+  printf("-icc FILE\n");
+  printf("    Embed the ICC (International Color Consortium) color management profile\n");
+  printf("    from the specified file into the JPEG image\n");
  printf("-lossless PSV[,Pt]\n");
  printf("    Create a lossless JPEG image (implies -subsamp 444) using predictor\n");
  printf("    selection value PSV (1-7) and optional point transform Pt (0 through\n");
@ -152,12 +154,14 @@ int main(int argc, char **argv)
    precision = -1, progressive = -1, quality = DEFAULT_QUALITY,
    restartIntervalBlocks = -1, restartIntervalRows = -1,
    subsamp = DEFAULT_SUBSAMP;
+  char *iccFilename = NULL;
  tjhandle tjInstance = NULL;
  void *srcBuf = NULL;
  int width, height;
-  unsigned char *jpegBuf = NULL;
-  size_t jpegSize = 0;
-  FILE *jpegFile = NULL;
+  long size;
+  unsigned char *iccBuf = NULL, *jpegBuf = NULL;
+  size_t iccSize = 0, jpegSize = 0;
+  FILE *iccFile = NULL, *jpegFile = NULL;

  for (i = 1; i < argc; i++) {
    if (MATCH_ARG(argv[i], "-arithmetic", 2))
@ -171,6 +175,8 @@ int main(int argc, char **argv)
    } else if (MATCH_ARG(argv[i], "-grayscale", 2) ||
               MATCH_ARG(argv[i], "-greyscale", 2))
      colorspace = TJCS_GRAY;
+    else if (MATCH_ARG(argv[i], "-icc", 2) && i < argc - 1)
+      iccFilename = argv[++i];
    else if (MATCH_ARG(argv[i], "-lossless", 2) && i < argc - 1) {
      if (sscanf(argv[++i], "%d,%d", &losslessPSV, &losslessPt) < 1 ||
          losslessPSV < 1 || losslessPSV > 7)
@ -293,6 +299,25 @@ int main(int argc, char **argv)
      tj3Set(tjInstance, TJPARAM_COLORSPACE, colorspace) < 0)
    THROW_TJ("setting TJPARAM_COLORSPACE");

+  if (iccFilename) {
+    if ((iccFile = fopen(iccFilename, "rb")) == NULL)
+      THROW_UNIX("opening ICC profile");
+    if (fseek(iccFile, 0, SEEK_END) < 0 || ((size = ftell(iccFile)) < 0) ||
+        fseek(iccFile, 0, SEEK_SET) < 0)
+      THROW_UNIX("determining ICC profile size");
+    if (size == 0)
+      THROW("determining ICC profile size", "ICC profile contains no data");
+    iccSize = size;
+    if ((iccBuf = (unsigned char *)malloc(iccSize)) == NULL)
+      THROW_UNIX("allocating ICC profile buffer");
+    if (fread(iccBuf, iccSize, 1, iccFile) < 1)
+      THROW_UNIX("reading ICC profile");
+    fclose(iccFile);  iccFile = NULL;
+    if (tj3SetICCProfile(tjInstance, iccBuf, iccSize) < 0)
+      THROW_TJ("setting ICC profile");
+    free(iccBuf);  iccBuf = NULL;
+  }
+
  if (precision <= 8) {
    if (tj3Compress8(tjInstance, srcBuf, width, 0, height, pixelFormat,
                     &jpegBuf, &jpegSize) < 0)
@ -315,6 +340,8 @@ int main(int argc, char **argv)
 bailout:
  tj3Destroy(tjInstance);
  tj3Free(srcBuf);
+  if (iccFile) fclose(iccFile);
+  free(iccBuf);
  tj3Free(jpegBuf);
  if (jpegFile) fclose(jpegFile);
  return retval;
--- a/src/tjdecomp.c
+++ b/src/tjdecomp.c
@ -102,6 +102,9 @@ static void usage(char *programName)

  printf("GENERAL OPTIONS (CAN BE ABBREVBIATED)\n");
  printf("-------------------------------------\n");
+  printf("-icc FILE\n");
+  printf("    Extract the ICC (International Color Consortium) color profile from the\n");
+  printf("    JPEG image to the specified file\n");
  printf("-strict\n");
  printf("    Treat all warnings as fatal; abort immediately if incomplete or corrupt\n");
  printf("    data is encountered in the JPEG image, rather than trying to salvage the\n");
@ -159,12 +162,13 @@ int main(int argc, char **argv)
    subsamp;
  tjregion croppingRegion = TJUNCROPPED;
  tjscalingfactor scalingFactor = TJUNSCALED;
+  char *iccFilename = NULL;
  tjhandle tjInstance = NULL;
-  FILE *jpegFile = NULL;
+  FILE *jpegFile = NULL, *iccFile = NULL;
  long size = 0;
-  size_t jpegSize, sampleSize;
+  size_t jpegSize, sampleSize, iccSize;
  int width, height;
-  unsigned char *jpegBuf = NULL;
+  unsigned char *jpegBuf = NULL, *iccBuf = NULL;
  void *dstBuf = NULL;

  if ((scalingFactors = tj3GetScalingFactors(&numScalingFactors)) == NULL)
@ -190,6 +194,8 @@ int main(int argc, char **argv)
    } else if (MATCH_ARG(argv[i], "-grayscale", 2) ||
               MATCH_ARG(argv[i], "-greyscale", 2))
      pixelFormat = TJPF_GRAY;
+    else if (MATCH_ARG(argv[i], "-icc", 2) && i < argc - 1)
+      iccFilename = argv[++i];
    else if (MATCH_ARG(argv[i], "-maxscans", 5) && i < argc - 1) {
      int tempi = atoi(argv[++i]);

@ -268,6 +274,19 @@ int main(int argc, char **argv)
  sampleSize = (precision <= 8 ? sizeof(unsigned char) : sizeof(short));
  colorspace = tj3Get(tjInstance, TJPARAM_COLORSPACE);

+  if (iccFilename) {
+    if (tj3GetICCProfile(tjInstance, &iccBuf, &iccSize) < 0) {
+      THROW_TJ("getting ICC profile");
+    } else {
+      if ((iccFile = fopen(iccFilename, "wb")) == NULL)
+        THROW_UNIX("opening ICC file");
+      if (fwrite(iccBuf, iccSize, 1, iccFile) < 1)
+        THROW_UNIX("writing ICC profile");
+      tj3Free(iccBuf);  iccBuf = NULL;
+      fclose(iccFile);  iccFile = NULL;
+    }
+  }
+
  if (pixelFormat == TJPF_UNKNOWN) {
    if (colorspace == TJCS_GRAY)
      pixelFormat = TJPF_GRAY;
@ -343,6 +362,8 @@ bailout:
  tj3Destroy(tjInstance);
  if (jpegFile) fclose(jpegFile);
  tj3Free(jpegBuf);
+  tj3Free(iccBuf);
+  if (iccFile) fclose(iccFile);
  free(dstBuf);
  return retval;
 }
--- a/src/tjtran.c
+++ b/src/tjtran.c
@ -103,9 +103,15 @@ static void usage(char *programName)
  printf("    entropy coding (can be combined with -progressive)\n");
  printf("-copy all\n");
  printf("    Copy all extra markers (including comments, JFIF thumbnails, Exif data, and\n");
-  printf("    ICC profile data) from the input image to the output image [default]\n");
+  printf("    ICC profile data) from the input image to the output image\n");
+  printf("-copy comments\n");
+  printf("    Do not copy any extra markers, except comment markers, from the input\n");
+  printf("    image to the output image [default]\n");
+  printf("-copy icc\n");
+  printf("    Do not copy any extra markers, except ICC profile data, from the input\n");
+  printf("    image to the output image\n");
  printf("-copy none\n");
-  printf("    Copy no extra markers from the input image to the output image\n");
+  printf("    Do not copy any extra markers from the input image to the output image\n");
  printf("-crop WxH+X+Y\n");
  printf("    Include only the specified region of the input image.  (W, H, X, and Y are\n");
  printf("    the width, height, left boundary, and upper boundary of the region, all\n");
@ -117,6 +123,9 @@ static void usage(char *programName)
  printf("    mutually exclusive)\n");
  printf("-grayscale\n");
  printf("    Create a grayscale output image from a full-color input image\n");
+  printf("-icc FILE\n");
+  printf("    Embed the ICC (International Color Consortium) color management profile\n");
+  printf("    from the specified file into the output image\n");
  printf("-maxmemory N\n");
  printf("    Memory limit (in megabytes) for intermediate buffers used with progressive\n");
  printf("    JPEG compression, Huffman table optimization, and lossless transformation\n");
@ -155,13 +164,14 @@ int main(int argc, char **argv)
  int i, retval = 0;
  int arithmetic = 0, maxMemory = -1, maxScans = -1, optimize = -1,
    progressive = 0, restartIntervalBlocks = -1, restartIntervalRows = -1,
-    stopOnWarning = -1, subsamp;
+    saveMarkers = 1, stopOnWarning = -1, subsamp;
  tjtransform xform;
+  char *iccFilename = NULL;
  tjhandle tjInstance = NULL;
-  FILE *jpegFile = NULL;
+  FILE *iccFile = NULL, *jpegFile = NULL;
  long size = 0;
-  size_t srcSize, dstSize;
-  unsigned char *srcBuf = NULL, *dstBuf = NULL;
+  size_t srcSize, iccSize, dstSize;
+  unsigned char *srcBuf = NULL, *iccBuf = NULL, *dstBuf = NULL;

  memset(&xform, 0, sizeof(tjtransform));

@ -179,9 +189,13 @@ int main(int argc, char **argv)
      xform.options |= TJXOPT_CROP;
    } else if (MATCH_ARG(argv[i], "-copy", 2) && i < argc - 1) {
      i++;
-      if (MATCH_ARG(argv[i], "none", 1))
-        xform.options |= TJXOPT_COPYNONE;
-      else if (!MATCH_ARG(argv[i], "all", 1))
+      if (MATCH_ARG(argv[i], "all", 1))
+        saveMarkers = 2;
+      else if (MATCH_ARG(argv[i], "icc", 1))
+        saveMarkers = 4;
+      else if (MATCH_ARG(argv[i], "none", 1))
+        saveMarkers = 0;
+      else if (!MATCH_ARG(argv[i], "comments", 1))
        usage(argv[0]);
    } else if (MATCH_ARG(argv[i], "-flip", 2) && i < argc - 1) {
      i++;
@ -194,6 +208,8 @@ int main(int argc, char **argv)
    } else if (MATCH_ARG(argv[i], "-grayscale", 2) ||
               MATCH_ARG(argv[i], "-greyscale", 2))
      xform.options |= TJXOPT_GRAY;
+    else if (MATCH_ARG(argv[i], "-icc", 2) && i < argc - 1)
+      iccFilename = argv[++i];
    else if (MATCH_ARG(argv[i], "-maxscans", 5) && i < argc - 1) {
      int tempi = atoi(argv[++i]);

@ -247,6 +263,11 @@ int main(int argc, char **argv)
  if (i != argc - 2)
    usage(argv[0]);

+  if (iccFilename) {
+    if (saveMarkers == 2) saveMarkers = 3;
+    else if (saveMarkers == 4) saveMarkers = 0;
+  }
+
  if ((tjInstance = tj3Init(TJINIT_TRANSFORM)) == NULL)
    THROW_TJ("creating TurboJPEG instance");

@ -265,6 +286,8 @@ int main(int argc, char **argv)
    THROW_TJ("setting TJPARAM_RESTARTROWS");
  if (maxMemory >= 0 && tj3Set(tjInstance, TJPARAM_MAXMEMORY, maxMemory) < 0)
    THROW_TJ("setting TJPARAM_MAXMEMORY");
+  if (tj3Set(tjInstance, TJPARAM_SAVEMARKERS, saveMarkers) < 0)
+    THROW_TJ("setting TJPARAM_SAVEMARKERS");

  if ((jpegFile = fopen(argv[i++], "rb")) == NULL)
    THROW_UNIX("opening input file");
@ -312,6 +335,25 @@ int main(int argc, char **argv)
    xform.r.h += yAdjust;
  }

+  if (iccFilename) {
+    if ((iccFile = fopen(iccFilename, "rb")) == NULL)
+      THROW_UNIX("opening ICC profile");
+    if (fseek(iccFile, 0, SEEK_END) < 0 || ((size = ftell(iccFile)) < 0) ||
+        fseek(iccFile, 0, SEEK_SET) < 0)
+      THROW_UNIX("determining ICC profile size");
+    if (size == 0)
+      THROW("determining ICC profile size", "ICC profile contains no data");
+    iccSize = size;
+    if ((iccBuf = (unsigned char *)malloc(iccSize)) == NULL)
+      THROW_UNIX("allocating ICC profile buffer");
+    if (fread(iccBuf, iccSize, 1, iccFile) < 1)
+      THROW_UNIX("reading ICC profile");
+    fclose(iccFile);  iccFile = NULL;
+    if (tj3SetICCProfile(tjInstance, iccBuf, iccSize) < 0)
+      THROW_TJ("setting ICC profile");
+    free(iccBuf);  iccBuf = NULL;
+  }
+
  if (tj3Transform(tjInstance, srcBuf, srcSize, 1, &dstBuf, &dstSize,
                   &xform) < 0)
    THROW_TJ("transforming input image");
@ -325,6 +367,8 @@ int main(int argc, char **argv)
 bailout:
  tj3Destroy(tjInstance);
  tj3Free(srcBuf);
+  if (iccFile) fclose(iccFile);
+  free(iccBuf);
  if (jpegFile) fclose(jpegFile);
  tj3Free(dstBuf);
  return retval;
--- a/src/turbojpeg-mapfile
+++ b/src/turbojpeg-mapfile
@ -106,3 +106,9 @@ TURBOJPEG_3
    tj3YUVPlaneSize;
    tj3YUVPlaneWidth;
 } TURBOJPEG_2.0;
+
+TURBOJPEG_3.1
+{
+    tj3GetICCProfile;
+    tj3SetICCProfile;
+} TURBOJPEG_3;
--- a/src/turbojpeg-mapfile.jni
+++ b/src/turbojpeg-mapfile.jni
@ -126,7 +126,6 @@ TURBOJPEG_3
    Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8___3BIIIIII_3_3B_3I_3I;
    Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8___3IIIIIII_3_3B_3I_3I;
    Java_org_libjpegturbo_turbojpeg_TJCompressor_get;
-    Java_org_libjpegturbo_turbojpeg_TJCompressor_loadSourceImage;
    Java_org_libjpegturbo_turbojpeg_TJCompressor_set;
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8___3_3B_3I_3I_3BIIIIII;
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8___3_3B_3I_3I_3IIIIIII;
@ -136,7 +135,18 @@ TURBOJPEG_3
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress16;
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV8;
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_get;
-    Java_org_libjpegturbo_turbojpeg_TJDecompressor_saveImage;
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_set;
    Java_org_libjpegturbo_turbojpeg_TJDecompressor_setCroppingRegion;
 } TURBOJPEG_2.0;
+
+TURBOJPEG_3.1
+{
+    tj3GetICCProfile;
+    tj3SetICCProfile;
+    Java_org_libjpegturbo_turbojpeg_TJCompressor_loadSourceImage;
+    Java_org_libjpegturbo_turbojpeg_TJCompressor_setICCProfile;
+    Java_org_libjpegturbo_turbojpeg_TJDecompressor_getICCProfile;
+    Java_org_libjpegturbo_turbojpeg_TJDecompressor_getICCSize;
+    Java_org_libjpegturbo_turbojpeg_TJDecompressor_saveImage;
+    Java_org_libjpegturbo_turbojpeg_TJTransformer_setICCProfile;
+} TURBOJPEG_3;
--- a/src/turbojpeg-mp.c
+++ b/src/turbojpeg-mp.c
@ -67,7 +67,7 @@

 /******************************** Compressor *********************************/

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int GET_NAME(tj3Compress, BITS_IN_JSAMPLE)
  (tjhandle handle, const _JSAMPLE *srcBuf, int width, int pitch, int height,
   int pixelFormat, unsigned char **jpegBuf, size_t *jpegSize)
@ -118,6 +118,8 @@ DLLEXPORT int GET_NAME(tj3Compress, BITS_IN_JSAMPLE)
  jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc);

  jpeg_start_compress(cinfo, TRUE);
+  if (this->iccBuf != NULL && this->iccSize != 0)
+    jpeg_write_icc_profile(cinfo, this->iccBuf, (unsigned int)this->iccSize);
  for (i = 0; i < height; i++) {
    if (this->bottomUp)
      row_pointer[i] = (_JSAMPROW)&srcBuf[(height - i - 1) * (size_t)pitch];
@ -142,7 +144,7 @@ bailout:

 /******************************* Decompressor ********************************/

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int GET_NAME(tj3Decompress, BITS_IN_JSAMPLE)
  (tjhandle handle, const unsigned char *jpegBuf, size_t jpegSize,
   _JSAMPLE *dstBuf, int pitch, int pixelFormat)
@ -287,7 +289,7 @@ bailout:

 /*************************** Packed-Pixel Image I/O **************************/

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT _JSAMPLE *GET_NAME(tj3LoadImage, BITS_IN_JSAMPLE)
  (tjhandle handle, const char *filename, int *width, int align, int *height,
   int *pixelFormat)
@ -436,7 +438,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int GET_NAME(tj3SaveImage, BITS_IN_JSAMPLE)
  (tjhandle handle, const char *filename, const _JSAMPLE *buffer, int width,
   int pitch, int height, int pixelFormat)
--- a/src/turbojpeg.c
+++ b/src/turbojpeg.c
@ -138,6 +138,9 @@ typedef struct _tjinstance {
  tjregion croppingRegion;
  int maxMemory;
  int maxPixels;
+  int saveMarkers;
+  unsigned char *iccBuf, *tempICCBuf;
+  size_t iccSize, tempICCSize;
 } tjinstance;

 static tjhandle _tjInitCompress(tjinstance *this);
@ -532,7 +535,7 @@ static void processFlags(tjhandle handle, int flags, int operation)

 /*************************** General API functions ***************************/

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT tjhandle tj3Init(int initType)
 {
  static const char FUNCTION_NAME[] = "tj3Init";
@ -557,6 +560,7 @@ DLLEXPORT tjhandle tj3Init(int initType)
  this->xDensity = 1;
  this->yDensity = 1;
  this->scalingFactor = TJUNSCALED;
+  this->saveMarkers = 2;

  switch (initType) {
  case TJINIT_COMPRESS:  return _tjInitCompress(this);
@ -573,7 +577,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT void tj3Destroy(tjhandle handle)
 {
  tjinstance *this = (tjinstance *)handle;
@ -589,6 +593,8 @@ DLLEXPORT void tj3Destroy(tjhandle handle)
  if (setjmp(this->jerr.setjmp_buffer)) return;
  if (this->init & COMPRESS) jpeg_destroy_compress(cinfo);
  if (this->init & DECOMPRESS) jpeg_destroy_decompress(dinfo);
+  free(this->iccBuf);
+  free(this->tempICCBuf);
  free(this);
 }

@ -609,7 +615,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT char *tj3GetErrorStr(tjhandle handle)
 {
  tjinstance *this = (tjinstance *)handle;
@ -634,7 +640,7 @@ DLLEXPORT char *tjGetErrorStr(void)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3GetErrorCode(tjhandle handle)
 {
  tjinstance *this = (tjinstance *)handle;
@ -662,7 +668,7 @@ DLLEXPORT int tjGetErrorCode(tjhandle handle)
  this->field = (boolean)value; \
 }

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3Set(tjhandle handle, int param, int value)
 {
  static const char FUNCTION_NAME[] = "tj3Set";
@ -784,6 +790,11 @@ DLLEXPORT int tj3Set(tjhandle handle, int param, int value)
  case TJPARAM_MAXPIXELS:
    SET_PARAM(maxPixels, 0, -1);
    break;
+  case TJPARAM_SAVEMARKERS:
+    if (!(this->init & DECOMPRESS))
+      THROW("TJPARAM_SAVEMARKERS is not applicable to compression instances.");
+    SET_PARAM(saveMarkers, 0, 4);
+    break;
  default:
    THROW("Invalid parameter");
  }
@ -793,7 +804,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3Get(tjhandle handle, int param)
 {
  tjinstance *this = (tjinstance *)handle;
@ -850,6 +861,8 @@ DLLEXPORT int tj3Get(tjhandle handle, int param)
    return this->maxMemory;
  case TJPARAM_MAXPIXELS:
    return this->maxPixels;
+  case TJPARAM_SAVEMARKERS:
+    return this->saveMarkers;
  }

  return -1;
@ -861,7 +874,7 @@ DLLEXPORT int tj3Get(tjhandle handle, int param)
   with turbojpeg.dll for compatibility reasons.  However, these functions
   can potentially be used for other purposes by different implementations. */

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT void *tj3Alloc(size_t bytes)
 {
  return MALLOC(bytes);
@ -874,7 +887,7 @@ DLLEXPORT unsigned char *tjAlloc(int bytes)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT void tj3Free(void *buf)
 {
  free(buf);
@ -887,7 +900,7 @@ DLLEXPORT void tjFree(unsigned char *buf)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT size_t tj3JPEGBufSize(int width, int height, int jpegSubsamp)
 {
  static const char FUNCTION_NAME[] = "tj3JPEGBufSize";
@ -955,7 +968,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT size_t tj3YUVBufSize(int width, int align, int height, int subsamp)
 {
  static const char FUNCTION_NAME[] = "tj3YUVBufSize";
@ -1004,7 +1017,7 @@ DLLEXPORT unsigned long TJBUFSIZEYUV(int width, int height, int subsamp)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT size_t tj3YUVPlaneSize(int componentID, int width, int stride,
                                 int height, int subsamp)
 {
@ -1041,7 +1054,7 @@ DLLEXPORT unsigned long tjPlaneSizeYUV(int componentID, int width, int stride,
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3YUVPlaneWidth(int componentID, int width, int subsamp)
 {
  static const char FUNCTION_NAME[] = "tj3YUVPlaneWidth";
@ -1075,7 +1088,7 @@ DLLEXPORT int tjPlaneWidth(int componentID, int width, int subsamp)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3YUVPlaneHeight(int componentID, int height, int subsamp)
 {
  static const char FUNCTION_NAME[] = "tj3YUVPlaneHeight";
@ -1148,6 +1161,35 @@ DLLEXPORT tjhandle tjInitCompress(void)
 }


+/* TurboJPEG 3.1+ */
+DLLEXPORT int tj3SetICCProfile(tjhandle handle, unsigned char *iccBuf,
+                               size_t iccSize)
+{
+  static const char FUNCTION_NAME[] = "tj3SetICCProfile";
+  int retval = 0;
+
+  GET_TJINSTANCE(handle, -1)
+  if ((this->init & COMPRESS) == 0)
+    THROW("Instance has not been initialized for compression");
+
+  if (iccBuf == this->iccBuf && iccSize == this->iccSize)
+    return 0;
+
+  free(this->iccBuf);
+  this->iccBuf = NULL;
+  this->iccSize = 0;
+  if (iccBuf && iccSize) {
+    if ((this->iccBuf = (unsigned char *)malloc(iccSize)) == NULL)
+      THROW("Memory allocation failure");
+    memcpy(this->iccBuf, iccBuf, iccSize);
+    this->iccSize = iccSize;
+  }
+
+bailout:
+  return retval;
+}
+
+
 /* tj3Compress*() is implemented in turbojpeg-mp.c */
 #define BITS_IN_JSAMPLE  8
 #include "turbojpeg-mp.c"
@ -1214,7 +1256,7 @@ DLLEXPORT int tjCompress(tjhandle handle, unsigned char *srcBuf, int width,
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3CompressFromYUVPlanes8(tjhandle handle,
                                        const unsigned char * const *srcPlanes,
                                        int width, const int *strides,
@ -1264,6 +1306,8 @@ DLLEXPORT int tj3CompressFromYUVPlanes8(tjhandle handle,
  cinfo->raw_data_in = TRUE;

  jpeg_start_compress(cinfo, TRUE);
+  if (this->iccBuf != NULL && this->iccSize != 0)
+    jpeg_write_icc_profile(cinfo, this->iccBuf, (unsigned int)this->iccSize);
  for (i = 0; i < cinfo->num_components; i++) {
    jpeg_component_info *compptr = &cinfo->comp_info[i];
    int ih;
@ -1382,7 +1426,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3CompressFromYUV8(tjhandle handle,
                                  const unsigned char *srcBuf, int width,
                                  int align, int height,
@ -1461,7 +1505,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3EncodeYUVPlanes8(tjhandle handle, const unsigned char *srcBuf,
                                  int width, int pitch, int height,
                                  int pixelFormat, unsigned char **dstPlanes,
@ -1641,7 +1685,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3EncodeYUV8(tjhandle handle, const unsigned char *srcBuf,
                            int width, int pitch, int height, int pixelFormat,
                            unsigned char *dstBuf, int align)
@ -1768,13 +1812,15 @@ DLLEXPORT tjhandle tjInitDecompress(void)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3DecompressHeader(tjhandle handle,
                                  const unsigned char *jpegBuf,
                                  size_t jpegSize)
 {
  static const char FUNCTION_NAME[] = "tj3DecompressHeader";
  int retval = 0;
+  unsigned char *iccPtr = NULL;
+  unsigned int iccLen = 0;

  GET_DINSTANCE(handle);
  if ((this->init & DECOMPRESS) == 0)
@ -1790,6 +1836,12 @@ DLLEXPORT int tj3DecompressHeader(tjhandle handle,

  jpeg_mem_src_tj(dinfo, jpegBuf, jpegSize);

+  /* Extract ICC profile if TJPARAM_SAVEMARKERS is 2 or 4.  (We could
+     eventually reuse this mechanism to save other markers, if needed.)
+     Because ICC profiles can be large, we extract them by default but allow
+     the user to override that behavior. */
+  if (this->saveMarkers == 2 || this->saveMarkers == 4)
+    jpeg_save_markers(dinfo, JPEG_APP0 + 2, 0xFFFF);
  /* jpeg_read_header() calls jpeg_abort() and returns JPEG_HEADER_TABLES_ONLY
     if the datastream is a tables-only datastream.  Since we aren't using a
     suspending data source, the only other value it can return is
@ -1799,6 +1851,14 @@ DLLEXPORT int tj3DecompressHeader(tjhandle handle,

  setDecompParameters(this);

+  if (this->saveMarkers == 2 || this->saveMarkers == 4) {
+    if (jpeg_read_icc_profile(dinfo, &iccPtr, &iccLen)) {
+      free(this->tempICCBuf);
+      this->tempICCBuf = iccPtr;
+      this->tempICCSize = (size_t)iccLen;
+    }
+  }
+
  jpeg_abort_decompress(dinfo);

  if (this->colorspace < 0)
@ -1863,7 +1923,40 @@ DLLEXPORT int tjDecompressHeader(tjhandle handle, unsigned char *jpegBuf,
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.1+ */
+DLLEXPORT int tj3GetICCProfile(tjhandle handle, unsigned char **iccBuf,
+                               size_t *iccSize)
+{
+  static const char FUNCTION_NAME[] = "tj3GetICCProfile";
+  int retval = 0;
+
+  GET_TJINSTANCE(handle, -1);
+  if ((this->init & DECOMPRESS) == 0)
+    THROW("Instance has not been initialized for decompression");
+
+  if (iccSize == NULL)
+    THROW("Invalid argument");
+
+  if (!this->tempICCBuf || !this->tempICCSize) {
+    if (iccBuf) *iccBuf = NULL;
+    *iccSize = 0;
+    this->jerr.warning = TRUE;
+    THROW("No ICC profile data has been extracted");
+  }
+
+  *iccSize = this->tempICCSize;
+  if (iccBuf == NULL)
+    return 0;
+  *iccBuf = this->tempICCBuf;
+  this->tempICCBuf = NULL;
+  this->tempICCSize = 0;
+
+bailout:
+  return retval;
+}
+
+
+/* TurboJPEG 3.0+ */
 DLLEXPORT tjscalingfactor *tj3GetScalingFactors(int *numScalingFactors)
 {
  static const char FUNCTION_NAME[] = "tj3GetScalingFactors";
@ -1885,7 +1978,7 @@ DLLEXPORT tjscalingfactor *tjGetScalingFactors(int *numScalingFactors)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3SetScalingFactor(tjhandle handle,
                                  tjscalingfactor scalingFactor)
 {
@ -1910,7 +2003,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3SetCroppingRegion(tjhandle handle, tjregion croppingRegion)
 {
  static const char FUNCTION_NAME[] = "tj3SetCroppingRegion";
@ -2026,7 +2119,7 @@ DLLEXPORT int tjDecompress(tjhandle handle, unsigned char *jpegBuf,
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3DecompressToYUVPlanes8(tjhandle handle,
                                        const unsigned char *jpegBuf,
                                        size_t jpegSize,
@ -2242,7 +2335,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3DecompressToYUV8(tjhandle handle,
                                  const unsigned char *jpegBuf,
                                  size_t jpegSize,
@ -2412,7 +2505,7 @@ static void my_reset_marker_reader(j_decompress_ptr dinfo)
 {
 }

-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3DecodeYUVPlanes8(tjhandle handle,
                                  const unsigned char * const *srcPlanes,
                                  const int *strides, unsigned char *dstBuf,
@ -2579,7 +2672,7 @@ bailout:
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3DecodeYUV8(tjhandle handle, const unsigned char *srcBuf,
                            int align, unsigned char *dstBuf, int width,
                            int pitch, int height, int pixelFormat)
@ -2659,7 +2752,7 @@ DLLEXPORT tjhandle tjInitTransform(void)
 }


-/* TurboJPEG 3+ */
+/* TurboJPEG 3.0+ */
 DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
                           size_t jpegSize, int n, unsigned char **dstBufs,
                           size_t *dstSizes, const tjtransform *t)
@ -2730,7 +2823,8 @@ DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
    if (!(t[i].options & TJXOPT_COPYNONE)) saveMarkers = 1;
  }

-  jcopy_markers_setup(dinfo, saveMarkers ? JCOPYOPT_ALL : JCOPYOPT_NONE);
+  jcopy_markers_setup(dinfo, saveMarkers ?
+                             (JCOPY_OPTION)this->saveMarkers : JCOPYOPT_NONE);
  if (dinfo->global_state <= DSTATE_INHEADER)
    jpeg_read_header(dinfo, TRUE);
  if (this->maxPixels &&
@ -2787,7 +2881,11 @@ DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
    if (!(t[i].options & TJXOPT_NOOUTPUT)) {
      jpeg_write_coefficients(cinfo, dstcoefs);
      jcopy_markers_execute(dinfo, cinfo, t[i].options & TJXOPT_COPYNONE ?
-                                          JCOPYOPT_NONE : JCOPYOPT_ALL);
+                                          JCOPYOPT_NONE :
+                                          (JCOPY_OPTION)this->saveMarkers);
+      if (this->iccBuf != NULL && this->iccSize != 0)
+        jpeg_write_icc_profile(cinfo, this->iccBuf,
+                               (unsigned int)this->iccSize);
    } else
      jinit_c_master_control(cinfo, TRUE);
    jtransform_execute_transformation(dinfo, cinfo, srccoefs, &xinfo[i]);
--- a/src/turbojpeg.h
+++ b/src/turbojpeg.h
@ -912,7 +912,32 @@ enum TJPARAM {
   * - maximum number of pixels that the decompression, transform, and image
   * loading functions will process *[default: `0` (no limit)]*
   */
-  TJPARAM_MAXPIXELS
+  TJPARAM_MAXPIXELS,
+  /**
+   * Marker copying behavior [decompression, lossless transformation]
+   *
+   * **Value [lossless transformation]**
+   * - `0` Do not copy any extra markers (including comments, JFIF thumbnails,
+   * Exif data, and ICC profile data) from the source image to the destination
+   * image.
+   * - `1` Do not copy any extra markers, except comment (COM) markers, from
+   * the source image to the destination image.
+   * - `2` *[default]* Copy all extra markers from the source image to the
+   * destination image.
+   * - `3` Copy all extra markers, except ICC profile data (APP2 markers), from
+   * the source image to the destination image.
+   * - `4` Do not copy any extra markers, except ICC profile data (APP2
+   * markers), from the source image to the destination image.
+   *
+   * #TJXOPT_COPYNONE overrides this parameter for a particular transform.
+   * This parameter overrides any ICC profile that was previously associated
+   * with the TurboJPEG instance using #tj3SetICCProfile().
+   *
+   * When decompressing, #tj3DecompressHeader() extracts the ICC profile from a
+   * JPEG image if this parameter is set to `2` or `4`.  #tj3GetICCProfile()
+   * can then be used to retrieve the profile.
+   */
+  TJPARAM_SAVEMARKERS
 };


@ -1396,6 +1421,30 @@ DLLEXPORT int tj3YUVPlaneWidth(int componentID, int width, int subsamp);
 DLLEXPORT int tj3YUVPlaneHeight(int componentID, int height, int subsamp);


+/**
+ * Embed an ICC (International Color Consortium) color management profile in
+ * JPEG images generated by subsequent compression and lossless transformation
+ * operations.
+ *
+ * @param handle handle to a TurboJPEG instance that has been initialized for
+ * compression
+ *
+ * @param iccBuf pointer to a byte buffer containing an ICC profile.  A copy is
+ * made of the ICC profile, so this buffer can be freed or reused as soon as
+ * this function returns.  Setting this parameter to NULL or setting `iccSize`
+ * to 0 removes any ICC profile that was previously associated with the
+ * TurboJPEG instance.
+ *
+ * @param iccSize size of the ICC profile (in bytes.)  Setting this parameter
+ * to 0 or setting `iccBuf` to NULL removes any ICC profile that was previously
+ * associated with the TurboJPEG instance.
+ *
+ * @return 0 if successful, or -1 if an error occurred (see #tj3GetErrorStr().)
+ */
+DLLEXPORT int tj3SetICCProfile(tjhandle handle, unsigned char *iccBuf,
+                               size_t iccSize);
+
+
 /**
 * Compress a packed-pixel RGB, grayscale, or CMYK image with 2 to 8 bits of
 * data precision per sample into a JPEG image with the same data precision.
@ -1433,7 +1482,9 @@ DLLEXPORT int tj3YUVPlaneHeight(int componentID, int height, int subsamp);
 * -# set `*jpegBuf` to NULL to tell TurboJPEG to allocate the buffer for you,
 * or
 * -# pre-allocate the buffer to a "worst case" size determined by calling
- * #tj3JPEGBufSize().  This should ensure that the buffer never has to be
+ * #tj3JPEGBufSize() and adding the return value to the size of the ICC profile
+ * (if any) that was previously associated with the TurboJPEG instance (see
+ * #tj3SetICCProfile().)  This should ensure that the buffer never has to be
 * re-allocated.  (Setting #TJPARAM_NOREALLOC guarantees that it won't be.)
 * .
 * If you choose option 1 or 3, then `*jpegSize` should be set to the size of
@ -1492,7 +1543,9 @@ DLLEXPORT int tj3Compress8(tjhandle handle, const unsigned char *srcBuf,
 * -# set `*jpegBuf` to NULL to tell TurboJPEG to allocate the buffer for you,
 * or
 * -# pre-allocate the buffer to a "worst case" size determined by calling
- * #tj3JPEGBufSize().  This should ensure that the buffer never has to be
+ * #tj3JPEGBufSize() and adding the return value to the size of the ICC profile
+ * (if any) that was previously associated with the TurboJPEG instance (see
+ * #tj3SetICCProfile().)  This should ensure that the buffer never has to be
 * re-allocated.  (Setting #TJPARAM_NOREALLOC guarantees that it won't be.)
 * .
 * If you choose option 1 or 3, then `*jpegSize` should be set to the size of
@ -1552,7 +1605,9 @@ DLLEXPORT int tj3Compress12(tjhandle handle, const short *srcBuf, int width,
 * -# set `*jpegBuf` to NULL to tell TurboJPEG to allocate the buffer for you,
 * or
 * -# pre-allocate the buffer to a "worst case" size determined by calling
- * #tj3JPEGBufSize().  This should ensure that the buffer never has to be
+ * #tj3JPEGBufSize() and adding the return value to the size of the ICC profile
+ * (if any) that was previously associated with the TurboJPEG instance (see
+ * #tj3SetICCProfile().)  This should ensure that the buffer never has to be
 * re-allocated.  (Setting #TJPARAM_NOREALLOC guarantees that it won't be.)
 * .
 * If you choose option 1 or 3, then `*jpegSize` should be set to the size of
@ -1615,7 +1670,9 @@ DLLEXPORT int tj3Compress16(tjhandle handle, const unsigned short *srcBuf,
 * -# set `*jpegBuf` to NULL to tell TurboJPEG to allocate the buffer for you,
 * or
 * -# pre-allocate the buffer to a "worst case" size determined by calling
- * #tj3JPEGBufSize().  This should ensure that the buffer never has to be
+ * #tj3JPEGBufSize() and adding the return value to the size of the ICC profile
+ * (if any) that was previously associated with the TurboJPEG instance (see
+ * #tj3SetICCProfile().)  This should ensure that the buffer never has to be
 * re-allocated.  (Setting #TJPARAM_NOREALLOC guarantees that it won't be.)
 * .
 * If you choose option 1 or 3, then `*jpegSize` should be set to the size of
@ -1675,7 +1732,9 @@ DLLEXPORT int tj3CompressFromYUVPlanes8(tjhandle handle,
 * -# set `*jpegBuf` to NULL to tell TurboJPEG to allocate the buffer for you,
 * or
 * -# pre-allocate the buffer to a "worst case" size determined by calling
- * #tj3JPEGBufSize().  This should ensure that the buffer never has to be
+ * #tj3JPEGBufSize() and adding the return value to the size of the ICC profile
+ * (if any) that was previously associated with the TurboJPEG instance (see
+ * #tj3SetICCProfile().)  This should ensure that the buffer never has to be
 * re-allocated.  (Setting #TJPARAM_NOREALLOC guarantees that it won't be.)
 * .
 * If you choose option 1 or 3, then `*jpegSize` should be set to the size of
@ -1806,7 +1865,10 @@ DLLEXPORT int tj3EncodeYUV8(tjhandle handle, const unsigned char *srcBuf,
 * Retrieve information about a JPEG image without decompressing it, or prime
 * the decompressor with quantization and Huffman tables.  If a JPEG image is
 * passed to this function, then the @ref TJPARAM "parameters" that describe
- * the JPEG image will be set when the function returns.
+ * the JPEG image will be set when the function returns.  If a JPEG image is
+ * passed to this function and #TJPARAM_SAVEMARKERS is set to `2` or `4`, then
+ * the ICC profile (if any) will be extracted from the JPEG image.
+ * (#tj3GetICCProfile() can then be used to retrieve the profile.)
 *
 * @param handle handle to a TurboJPEG instance that has been initialized for
 * decompression
@ -1829,6 +1891,37 @@ DLLEXPORT int tj3DecompressHeader(tjhandle handle,
                                  size_t jpegSize);


+/**
+ * Retrieve the ICC (International Color Consortium) color management profile
+ * (if any) that was previously extracted from a JPEG image.
+ *
+ * @note To extract the ICC profile from a JPEG image, call
+ * #tj3DecompressHeader() with #TJPARAM_SAVEMARKERS set to `2` or `4`.  Once
+ * the ICC profile is retrieved, it must be re-extracted before it can be
+ * retrieved again.
+ *
+ * @param handle handle to a TurboJPEG instance that has been initialized for
+ * decompression
+ *
+ * @param iccBuf address of a pointer to a byte buffer.  Upon return:
+ * - If `iccBuf` is not NULL and there is an ICC profile to retrieve, then
+ * `*iccBuf` will point to a byte buffer containing the ICC profile.  This
+ * buffer should be freed using #tj3Free().
+ * - If `iccBuf` is not NULL and there is no ICC profile to retrieve, then
+ * `*iccBuf` will be NULL.
+ * - If `iccBuf` is NULL, then only the ICC profile size will be retrieved, and
+ * the ICC profile can be retrieved later.
+ *
+ * @param iccSize address of a size_t variable.  Upon return, the variable will
+ * contain the ICC profile size (or 0 if there is no ICC profile to retrieve.)
+ *
+ * @return 0 if successful, or -1 if an error occurred (see #tj3GetErrorStr()
+ * and #tj3GetErrorCode().)
+ */
+DLLEXPORT int tj3GetICCProfile(tjhandle handle, unsigned char **iccBuf,
+                               size_t *iccSize);
+
+
 /**
 * Returns a list of fractional scaling factors that the JPEG decompressor
 * supports.
@ -2182,14 +2275,17 @@ DLLEXPORT int tj3DecodeYUV8(tjhandle handle, const unsigned char *srcBuf,
 * -# 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 destination image (taking into account
- * grayscale conversion and transposition of the width and height.)  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 unless the embedded data is
- * discarded using #TJXOPT_COPYNONE.
+ * grayscale conversion and transposition of the width and height), then adding
+ * the return value to the size of the ICC profile (if any) that was previously
+ * associated with the TurboJPEG instance (see #tj3SetICCProfile()) or
+ * extracted from the source image (see #tj3GetICCProfile() and
+ * #TJPARAM_SAVEMARKERS.)  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 data) in
+ * which the transformed JPEG image will be larger than the worst-case size,
+ * and #TJPARAM_NOREALLOC cannot be used in those cases unless the embedded
+ * data is discarded using #TJXOPT_COPYNONE or #TJPARAM_SAVEMARKERS.
 * .
 * If you choose option 1 or 3, then `dstSizes[i]` should be set to the size of
 * your pre-allocated buffer.  In any case, unless you have set
--- a/test/tjbenchtest.in
+++ b/test/tjbenchtest.in
@ -362,9 +362,11 @@ for image in $IMAGES; do

 	# Transforms
 	if [ "$LOSSLSARG" != "-l" ]; then
+		runme $EXEDIR/jpegtran -icc $IMGDIR/test1.icc -outf $OUTDIR/temp.jpg $OUTDIR/${basename}_444_Q95.jpg
+		runme mv $OUTDIR/temp.jpg $OUTDIR/${basename}_444_Q95.jpg
 		for samp in $ALLSUBSAMP; do
 			for xform in {0..6}; do
-				runme $EXEDIR/jpegtran ${XFORMARGS[$xform]} -tri -outf $OUTDIR/${basename}_${samp}_${XFORMNAME[$xform]}_jpegtran.jpg $OUTDIR/${basename}_${samp}_Q95.jpg
+				runme $EXEDIR/jpegtran -c a ${XFORMARGS[$xform]} -tri -outf $OUTDIR/${basename}_${samp}_${XFORMNAME[$xform]}_jpegtran.jpg $OUTDIR/${basename}_${samp}_Q95.jpg
 			done
 		done
 		for xform in {0..6}; do
--- a/test/tjcomptest.in
+++ b/test/tjcomptest.in
@ -61,7 +61,7 @@ for precision in 8 12; do
 		RGBIMG=$IMGDIR/monkey16.ppm
 		GRAYIMG=$IMGDIR/monkey16.pgm
 	fi
-	for restartarg in "" "-r 1" "-r 1b"; do
+	for restartarg in "" "-r 1 -icc $IMGDIR/test3.icc" "-r 1b"; do
 		for ariarg in "" "-a"; do
 			for dctarg in "" "-dc fa"; do
 				for optarg in "" "-o"; do
@ -159,7 +159,7 @@ for precision in {2..16}; do
 			if [ $pt -ge $precision ]; then
 				continue
 			fi
-			for restartarg in "" "-r 1"; do
+			for restartarg in "" "-r 1 -icc $IMGDIR/test3.icc"; do
 				basename=`basename $RGBIMG .ppm`
 				runme $TJCOMP -pre $precision -l $psv,$pt $restartarg \
 					$RGBIMG $OUTDIR/${basename}-tjcomp.jpg
--- a/test/tjdecomptest.in
+++ b/test/tjdecomptest.in
@ -63,7 +63,11 @@ for precision in 8 12; do
 	fi

 	for sampi in {0..6}; do
-		runme $EXEDIR/cjpeg -pre $precision -sa ${SAMPOPT[$sampi]} \
+		iccarg=
+		if [ $sampi = 3 ]; then
+			iccarg="-icc $IMGDIR/test1.icc"
+		fi
+		runme $EXEDIR/cjpeg -pre $precision -sa ${SAMPOPT[$sampi]} $iccarg \
 			-outf $OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg $RGBIMG
 	done
 	runme $EXEDIR/cjpeg -pre $precision \
@ -124,12 +128,26 @@ for precision in 8 12; do
 							echo
 						else
 							basename=`basename $RGBIMG .ppm`
-							runme $TJDECOMP $croparg $dctarg $nsarg $scalearg \
+							iccarg=
+							if [ "$subsamp" = "420" ]; then
+								iccarg="-icc $OUTDIR/${basename}-tjdecomp.icc"
+							fi
+							runme $TJDECOMP $croparg $dctarg $nsarg $scalearg $iccarg \
 								$OUTDIR/${basename}-$subsamp.jpg \
 								$OUTDIR/${basename}-tjdecomp.ppm
-							runme $EXEDIR/djpeg $croparg $dctarg $nsarg $scalearg \
+							if [ "$subsamp" = "420" ]; then
+								iccarg="-icc $OUTDIR/${basename}-djpeg.icc"
+							fi
+							runme $EXEDIR/djpeg $croparg $dctarg $nsarg $scalearg $iccarg \
 								-outf $OUTDIR/${basename}-djpeg.ppm \
 								$OUTDIR/${basename}-$subsamp.jpg
+							if [ "$subsamp" = "420" ]; then
+								$EXEDIR/test/md5sum $OUTDIR/${basename}-tjdecomp.icc \
+									$OUTDIR/${basename}-djpeg.icc | sed "s@$OUTDIR@\$OUTDIR@g"
+								cmp $OUTDIR/${basename}-tjdecomp.icc \
+									$OUTDIR/${basename}-djpeg.icc
+								rm $OUTDIR/${basename}-tjdecomp.icc $OUTDIR/${basename}-djpeg.icc
+							fi
 							$EXEDIR/test/md5sum $OUTDIR/${basename}-tjdecomp.ppm \
 								$OUTDIR/${basename}-djpeg.ppm | sed "s@$OUTDIR@\$OUTDIR@g"
 							cmp $OUTDIR/${basename}-tjdecomp.ppm \
--- a/test/tjtrantest.in
+++ b/test/tjtrantest.in
@ -69,13 +69,13 @@ for precision in 8 12; do
 		elif [ $sampi = 2 ]; then
 			EXTRA_ARGS=-a
 		elif [ $sampi = 3 ]; then
-			EXTRA_ARGS=-o
+			EXTRA_ARGS="-o -icc $IMGDIR/test1.icc"
 		elif [ $sampi = 5 ]; then
 			EXTRA_ARGS="-r 1"
 		fi
 		runme $EXEDIR/cjpeg -pre $precision -sa ${SAMPOPT[$sampi]} $EXTRA_ARGS \
 			-outf $OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg $RGBIMG
-		if [ $sampi = 4 ]; then
+		if [[ $sampi = 3 || $sampi = 4 ]]; then
 			$EXEDIR/wrjpgcom -comment "This is a test" \
 				$OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg \
 				>$OUTDIR/temp.jpg
@ -94,8 +94,12 @@ for precision in 8 12; do
 			basename=`basename $RGBIMG .ppm`
 		fi
 		for ariarg in "" "-a"; do
-			for copyarg in "" "-c n"; do
-				if [[ "$copyarg" = "-c n" && "$subsamp" != "411" ]]; then
+			for copyarg in "" "-c i" "-c n"; do
+				if [[ "$copyarg" = "-c n" && "$subsamp" != "411" && \
+					"$subsamp" != "420" ]]; then
+					continue
+				fi
+				if [[ "$copyarg" = "-c i" && "$subsamp" != "420" ]]; then
 					continue
 				fi
 				for croparg in "" "-cr 14x14+23+23" "-cr 21x21+4+4" "-cr 18x18+13+13" \
@ -122,7 +126,8 @@ for precision in 8 12; do
 									if [[ "$progarg" = "-p" && "$optarg" = "-o" ]]; then
 										continue
 									fi
-									for restartarg in "" "-r 1" "-r 1b"; do
+									for restartarg in "" "-r 1 -icc $IMGDIR/test3.icc" \
+										"-r 1b"; do
 										if [[ "$restartarg" = "-r 1b" && "$croparg" != "" ]]; then
 											continue
 										fi