Merge tag '2.0.0'
* tag '2.0.0': (160 commits) Clarify Android Windows build instructions Bump revision to 2.0.0 Build: Don't use @rpath with OS X 10.4 builds Fix JPEG spec references per ISO/ITU-T suggestions Fix int overflow when decompr. corrupt prog. JPEG cjpeg: Fix OOB read caused by malformed 8-bit BMP Build: Preserve CMake exe suffix from cmd line Honor CMake exe suffix when inst. static builds README.ijg: Clarification regarding JPEG 2000/XR BUILDING.md: Correct iOS/Android examples Build: Detect whether compiler supports DSPr2 Fix jpeg_skip_scanlines() segfault w/merged upsamp Fix infinite loop in partial image decompression tjLoadImage(): Fix FPE triggered by malformed BMP TurboJPEG: Handle JERR_BMP*,JERR_PPM* error codes Fix CVE-2018-11813 Travis: Use SKS keyserver pool Additional code formatting tweaks Java: Further style refinements Java: Reformat code per checkstyle recommendations ...
This commit is contained in:
@@ -209,9 +209,9 @@ jpeg_stdio_dest (j_compress_ptr cinfo, FILE *outfile)
|
||||
{
|
||||
my_dest_ptr dest;
|
||||
|
||||
/* The destination object is made permanent so that multiple JPEG images
|
||||
* can be written to the same file without re-executing jpeg_stdio_dest.
|
||||
*/
|
||||
/* The destination object is made permanent so that multiple JPEG images
|
||||
* can be written to the same file without re-executing jpeg_stdio_dest.
|
||||
*/
|
||||
if (cinfo->dest == NULL) { /* first time for this JPEG object? */
|
||||
cinfo->dest = (struct jpeg_destination_mgr *)
|
||||
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
|
||||
|
||||
Reference in New Issue
Block a user