Merge branch 'master' into dev

This commit is contained in:
DRC
2020-01-08 15:02:58 -06:00
5 changed files with 6 additions and 11 deletions

View File

@@ -682,11 +682,9 @@ main(int argc, char **argv)
if (memdst) { if (memdst) {
fprintf(stderr, "Compressed size: %lu bytes\n", outsize); 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. */ /* All done. */

View File

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

View File

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

View File

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

View File

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