Hello community, here is the log from the commit of package kdegraphics3 checked in at Sat Aug 4 21:12:12 CEST 2007. -------- --- KDE/kdegraphics3/kdegraphics3.changes 2007-07-22 13:49:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics3/kdegraphics3.changes 2007-08-04 19:22:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 4 19:22:08 CEST 2007 - stbinner@suse.de + +- update 3_5_BRANCH.diff, pickup latest xpdf security fixes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.c26006/_old 2007-08-04 21:11:38.000000000 +0200 +++ /var/tmp/diff_new_pack.c26006/_new 2007-08-04 21:11:38.000000000 +0200 @@ -34,7 +34,7 @@ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Summary: Base Libraries for KDE Graphics Applications Version: 3.5.7 -Release: 21 +Release: 29 Source0: kdegraphics-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: prefer-kpdf.diff @@ -640,6 +640,8 @@ /opt/kde3/include/*.h %changelog +* Sat Aug 04 2007 - stbinner@suse.de +- update 3_5_BRANCH.diff, pickup latest xpdf security fixes * Sun Jul 22 2007 - stbinner@suse.de - add 3_5_BRANCH.diff for various bug fixes * Thu Jun 21 2007 - stbinner@suse.de ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.c26006/_old 2007-08-04 21:11:38.000000000 +0200 +++ /var/tmp/diff_new_pack.c26006/_new 2007-08-04 21:11:38.000000000 +0200 @@ -87,6 +87,21 @@ if ( genObjectRects ) d->generator->pdfdoc->processLinks( d->generator->kpdfOutputDev, page->number() + 1 ); +--- kpdf/xpdf/xpdf/Stream.cc ++++ kpdf/xpdf/xpdf/Stream.cc +@@ -411,9 +411,9 @@ + + nVals = width * nComps; + if (width <= 0 || nComps <= 0 || nBits <= 0 || +- nComps >= INT_MAX / nBits || +- width >= INT_MAX / nComps / nBits || +- nVals * nBits + 7 < 0) { ++ nComps > gfxColorMaxComps || nBits > 16 || ++ width >= INT_MAX / nComps || ++ nVals >= (INT_MAX - 7) / nBits) { + return; + } + pixBytes = (nComps * nBits + 7) >> 3; --- kpdf/shell/kpdf.desktop +++ kpdf/shell/kpdf.desktop @@ -1,6 +1,6 @@ @@ -97,6 +112,38 @@ Terminal=false Name=KPDF Name[ar]=برنامج KPDF +--- kpdf/ui/pagepainter.cpp ++++ kpdf/ui/pagepainter.cpp +@@ -49,11 +49,24 @@ + // if have no pixmap, draw blank page with gray cross and exit + if ( !pixmap ) + { +- if ( KpdfSettings::changeColors() && +- KpdfSettings::renderMode() == KpdfSettings::EnumRenderMode::Paper ) +- destPainter->fillRect( limits, KpdfSettings::paperColor() ); +- else +- destPainter->fillRect( limits, Qt::white ); ++ QColor color = Qt::white; ++ if ( KpdfSettings::changeColors() ) ++ { ++ switch ( KpdfSettings::renderMode() ) ++ { ++ case KpdfSettings::EnumRenderMode::Inverted: ++ color = Qt::black; ++ break; ++ case KpdfSettings::EnumRenderMode::Paper: ++ color = KpdfSettings::paperColor(); ++ break; ++ case KpdfSettings::EnumRenderMode::Recolor: ++ color = KpdfSettings::recolorBackground(); ++ break; ++ default: ; ++ } ++ } ++ destPainter->fillRect( limits, color ); + + // draw a cross (to that the pixmap as not yet been loaded) + // helps a lot on pages that take much to render --- kpdf/ui/pageview.cpp +++ kpdf/ui/pageview.cpp @@ -59,53 +59,6 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org