Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Wed May 6 18:48:38 CEST 2009. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2009-04-21 10:08:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2009-05-03 08:29:15.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 3 08:26:42 CEST 2009 - beineri@opensuse.org + +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.2.2.tar.bz2 New: ---- kdegraphics-4.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.jm4482/_old 2009-05-06 18:48:27.000000000 +0200 +++ /var/tmp/diff_new_pack.jm4482/_new 2009-05-06 18:48:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.2.2) +# spec file for package kdegraphics4 (Version 4.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.2.2 -Release: 3 +Version: 4.2.3 +Release: 1 Source0: kdegraphics-%version.tar.bz2 Source1: _upstream Patch0: 4_2_BRANCH.diff @@ -566,6 +566,9 @@ %_kde_share_dir/services/ksane_scan_service.desktop %changelog +* Sun May 03 2009 beineri@opensuse.org +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php * Tue Apr 21 2009 dmueller@suse.de - rename kde4-gwenview -> gwenview * Mon Apr 20 2009 dmueller@suse.de ++++++ kdegraphics-4.2.2.tar.bz2 -> kdegraphics-4.2.3.tar.bz2 ++++++ Files old/kdegraphics-4.2.2/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.2.3/doc/gwenview/index.cache.bz2 differ Files old/kdegraphics-4.2.2/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kcontrol/kamera/index.cache.bz2 differ Files old/kdegraphics-4.2.2/doc/kgamma/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kgamma/index.cache.bz2 differ Files old/kdegraphics-4.2.2/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kolourpaint/index.cache.bz2 differ Files old/kdegraphics-4.2.2/doc/kruler/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kruler/index.cache.bz2 differ Files old/kdegraphics-4.2.2/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.2.3/doc/ksnapshot/index.cache.bz2 differ Files old/kdegraphics-4.2.2/doc/okular/index.cache.bz2 and new/kdegraphics-4.2.3/doc/okular/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/app/fileopscontextmanageritem.cpp new/kdegraphics-4.2.3/gwenview/app/fileopscontextmanageritem.cpp --- old/kdegraphics-4.2.2/gwenview/app/fileopscontextmanageritem.cpp 2009-01-17 11:59:23.000000000 +0100 +++ new/kdegraphics-4.2.3/gwenview/app/fileopscontextmanageritem.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -124,12 +124,15 @@ d->mCopyToAction = file->addAction("file_copy_to",this,SLOT(copyTo())); d->mCopyToAction->setText(i18nc("Verb", "Copy To...")); + d->mCopyToAction->setShortcut(Qt::Key_F7); d->mMoveToAction = file->addAction("file_move_to",this,SLOT(moveTo())); d->mMoveToAction->setText(i18nc("Verb", "Move To...")); + d->mMoveToAction->setShortcut(Qt::Key_F8); d->mLinkToAction = file->addAction("file_link_to",this,SLOT(linkTo())); d->mLinkToAction->setText(i18nc("Verb: create link to the file where user wants", "Link To...")); + d->mLinkToAction->setShortcut(Qt::Key_F9); d->mTrashAction = file->addAction("file_trash",this,SLOT(trash())); d->mTrashAction->setText(i18nc("Verb", "Trash")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/app/main.cpp new/kdegraphics-4.2.3/gwenview/app/main.cpp --- old/kdegraphics-4.2.2/gwenview/app/main.cpp 2009-03-26 15:42:07.000000000 +0100 +++ new/kdegraphics-4.2.3/gwenview/app/main.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -39,7 +39,7 @@ "gwenview", /* appname */ 0, /* catalogName */ ki18n("Gwenview"), /* programName */ - "2.2.2"); /* version */ + "2.2.3"); /* version */ aboutData.setShortDescription(ki18n("An Image Viewer")); aboutData.setLicense(KAboutData::License_GPL); aboutData.setCopyrightStatement(ki18n("Copyright 2000-2009 Aurélien Gâteau")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/lib/document/loadingdocumentimpl.cpp new/kdegraphics-4.2.3/gwenview/lib/document/loadingdocumentimpl.cpp --- old/kdegraphics-4.2.2/gwenview/lib/document/loadingdocumentimpl.cpp 2009-02-26 15:15:48.000000000 +0100 +++ new/kdegraphics-4.2.3/gwenview/lib/document/loadingdocumentimpl.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -205,8 +205,25 @@ if (reader.supportsAnimation() && reader.nextImageDelay() > 0 // Assume delay == 0 <=> only one frame ) { - LOG("This is an animated image"); - mAnimated = true; + /* + * QImageReader is not really helpful to detect animated gif: + * - QImageReader::imageCount() returns 0 + * - QImageReader::nextImageDelay() may return something > 0 if the + * image consists of only one frame but includes a "Graphic + * Control Extension" (usually only present if we have an + * animation) (Bug #185523) + * + * Decoding the next frame is the only reliable way I found to + * detect an animated gif + */ + LOG("May be an animated image. delay:" << reader.nextImageDelay()); + QImage nextImage; + if (reader.read(&nextImage)) { + LOG("Really an animated image (more than one frame)"); + mAnimated = true; + } else { + kWarning() << mImpl->document()->url() << "is not really an animated image (only one frame)"; + } } } }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/NEWS new/kdegraphics-4.2.3/gwenview/NEWS --- old/kdegraphics-4.2.2/gwenview/NEWS 2009-03-26 15:42:07.000000000 +0100 +++ new/kdegraphics-4.2.3/gwenview/NEWS 2009-04-30 11:11:41.000000000 +0200 @@ -1,3 +1,8 @@ +# 2.2.3 +## Fixes +- Handle gif files containing one frame and a graphic control extension as + non-animated gif (bug #185523). + # 2.2.2 ## Fixes - Fix display of JPEG2000 images diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/part/gvpart.cpp new/kdegraphics-4.2.3/gwenview/part/gvpart.cpp --- old/kdegraphics-4.2.2/gwenview/part/gvpart.cpp 2008-11-28 16:33:12.000000000 +0100 +++ new/kdegraphics-4.2.3/gwenview/part/gvpart.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -116,14 +116,14 @@ "gvpart", /* appname */ "gwenview", /* catalogName */ ki18n("Gwenview KPart"), /* programName */ - "2.1"); /* version */ + "2.2.3"); /* version */ aboutData->setShortDescription(ki18n("An Image Viewer")); aboutData->setLicense(KAboutData::License_GPL); - aboutData->setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau")); + aboutData->setCopyrightStatement(ki18n("Copyright 2000-2009 Aurélien Gâteau")); aboutData->addAuthor( ki18n("Aurélien Gâteau"), ki18n("Main developer"), - "aurelien.gateau@free.fr"); + "agateau@kde.org"); return aboutData; } Files old/kdegraphics-4.2.2/gwenview/tests/185523_1frame_with_graphic_control_extension.gif and new/kdegraphics-4.2.3/gwenview/tests/185523_1frame_with_graphic_control_extension.gif differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/tests/documenttest.cpp new/kdegraphics-4.2.3/gwenview/tests/documenttest.cpp --- old/kdegraphics-4.2.2/gwenview/tests/documenttest.cpp 2009-02-26 15:15:47.000000000 +0100 +++ new/kdegraphics-4.2.3/gwenview/tests/documenttest.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -112,6 +112,8 @@ "gif", MimeTypeUtils::KIND_RASTER_IMAGE, true); NEW_ROW("1frame.gif", "gif", MimeTypeUtils::KIND_RASTER_IMAGE, false); + NEW_ROW("185523_1frame_with_graphic_control_extension.gif", + "gif", MimeTypeUtils::KIND_RASTER_IMAGE, false); NEW_ROW("test.xcf", "xcf", MimeTypeUtils::KIND_RASTER_IMAGE, false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/kgamma/kcmkgamma/kgamma.cpp new/kdegraphics-4.2.3/kgamma/kcmkgamma/kgamma.cpp --- old/kdegraphics-4.2.2/kgamma/kcmkgamma/kgamma.cpp 2008-11-12 17:37:01.000000000 +0100 +++ new/kdegraphics-4.2.3/kgamma/kcmkgamma/kgamma.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -399,8 +399,9 @@ delete config; if ( ConfigFile == "XF86Config" ) { // parse XF86Config - xf86cfgbox->setChecked(true); - return( loadSystemSettings() ); + bool validGlobalConfig = loadSystemSettings(); + xf86cfgbox->setChecked( validGlobalConfig ); + return( validGlobalConfig ); } else { //get gamma settings from user config return( loadUserSettings() ); @@ -492,20 +493,22 @@ } } // Extract gamma values - for ( int i = 0; i < ScreenCount; i++) { - rgamma[i] = ggamma[i] = bgamma[i] = ""; - - QStringList words = Gamma[assign[i]].split(' '); - QStringList::ConstIterator it = words.constBegin(); - if ( words.size() < 4 ) - rgamma[i] = ggamma[i] = bgamma[i] = *(++it); // single gamma value - else { - rgamma[i] = *(++it); // eventually rgb gamma values - ggamma[i] = *(++it); - bgamma[i] = *(++it); - } - } + if (gm) { + for ( int i = 0; i < ScreenCount; i++) { + rgamma[i] = ggamma[i] = bgamma[i] = ""; + + QStringList words = Gamma[assign[i]].split(' '); + QStringList::ConstIterator it = words.constBegin(); + if ( words.size() < 4 ) + rgamma[i] = ggamma[i] = bgamma[i] = *(++it); // single gamma value + else { + rgamma[i] = *(++it); // eventually rgb gamma values + ggamma[i] = *(++it); + bgamma[i] = *(++it); + } + } } + } } return( validateGammaValues() ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/ksaneplugin/CMakeLists.txt new/kdegraphics-4.2.3/ksaneplugin/CMakeLists.txt --- old/kdegraphics-4.2.2/ksaneplugin/CMakeLists.txt 2008-05-15 20:37:10.000000000 +0200 +++ new/kdegraphics-4.2.3/ksaneplugin/CMakeLists.txt 2009-04-30 11:11:40.000000000 +0200 @@ -2,7 +2,6 @@ project(ksaneplugin) find_package(KSane REQUIRED) -message("KSANE_LIBRARY=${KSANE_LIBRARY}") include_directories(${KSANE_INCLUDE_DIR}) ########### target ############### kde4_add_plugin(ksaneplugin sanedialog.cpp) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/ksaneplugin/sanedialog.cpp new/kdegraphics-4.2.3/ksaneplugin/sanedialog.cpp --- old/kdegraphics-4.2.2/ksaneplugin/sanedialog.cpp 2008-05-07 11:05:18.000000000 +0200 +++ new/kdegraphics-4.2.3/ksaneplugin/sanedialog.cpp 2009-04-30 11:11:40.000000000 +0200 @@ -31,7 +31,7 @@ #include <KMessageBox> K_PLUGIN_FACTORY(SaneDialogFactory, registerPlugin<SaneDialog>();) -K_EXPORT_PLUGIN(SaneDialogFactory("kscanplugin")) +K_EXPORT_PLUGIN(SaneDialogFactory("ksaneplugin")) /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/libs/libkipi/libkipi/pluginloader.cpp new/kdegraphics-4.2.3/libs/libkipi/libkipi/pluginloader.cpp --- old/kdegraphics-4.2.2/libs/libkipi/libkipi/pluginloader.cpp 2008-11-12 17:37:00.000000000 +0100 +++ new/kdegraphics-4.2.3/libs/libkipi/libkipi/pluginloader.cpp 2009-04-30 11:11:40.000000000 +0200 @@ -6,7 +6,7 @@ * Date : 2004-02-01 * Description : plugin loader * - * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> + * Copyright (C) 2004-2009 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2004-2005 by Renchi Raju <renchi.raju at kdemail.net> * * This program is free software; you can redistribute it @@ -294,7 +294,8 @@ PluginLoader* PluginLoader::instance() { - Q_ASSERT( s_instance != 0); + if(!s_instance) + kDebug( 51001 ) << "KIPI::PluginLoader::instance is null..." << endl; return s_instance; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/libs/libkipi/libkipi/pluginloader.h new/kdegraphics-4.2.3/libs/libkipi/libkipi/pluginloader.h --- old/kdegraphics-4.2.2/libs/libkipi/libkipi/pluginloader.h 2008-06-10 13:40:55.000000000 +0200 +++ new/kdegraphics-4.2.3/libs/libkipi/libkipi/pluginloader.h 2009-04-30 11:11:40.000000000 +0200 @@ -6,7 +6,7 @@ * Date : 2004-02-01 * Description : plugin loader * - * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> + * Copyright (C) 2004-2009 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2004-2005 by Renchi Raju <renchi.raju at kdemail.net> * * This program is free software; you can redistribute it diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/libs/libksane/CMakeLists.txt new/kdegraphics-4.2.3/libs/libksane/CMakeLists.txt --- old/kdegraphics-4.2.2/libs/libksane/CMakeLists.txt 2008-06-10 13:40:55.000000000 +0200 +++ new/kdegraphics-4.2.3/libs/libksane/CMakeLists.txt 2009-04-30 11:11:41.000000000 +0200 @@ -7,6 +7,7 @@ # API ABI # 0.1.0 => 0.1.0 # 0.1.1 => 0.1.1 +# 0.1.1 => 0.1.2 # Library API version SET(KSANE_LIB_MAJOR_VERSION "0") @@ -26,7 +27,7 @@ # For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info SET(KSANE_LIB_SO_CUR_VERSION "0") SET(KSANE_LIB_SO_REV_VERSION "1") -SET(KSANE_LIB_SO_AGE_VERSION "1") +SET(KSANE_LIB_SO_AGE_VERSION "2") # ======================================================= # Set env. variables accordinly. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/libs/libksane/libksane/dummy-hplip.cpp new/kdegraphics-4.2.3/libs/libksane/libksane/dummy-hplip.cpp --- old/kdegraphics-4.2.2/libs/libksane/libksane/dummy-hplip.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdegraphics-4.2.3/libs/libksane/libksane/dummy-hplip.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -0,0 +1,33 @@ + +//begin strings from hplip-3.9.2/scan/sane/common.h to make them translatable +I18N_NOOP("None"); +I18N_NOOP("MH"); +I18N_NOOP("MR"); +I18N_NOOP("MMR"); +I18N_NOOP("JPEG"); +I18N_NOOP("Auto"); +I18N_NOOP("Flatbed"); +I18N_NOOP("ADF"); +I18N_NOOP("Advanced"); +I18N_NOOP("Compression"); +I18N_NOOP("Selects the scanner compression "\ + "method for faster scans, possibly at the expense of image quality."); +I18N_NOOP("JPEG compression factor"); +I18N_NOOP("Sets the scanner JPEG compression "\ + "factor. Larger numbers mean better compression, " \ + "and smaller numbers mean better image quality."); +I18N_NOOP("Batch scan"); +I18N_NOOP("Enables continuous scanning with automatic document feeder (ADF)."); +I18N_NOOP("Duplex"); +I18N_NOOP("Enables scanning on both sides of the page."); +I18N_NOOP("Geometry"); +I18N_NOOP("Length measurement"); +I18N_NOOP("Selects how the scanned image "\ + "length is measured and reported, which is impossible to know in advance for scrollfed scans."); +I18N_NOOP("Unknown"); +I18N_NOOP("Unlimited"); +I18N_NOOP("Approximate"); +I18N_NOOP("Padded"); +I18N_NOOP("Exact"); +I18N_NOOP("???"); +//end strings from hplip-3.9.2/scan/sane/common.h to make them translatable diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/libs/libksane/libksane/sane_widget.cpp new/kdegraphics-4.2.3/libs/libksane/libksane/sane_widget.cpp --- old/kdegraphics-4.2.2/libs/libksane/libksane/sane_widget.cpp 2009-01-01 17:24:39.000000000 +0100 +++ new/kdegraphics-4.2.3/libs/libksane/libksane/sane_widget.cpp 2009-04-30 11:11:41.000000000 +0200 @@ -1640,6 +1640,7 @@ int j=0; int pixel_x = 0; int pixel_y = 0; + QVector<QRgb> table; switch (format) { @@ -1649,9 +1650,10 @@ height, bytes_per_line, QImage::Format_Mono); - for (int i=0; i<img.height()*img.bytesPerLine(); i++) { - img.bits()[i] = ~img.bits()[i]; - } + // The color table must be set + table.append(0xFFFFFFFF); + table.append(0xFF000000); + img.setColorTable(table); return img; case FormatGrayScale8: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/core/version.h new/kdegraphics-4.2.3/okular/core/version.h --- old/kdegraphics-4.2.2/okular/core/version.h 2009-03-26 15:42:08.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/core/version.h 2009-04-30 11:11:41.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.8.2" +#define OKULAR_VERSION_STRING "0.8.3" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 8 -#define OKULAR_VERSION_RELEASE 2 +#define OKULAR_VERSION_RELEASE 3 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/generators/comicbook/libokularGenerator_comicbook.desktop new/kdegraphics-4.2.3/okular/generators/comicbook/libokularGenerator_comicbook.desktop --- old/kdegraphics-4.2.2/okular/generators/comicbook/libokularGenerator_comicbook.desktop 2009-03-26 15:42:08.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/generators/comicbook/libokularGenerator_comicbook.desktop 2009-04-30 11:11:41.000000000 +0200 @@ -2,6 +2,7 @@ Type=Service Name=Comic Book Name[ar]=كوميك بوك +Name[cs]=Kniha komixů Name[de]=Comicbook Name[el]=Βιβλίο κόμικ Name[eo]=ComicBook diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/generators/fax/libokularGenerator_fax.desktop new/kdegraphics-4.2.3/okular/generators/fax/libokularGenerator_fax.desktop --- old/kdegraphics-4.2.2/okular/generators/fax/libokularGenerator_fax.desktop 2009-03-26 15:42:09.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/generators/fax/libokularGenerator_fax.desktop 2009-04-30 11:11:48.000000000 +0200 @@ -31,6 +31,7 @@ Name[pt_BR]=Documentos de fax Name[ro]=Documente fax Name[ru]=Факс +Name[sl]=Faksi Name[sv]=Telefax-dokument Name[tr]=Faks belgeleri Name[uk]=Документи факсів @@ -68,6 +69,7 @@ Comment[pt_BR]=Infra-estrutura de fax G3/G4 para o Okular Comment[ro]=Platformă fax G3/G4 pentru Okular Comment[ru]=Модуль поддержки формата G3/G4 Fax для Okular +Comment[sl]=Hrbtenica za fakse G3/G4 za Okular Comment[sv]=G3/G4 telefax-gränssnitt för Okular Comment[tr]=Okular için G3/G4 Faks arka ucu Comment[uk]=Втулка факсів G3/G4 для Okular diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/generators/xps/generator_xps.cpp new/kdegraphics-4.2.3/okular/generators/xps/generator_xps.cpp --- old/kdegraphics-4.2.2/okular/generators/xps/generator_xps.cpp 2009-01-17 11:59:24.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/generators/xps/generator_xps.cpp 2009-04-30 11:11:47.000000000 +0200 @@ -30,6 +30,7 @@ #include <kurl.h> #include <QBuffer> #include <QImageReader> +#include <QMutex> #include <okular/core/document.h> #include <okular/core/page.h> @@ -2019,6 +2020,7 @@ if ( QFontDatabase::supportsThreadedFontRendering() ) setFeature( Threaded ); #endif + userMutex(); } XpsGenerator::~XpsGenerator() @@ -2059,6 +2061,7 @@ QImage XpsGenerator::image( Okular::PixmapRequest * request ) { + QMutexLocker lock( userMutex() ); QSize size( (int)request->width(), (int)request->height() ); QImage image( size, QImage::Format_RGB32 ); XpsPage *pageToRender = m_xpsFile->page( request->page()->number() ); @@ -2068,6 +2071,7 @@ Okular::TextPage* XpsGenerator::textPage( Okular::Page * page ) { + QMutexLocker lock( userMutex() ); XpsPage * xpsPage = m_xpsFile->page( page->number() ); return xpsPage->textPage(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/ui/pageview.cpp new/kdegraphics-4.2.3/okular/ui/pageview.cpp --- old/kdegraphics-4.2.2/okular/ui/pageview.cpp 2009-03-26 15:42:09.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/ui/pageview.cpp 2009-04-30 11:11:48.000000000 +0200 @@ -1824,7 +1824,7 @@ rect = pageItem->page()->objectRect( Okular::ObjectRect::SourceRef, nX, nY, pageItem->uncroppedWidth(), pageItem->uncroppedHeight() ); if ( !rect ) { - static const double s_minDistance = 0.025 * 0.025; // FIXME?: empirical value? + static const double s_minDistance = 0.025; // FIXME?: empirical value? double distance = 0.0; rect = pageItem->page()->nearestObjectRect( Okular::ObjectRect::SourceRef, nX, nY, pageItem->uncroppedWidth(), pageItem->uncroppedHeight(), &distance ); if ( rect && ( distance > s_minDistance ) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/ui/sidebar.cpp new/kdegraphics-4.2.3/okular/ui/sidebar.cpp --- old/kdegraphics-4.2.2/okular/ui/sidebar.cpp 2009-01-17 11:59:24.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/ui/sidebar.cpp 2009-04-30 11:11:48.000000000 +0200 @@ -24,6 +24,7 @@ #include <qsplitter.h> #include <qstackedwidget.h> +#include <kglobalsettings.h> #include <kiconloader.h> #include <klocale.h> #include <kmenu.h> @@ -365,6 +366,8 @@ mainlay->setMargin( 0 ); mainlay->setSpacing( 0 ); + setAutoFillBackground( true ); + d->list = new SidebarListWidget( this ); mainlay->addWidget( d->list ); d->list->setMouseTracking( true ); @@ -380,6 +383,7 @@ d->list->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); d->list->setContextMenuPolicy( Qt::CustomContextMenu ); d->list->viewport()->setAutoFillBackground( false ); + d->list->setFont( KGlobalSettings::toolBarFont() ); d->splitter = new QSplitter( this ); mainlay->addWidget( d->splitter ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/okular/VERSION new/kdegraphics-4.2.3/okular/VERSION --- old/kdegraphics-4.2.2/okular/VERSION 2009-03-26 15:42:09.000000000 +0100 +++ new/kdegraphics-4.2.3/okular/VERSION 2009-04-30 11:11:48.000000000 +0200 @@ -1 +1 @@ -okular v0.8.2 +okular v0.8.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org