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

Scan optimization: return error when unable to copy data buffer

Browse Source 
#166 describes an issue where I/O suspension is not properly handled in
scan optimization. Supporting I/O suspension may be difficult to
achieve here, thus return an error to make it explicit that I/O
suspension is unsupported.
This commit is contained in:
Frank Bossen
2015-04-02 17:45:01 -05:00
parent f8a5b80cb0
commit 619c20d5e8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cderror.h
View File

@@ -127,6 +127,8 @@ JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format")
JMESSAGE(JERR_PNG_ERROR, "Unable to read PNG file: %s") JMESSAGE(JERR_PNG_ERROR, "Unable to read PNG file: %s")
#endif #endif
JMESSAGE(JERR_UNSUPPORTED_SUSPEND, "I/O suspension not supported in scan optimization")
#ifdef JMAKE_ENUM_LIST #ifdef JMAKE_ENUM_LIST
JMSG_LASTADDONCODE JMSG_LASTADDONCODE

4
jcmaster.c
View File

@@ -605,7 +605,9 @@ copy_buffer (j_compress_ptr cinfo, int scan_idx)
size -= cinfo->dest->free_in_buffer; size -= cinfo->dest->free_in_buffer;
cinfo->dest->next_output_byte += cinfo->dest->free_in_buffer; cinfo->dest->next_output_byte += cinfo->dest->free_in_buffer;
cinfo->dest->free_in_buffer = 0; cinfo->dest->free_in_buffer = 0;
(*cinfo->dest->empty_output_buffer)(cinfo);
if (!(*cinfo->dest->empty_output_buffer)(cinfo))
ERREXIT(cinfo, JERR_UNSUPPORTED_SUSPEND);
} }
MEMCOPY(cinfo->dest->next_output_byte, src, size); MEMCOPY(cinfo->dest->next_output_byte, src, size);