ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge error

Browse Source
This commit is contained in:
Kornel
2021-03-01 11:16:56 +00:00
parent 886ddb1786
commit c78b82bbb1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jpegtran.c
View File

@@ -463,7 +463,6 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
if (!read_scan_script(cinfo, scansarg)) if (!read_scan_script(cinfo, scansarg))
usage(); usage();
#endif #endif
} }
return argn; /* return index of next arg (file name) */ return argn; /* return index of next arg (file name) */
@@ -790,15 +789,19 @@ main(int argc, char **argv)
else else
fprintf(stderr, "%s: can't write to stdout\n", progname); fprintf(stderr, "%s: can't write to stdout\n", progname);
} }
}
#endif
jpeg_destroy_compress(&dstinfo); jpeg_destroy_compress(&dstinfo);
(void)jpeg_finish_decompress(&srcinfo);
jpeg_destroy_decompress(&srcinfo);
#if TRANSFORMS_SUPPORTED #if TRANSFORMS_SUPPORTED
if (dropfilename != NULL) { if (dropfilename != NULL) {
(void)jpeg_finish_decompress(&dropinfo); (void)jpeg_finish_decompress(&dropinfo);
jpeg_destroy_decompress(&dropinfo); jpeg_destroy_decompress(&dropinfo);
} }
#endif #endif
(void)jpeg_finish_decompress(&srcinfo);
jpeg_destroy_decompress(&srcinfo);
/* Close output file, if we opened it */ /* Close output file, if we opened it */
if (fp != stdout) if (fp != stdout)