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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
DRC
2020-01-08 15:02:58 -06:00
parent 4c57ad476c f81833aed6
commit 167b5a8059
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cjpeg.c
View File

@@ -682,12 +682,10 @@ main(int argc, char **argv)
if (memdst) {
fprintf(stderr, "Compressed size: %lu bytes\n", outsize);
if (outbuffer != NULL)
free(outbuffer);
free(outbuffer);
}
if (icc_profile != NULL)
free(icc_profile);
free(icc_profile);
/* All done. */
exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);

2
djpeg.c
View File

@@ -833,7 +833,7 @@ main(int argc, char **argv)
if (report || max_scans != 0)
end_progress_monitor((j_common_ptr)&cinfo);
if (memsrc && inbuffer != NULL)
if (memsrc)
free(inbuffer);
/* All done. */

3
jdatadst-tj.c
View File

@@ -103,8 +103,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
if (dest->newbuffer != NULL)
free(dest->newbuffer);
free(dest->newbuffer);
dest->newbuffer = nextbuffer;

3
jdatadst.c
View File

@@ -143,8 +143,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
if (dest->newbuffer != NULL)
free(dest->newbuffer);
free(dest->newbuffer);
dest->newbuffer = nextbuffer;

3
jpegtran.c
View File

@@ -633,8 +633,7 @@ main(int argc, char **argv)
if (report || max_scans != 0)
end_progress_monitor((j_common_ptr)&srcinfo);
if (icc_profile != NULL)
free(icc_profile);
free(icc_profile);
/* All done. */
exit(jsrcerr.num_warnings + jdsterr.num_warnings ?