rpms/libjpeg-turbo
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Handle broken JPEGs better (#688712).

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2011-03-22 15:07:02 +01:00
parent fd68055648
commit 98649557e3
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjpeg-turbo.spec
View File

@ -1,6 +1,6 @@
Name: libjpeg-turbo
Version: 1.1.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
Group: System Environment/Libraries
@ -22,6 +22,7 @@ Obsoletes: libjpeg < 6b-47
Provides: libjpeg = 6b-47
Patch0: libjpeg-turbo11-noinst_jpgtest.patch
Patch1: ljt11-rh688712.patch
%description
The libjpeg-turbo package contains a library of functions for manipulating
@ -73,6 +74,7 @@ JPEG images
%setup -q
%patch0 -p1 -b .noinst_jpgtest
%patch1 -p0 -b .rh688712
%build
autoreconf -fiv
@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libjpeg.a
%changelog
* Tue Mar 22 2011 Adam Tkac <atkac redhat com> 1.1.0-2
- handle broken JPEGs better (#688712)
* Tue Mar 01 2011 Adam Tkac <atkac redhat com> 1.1.0-1
- update to 1.1.0

24
ljt11-rh688712.patch Normal file
View File

@ -0,0 +1,24 @@
Index: jdhuff.c
===================================================================
--- jdhuff.c (revision 520)
+++ jdhuff.c (revision 521)
@@ -623,6 +623,7 @@
if (val0 == 0xFF) { \
buffer++; \
if (val1 != 0) { \
+ cinfo->unread_marker = val1; \
buffer -= 2; \
get_buffer &= ~0xFF; \
} \
@@ -739,6 +740,11 @@
}
}
+ if (cinfo->unread_marker != 0 && ! cinfo->entropy->insufficient_data) {
+ WARNMS(cinfo, JWRN_HIT_MARKER);
+ cinfo->entropy->insufficient_data = TRUE;
+ }
+
br_state.bytes_in_buffer -= (buffer - br_state.next_input_byte);
br_state.next_input_byte = buffer;
BITREAD_SAVE_STATE(cinfo,entropy->bitstate);