diff options
author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2011-05-24 10:17:32 +0000 |
---|---|---|
committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2011-05-24 10:17:32 +0000 |
commit | 20d69caed0a24e6764e719ddb8d10dcda3cf2618 (patch) | |
tree | c82f915aa1a51aa0ea5d5200026c943ef9ef8ef0 /trunk/doc/html | |
parent | ed87127fc46d642e2aaa66f7d4d51725a3d3a29c (diff) |
Don't require buffer size to be preset if using TJFLAG_NOREALLOC
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@626 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/doc/html')
-rw-r--r-- | trunk/doc/html/annotated.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/classes.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/functions.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/functions_vars.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/group___turbo_j_p_e_g.html | 6 | ||||
-rw-r--r-- | trunk/doc/html/index.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/modules.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/structtjregion.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/structtjscalingfactor.html | 2 | ||||
-rw-r--r-- | trunk/doc/html/structtjtransform.html | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/trunk/doc/html/annotated.html b/trunk/doc/html/annotated.html index 3c791b8..09db2cb 100644 --- a/trunk/doc/html/annotated.html +++ b/trunk/doc/html/annotated.html @@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/classes.html b/trunk/doc/html/classes.html index a294b86..d9b8c9a 100644 --- a/trunk/doc/html/classes.html +++ b/trunk/doc/html/classes.html @@ -80,7 +80,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/functions.html b/trunk/doc/html/functions.html index 4ffd7c9..edf3963 100644 --- a/trunk/doc/html/functions.html +++ b/trunk/doc/html/functions.html @@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/functions_vars.html b/trunk/doc/html/functions_vars.html index 13d8121..a10da77 100644 --- a/trunk/doc/html/functions_vars.html +++ b/trunk/doc/html/functions_vars.html @@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/group___turbo_j_p_e_g.html b/trunk/doc/html/group___turbo_j_p_e_g.html index a79eb9a..2540b94 100644 --- a/trunk/doc/html/group___turbo_j_p_e_g.html +++ b/trunk/doc/html/group___turbo_j_p_e_g.html @@ -786,7 +786,7 @@ Variables</h2></td></tr> <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#ga68f4761dc5213cb9653a2f6ce236716e" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters...">TJBUFSIZE()</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#ga8808d403c68b62aaa58a4c1e58e98963" title="Disable buffer (re)allocation.">TJFLAG_NOREALLOC</a> guarantees this.)</li> </ol> -If you choose option 1 or 3, <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#ga8808d403c68b62aaa58a4c1e58e98963" title="Disable buffer (re)allocation.">TJFLAG_NOREALLOC</a>, you should always check <code>*jpegBuf</code> upon return from this function, as it may have changed. </td></tr> +If you choose option 1, <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#ga8808d403c68b62aaa58a4c1e58e98963" title="Disable buffer (re)allocation.">TJFLAG_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 an unsigned long variable which holds the size of the JPEG image 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.) </td></tr> <tr><td class="paramname">jpegSubsamp</td><td>the level of chrominance subsampling to be used when generating the JPEG image (see <a class="el" href="group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074">Chrominance subsampling options</a>.) </td></tr> <tr><td class="paramname">jpegQual</td><td>the image quality of the generated JPEG image (1 = worst, 100 = best) </td></tr> @@ -1301,7 +1301,7 @@ If you choose option 1 or 3, <code>*jpegSize</code> should be set to the size of <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#ga68f4761dc5213cb9653a2f6ce236716e" title="The maximum size of the buffer (in bytes) required to hold a JPEG image with the given parameters...">TJBUFSIZE()</a> with the cropped width and height. This should ensure that the buffer never has to be re-allocated (setting <a class="el" href="group___turbo_j_p_e_g.html#ga8808d403c68b62aaa58a4c1e58e98963" title="Disable buffer (re)allocation.">TJFLAG_NOREALLOC</a> guarantees this.)</li> </ol> -If you choose option 1 or 3, <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#ga8808d403c68b62aaa58a4c1e58e98963" title="Disable buffer (re)allocation.">TJFLAG_NOREALLOC</a>, you should always check <code>dstBufs[i]</code> upon return from this function, as it may have changed. </td></tr> +If you choose option 1, <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#ga8808d403c68b62aaa58a4c1e58e98963" title="Disable buffer (re)allocation.">TJFLAG_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 unsigned long variables which 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 JPEG image (in bytes.) </td></tr> <tr><td class="paramname">transforms</td><td>pointer to an array of n tjtransform structures, each of which specifies the transform parameters and/or cropping region for the corresponding transformed output image. </td></tr> <tr><td class="paramname">flags</td><td>the bitwise OR of one or more of the <a class="el" href="group___turbo_j_p_e_g.html#ga72ecf4ebe6eb702d3c6f5ca27455e1ec">flags</a>.</td></tr> @@ -1435,7 +1435,7 @@ If you choose option 1 or 3, <code>dstSizes[i]</code> should be set to the size </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/index.html b/trunk/doc/html/index.html index 44528e9..8969bb0 100644 --- a/trunk/doc/html/index.html +++ b/trunk/doc/html/index.html @@ -69,7 +69,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/modules.html b/trunk/doc/html/modules.html index 78d13cc..9328d40 100644 --- a/trunk/doc/html/modules.html +++ b/trunk/doc/html/modules.html @@ -72,7 +72,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/structtjregion.html b/trunk/doc/html/structtjregion.html index 792f0f2..8a23e46 100644 --- a/trunk/doc/html/structtjregion.html +++ b/trunk/doc/html/structtjregion.html @@ -165,7 +165,7 @@ Data Fields</h2></td></tr> </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/structtjscalingfactor.html b/trunk/doc/html/structtjscalingfactor.html index c7be357..ad7858c 100644 --- a/trunk/doc/html/structtjscalingfactor.html +++ b/trunk/doc/html/structtjscalingfactor.html @@ -127,7 +127,7 @@ Data Fields</h2></td></tr> </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> diff --git a/trunk/doc/html/structtjtransform.html b/trunk/doc/html/structtjtransform.html index 3ff7d6e..52524b2 100644 --- a/trunk/doc/html/structtjtransform.html +++ b/trunk/doc/html/structtjtransform.html @@ -144,7 +144,7 @@ Data Fields</h2></td></tr> </iframe> </div> -<hr class="footer"/><address class="footer"><small>Generated on Sat May 21 2011 10:32:20 for TurboJPEG by  +<hr class="footer"/><address class="footer"><small>Generated on Tue May 24 2011 05:15:41 for TurboJPEG by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address> </body> |