paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 17:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Applied patch as per bug #14083, added on_unknown_marker handler

Browse Source 
git-svn-id: trunk@17748 -
This commit is contained in:
michael 2011-06-13 19:25:38 +00:00
parent 769f0d8008
commit 341d4a9c1f
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/pasjpeg/src/jdmarker.pas
View File

@ -132,7 +132,9 @@ procedure jpeg_save_markers (cinfo : j_decompress_ptr;
procedure jpeg_set_marker_processor (cinfo : j_decompress_ptr; procedure jpeg_set_marker_processor (cinfo : j_decompress_ptr;
marker_code : int; marker_code : int;
routine : jpeg_marker_parser_method); routine : jpeg_marker_parser_method);
Var
on_unknown_marker : function (cinfo : j_decompress_ptr) : int; far;
implementation implementation
uses uses
@ -2321,18 +2323,25 @@ begin
M_DNL: { Ignore DNL ... perhaps the wrong thing } M_DNL: { Ignore DNL ... perhaps the wrong thing }
if not skip_variable(cinfo) then if not skip_variable(cinfo) then
begin begin
read_markers := JPEG_SUSPENDED; read_markers := JPEG_SUSPENDED;
exit; exit;
end; end;
else { must be DHP, EXP, JPGn, or RESn } else { must be DHP, EXP, JPGn, or RESn }
{ For now, we treat the reserved markers as fatal errors since they are if (@on_unknown_marker<>nil) then
likely to be used to signal incompatible JPEG Part 3 extensions. begin
Once the JPEG 3 version-number marker is well defined, this code read_markers:=on_unknown_marker(cinfo);
ought to change! } exit;
ERREXIT1(j_common_ptr(cinfo) , JERR_UNKNOWN_MARKER, end
cinfo^.unread_marker); else if not skip_variable(cinfo) then
begin
read_markers := JPEG_SUSPENDED;
exit;
end;
{ // This is the previous code.
ERREXIT1(j_common_ptr(cinfo) , JERR_UNKNOWN_MARKER,cinfo^.unread_marker);
}
end; { end of case } end; { end of case }
{ Successfully processed marker, so reset state variable } { Successfully processed marker, so reset state variable }
cinfo^.unread_marker := 0; cinfo^.unread_marker := 0;