Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Tue Jul 12 11:45:07 CEST 2011.
--------
--- libqt4/libqt4-devel-doc.changes 2011-06-13 17:33:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes
2011-07-09 10:25:27.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Jul 9 10:23:56 CEST 2011 - dmuel...@suse.de
+
+- fix reading of tiff images with multiple samples (bnc#637275)
+
+-------------------------------------------------------------------
+Mon Jun 20 16:05:53 UTC 2011 - dmuel...@suse.de
+
+- build a libqt4-private-headers-devel for qt-creator build
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
--- libqt4/libqt4.changes 2011-06-20 18:07:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-07-09
10:25:27.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jul 9 10:23:56 CEST 2011 - dmuel...@suse.de
+
+- fix reading of tiff images with multiple samples (bnc#637275)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
tiff-samples-reader-crash.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.OhB7L9/_old 2011-07-12 11:44:36.000000000 +0200
+++ /var/tmp/diff_new_pack.OhB7L9/_new 2011-07-12 11:44:36.000000000 +0200
@@ -31,7 +31,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.7.3
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion %version
@@ -87,6 +87,7 @@
Patch121: webkit-sparc64.diff
Patch123: use-cups-default-print-settings-bnc552218.diff
Patch124: qtreeview-fix-QTBUG-16292.diff
+Patch125: tiff-samples-reader-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -103,6 +104,7 @@
handling.
+
%prep
%define plugindir %_libdir/qt4/plugins
%setup -q -n qt%x11_free%rversion
@@ -140,6 +142,7 @@
%endif
%patch123
%patch124
+%patch125
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
@@ -224,6 +227,7 @@
# remove some executable flags from image files:
find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x
+find $RPM_BUILD_ROOT/usr/share -name "*.jpg" -print0 | xargs -0 chmod a-x
find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x
find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.OhB7L9/_old 2011-07-12 11:44:36.000000000 +0200
+++ /var/tmp/diff_new_pack.OhB7L9/_new 2011-07-12 11:44:36.000000000 +0200
@@ -29,7 +29,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.7.3
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion %version
@@ -79,6 +79,7 @@
Patch121: webkit-sparc64.diff
Patch123: use-cups-default-print-settings-bnc552218.diff
Patch124: qtreeview-fix-QTBUG-16292.diff
+Patch125: tiff-samples-reader-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -95,6 +96,7 @@
handling.
+
%prep
%define plugindir %_libdir/qt4/plugins
%setup -q -n qt%x11_free%rversion
@@ -132,6 +134,7 @@
%endif
%patch123
%patch124
+%patch125
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.OhB7L9/_old 2011-07-12 11:44:36.000000000 +0200
+++ /var/tmp/diff_new_pack.OhB7L9/_new 2011-07-12 11:44:36.000000000 +0200
@@ -54,7 +54,7 @@
Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-VERSION-BEGIN
Version: 4.7.3
-Release: 5
+Release: 7
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion %version
@@ -96,6 +96,7 @@
Patch121: webkit-sparc64.diff
Patch123: use-cups-default-print-settings-bnc552218.diff
Patch124: qtreeview-fix-QTBUG-16292.diff
+Patch125: tiff-samples-reader-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -150,6 +151,7 @@
%endif
%patch123
%patch124
+%patch125
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
++++++ tiff-samples-reader-crash.diff ++++++
commit cb6380beb81ab9571c547270c144988781fed465
Author: Luboš Luňák <l.lu...@suse.cz>
Date: Tue Sep 7 12:07:34 2010 +0200
fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale images
This commit fixes reading a .tiff file from ImageMagick which reports
the following:
TIFFTAG_BITSPERSAMPLE = 8
TIFFTAG_SAMPLESPERPIXEL = 2
TIFFTAG_PHOTOMETRIC = PHOTOMETRIC_MINISBLACK
The reader uses QImage::Format_Indexed8, but since the samples per pixel
value this should be (non-existent) QImage::Format_Indexed16, causing
memory corruption. The fix falls back to the "normal" way of reading
tiff images.
Merge-request: 2467
Reviewed-by: Samuel Rødal <samuel.ro...@nokia.com>
--- src/gui/image/qtiffhandler.cpp
+++ src/gui/image/qtiffhandler.cpp
@@ -196,9 +196,12 @@ bool QTiffHandler::read(QImage *image)
uint16 bitPerSample;
if (!TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample))
bitPerSample = 1;
+ uint16 samplesPerPixel; // they may be e.g. grayscale with 2 samples per
pixel
+ if (!TIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel))
+ samplesPerPixel = 1;
bool grayscale = photometric == PHOTOMETRIC_MINISBLACK || photometric ==
PHOTOMETRIC_MINISWHITE;
- if (grayscale && bitPerSample == 1) {
+ if (grayscale && bitPerSample == 1 && samplesPerPixel == 1) {
if (image->size() != QSize(width, height) || image->format() !=
QImage::Format_Mono)
*image = QImage(width, height, QImage::Format_Mono);
QVector<QRgb> colortable(2);
@@ -220,7 +223,7 @@ bool QTiffHandler::read(QImage *image)
}
}
} else {
- if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample
== 8) {
+ if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample
== 8 && samplesPerPixel == 1) {
if (image->size() != QSize(width, height) || image->format() !=
QImage::Format_Indexed8)
*image = QImage(width, height, QImage::Format_Indexed8);
if (!image->isNull()) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
