Hello community,
here is the log from the commit of package kdegraphics4 for openSUSE:Factory
checked in at Fri Jan 16 01:43:40 CET 2009.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2009-01-09 14:53:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2009-01-13 19:26:40.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Jan 13 19:25:18 CET 2009 - dmueller@suse.de
+
+- update to 4.1.96
+
+-------------------------------------------------------------------
+Mon Jan 12 23:35:01 CET 2009 - dmueller@suse.de
+
+- rename libkipi6-devel to libkipi-devel
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdegraphics-4.1.87.tar.bz2
New:
----
kdegraphics-4.1.96.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.Zm4993/_old 2009-01-16 01:43:13.000000000 +0100
+++ /var/tmp/diff_new_pack.Zm4993/_new 2009-01-16 01:43:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 4.1.87)
+# spec file for package kdegraphics4 (Version 4.1.96)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -33,7 +33,7 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 4.1.87
+Version: 4.1.96
Release: 1
Source0: kdegraphics-%version.tar.bz2
Source1: _upstream
@@ -197,13 +197,15 @@
%postun -n libkipi6 -p /sbin/ldconfig
-%package -n libkipi6-devel
+%package -n libkipi-devel
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT
Group: Development/Libraries/KDE
Summary: KDE Image Plugin Interface
+Provides: libkipi6-devel = %version
+Obsoletes: libkipi6-devel <= 4.1.87
Requires: libkipi6 = %version
-%description -n libkipi6-devel
+%description -n libkipi-devel
This package provides a generic KDE Image Plug-in Interface used by
some KDE image applications. Plug-ins for this interface are in the
kipi-plugins package.
@@ -217,7 +219,7 @@
Jesper K. Pedersen <blackie at kde.org>
Aurelien Gateau <aurelien dot gateau at free.fr>
-%files -n libkipi6-devel -f filelists/libkipi.devel
+%files -n libkipi-devel -f filelists/libkipi.devel
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%dir /usr/include/libkipi
@@ -535,6 +537,10 @@
%_kde_share_dir/services/ksane_scan_service.desktop
%changelog
+* Tue Jan 13 2009 dmueller@suse.de
+- update to 4.1.96
+* Mon Jan 12 2009 dmueller@suse.de
+- rename libkipi6-devel to libkipi-devel
* Fri Jan 09 2009 dmueller@suse.de
- update to 4.1.87 (KDE 4.2 Januar snapshot)
* Tue Dec 16 2008 stbinner@suse.de
++++++ kdegraphics-4.1.87.tar.bz2 -> kdegraphics-4.1.96.tar.bz2 ++++++
Files old/kdegraphics-4.1.87/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.1.96/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.1.87/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.1.96/doc/kcontrol/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.1.87/doc/kgamma/index.cache.bz2 and new/kdegraphics-4.1.96/doc/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.1.87/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.1.96/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.1.87/doc/kruler/index.cache.bz2 and new/kdegraphics-4.1.96/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.1.87/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.1.96/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-4.1.87/doc/okular/index.cache.bz2 and new/kdegraphics-4.1.96/doc/okular/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/abstractcontextmanageritem.h new/kdegraphics-4.1.96/gwenview/app/abstractcontextmanageritem.h
--- old/kdegraphics-4.1.87/gwenview/app/abstractcontextmanageritem.h 2008-05-15 20:37:11.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/abstractcontextmanageritem.h 2009-01-06 18:19:37.000000000 +0100
@@ -30,7 +30,7 @@
class ContextManager;
class SideBar;
-class AbstractContextManagerItemPrivate;
+struct AbstractContextManagerItemPrivate;
class AbstractContextManagerItem : public QObject {
Q_OBJECT
public:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/CMakeLists.txt new/kdegraphics-4.1.96/gwenview/app/CMakeLists.txt
--- old/kdegraphics-4.1.87/gwenview/app/CMakeLists.txt 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/CMakeLists.txt 2009-01-06 18:19:37.000000000 +0100
@@ -68,6 +68,8 @@
)
endif (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
+kde4_add_app_icon(gwenview_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-gwenview.png")
+
kde4_add_executable(gwenview ${gwenview_SRCS})
target_link_libraries(gwenview
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/configdialog.h new/kdegraphics-4.1.96/gwenview/app/configdialog.h
--- old/kdegraphics-4.1.87/gwenview/app/configdialog.h 2008-01-15 02:47:46.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/configdialog.h 2009-01-06 18:19:37.000000000 +0100
@@ -31,7 +31,7 @@
namespace Gwenview {
-class ConfigDialogPrivate;
+struct ConfigDialogPrivate;
class ConfigDialog : public KConfigDialog {
public:
ConfigDialog(QWidget* parent);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/contextmanager.h new/kdegraphics-4.1.96/gwenview/app/contextmanager.h
--- old/kdegraphics-4.1.87/gwenview/app/contextmanager.h 2008-05-29 13:18:37.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/contextmanager.h 2009-01-06 18:19:37.000000000 +0100
@@ -36,7 +36,7 @@
class AbstractContextManagerItem;
-class ContextManagerPrivate;
+struct ContextManagerPrivate;
/**
* Manage the update of the contextual parts of the applications,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/documentpanel.h new/kdegraphics-4.1.96/gwenview/app/documentpanel.h
--- old/kdegraphics-4.1.87/gwenview/app/documentpanel.h 2008-11-19 11:17:36.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/documentpanel.h 2009-01-06 18:19:37.000000000 +0100
@@ -33,7 +33,7 @@
namespace Gwenview {
-class DocumentPanelPrivate;
+struct DocumentPanelPrivate;
class DocumentView;
class ImageView;
class ThumbnailBarView;
@@ -112,7 +112,7 @@
void showContextMenu();
private:
- friend class DocumentPanelPrivate;
+ friend struct DocumentPanelPrivate;
DocumentPanelPrivate* const d;
void createAdapterForUrl(const KUrl& url);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/fileopscontextmanageritem.h new/kdegraphics-4.1.96/gwenview/app/fileopscontextmanageritem.h
--- old/kdegraphics-4.1.87/gwenview/app/fileopscontextmanageritem.h 2008-10-17 13:00:03.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/fileopscontextmanageritem.h 2009-01-06 18:19:37.000000000 +0100
@@ -35,7 +35,7 @@
namespace Gwenview {
-class FileOpsContextManagerItemPrivate;
+struct FileOpsContextManagerItemPrivate;
class FileOpsContextManagerItem : public AbstractContextManagerItem {
Q_OBJECT
public:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/fullscreencontent.h new/kdegraphics-4.1.96/gwenview/app/fullscreencontent.h
--- old/kdegraphics-4.1.87/gwenview/app/fullscreencontent.h 2008-10-23 01:03:20.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/fullscreencontent.h 2009-01-06 18:19:37.000000000 +0100
@@ -41,7 +41,7 @@
class ThumbnailBarView;
-class FullScreenContentPrivate;
+struct FullScreenContentPrivate;
/**
* The content of the fullscreen bar
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/imageopscontextmanageritem.h new/kdegraphics-4.1.96/gwenview/app/imageopscontextmanageritem.h
--- old/kdegraphics-4.1.87/gwenview/app/imageopscontextmanageritem.h 2008-09-26 16:55:40.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/imageopscontextmanageritem.h 2009-01-06 18:19:37.000000000 +0100
@@ -61,7 +61,7 @@
void restoreDefaultImageViewTool();
private:
- class Private;
+ struct Private;
Private* const d;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/infocontextmanageritem.h new/kdegraphics-4.1.96/gwenview/app/infocontextmanageritem.h
--- old/kdegraphics-4.1.87/gwenview/app/infocontextmanageritem.h 2008-05-15 20:37:11.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/infocontextmanageritem.h 2009-01-06 18:19:37.000000000 +0100
@@ -31,7 +31,7 @@
namespace Gwenview {
-class InfoContextManagerItemPrivate;
+struct InfoContextManagerItemPrivate;
class InfoContextManagerItem : public AbstractContextManagerItem {
Q_OBJECT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/kipiimagecollectionselector.h new/kdegraphics-4.1.96/gwenview/app/kipiimagecollectionselector.h
--- old/kdegraphics-4.1.87/gwenview/app/kipiimagecollectionselector.h 2008-05-21 10:32:43.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/kipiimagecollectionselector.h 2009-01-06 18:19:37.000000000 +0100
@@ -35,7 +35,7 @@
namespace Gwenview {
-class KIPIImageCollectionSelectorPrivate;
+struct KIPIImageCollectionSelectorPrivate;
class KIPIImageCollectionSelector : public KIPI::ImageCollectionSelector {
Q_OBJECT
public:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/kipiinterface.cpp new/kdegraphics-4.1.96/gwenview/app/kipiinterface.cpp
--- old/kdegraphics-4.1.87/gwenview/app/kipiinterface.cpp 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/kipiinterface.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -86,6 +86,46 @@
void setDescription(const QString&) {}
+ int angle() {
+ loadMetaInfo();
+
+ if (!mMetaInfo.isValid()) {
+ return 0;
+ }
+
+ const KFileMetaInfoItem& mii = mMetaInfo.item("http://freedesktop.org/standards/xesam/1.0/core#orientation");
+ bool ok = false;
+ const Orientation orientation = (Orientation)mii.value().toInt(&ok);
+ if (!ok) {
+ return 0;
+ }
+
+ switch(orientation) {
+ case NOT_AVAILABLE:
+ case NORMAL:
+ return 0;
+
+ case ROT_90:
+ return 90;
+
+ case ROT_180:
+ return 180;
+
+ case ROT_270:
+ return 270;
+
+ case HFLIP:
+ case VFLIP:
+ case TRANSPOSE:
+ case TRANSVERSE:
+ kWarning() << "Can't represent an orientation value of" << orientation << "as an angle (" << _url << ')';
+ return 0;
+ }
+
+ kWarning() << "Don't know how to handle an orientation value of" << orientation << '(' << _url << ')';
+ return 0;
+ }
+
QMap attributes() {
return QMap();
}
@@ -95,6 +135,15 @@
void clearAttributes() {}
void addAttributes(const QMap&) {}
+
+private:
+ KFileMetaInfo mMetaInfo;
+
+ void loadMetaInfo() {
+ if (!mMetaInfo.isValid()) {
+ mMetaInfo = KFileMetaInfo(_url);
+ }
+ }
};
const QRegExp KIPIImageInfo::sExtensionRE("\\.[a-z0-9]+$", Qt::CaseInsensitive );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/kipiinterface.h new/kdegraphics-4.1.96/gwenview/app/kipiinterface.h
--- old/kdegraphics-4.1.87/gwenview/app/kipiinterface.h 2008-07-15 21:48:47.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/kipiinterface.h 2009-01-06 18:19:37.000000000 +0100
@@ -27,7 +27,7 @@
namespace Gwenview {
-class KIPIInterfacePrivate;
+struct KIPIInterfacePrivate;
class MainWindow;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/mainwindow.cpp new/kdegraphics-4.1.96/gwenview/app/mainwindow.cpp
--- old/kdegraphics-4.1.87/gwenview/app/mainwindow.cpp 2009-01-01 17:24:40.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/mainwindow.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -299,13 +299,13 @@
mWindow, SLOT(reduceLevelOfDetails()) );
mGoToPreviousAction = view->addAction("go_previous",mWindow, SLOT(goToPrevious()));
- mGoToPreviousAction->setIcon(KIcon("media-seek-backward"));
+ mGoToPreviousAction->setIcon(KIcon("media-skip-backward"));
mGoToPreviousAction->setText(i18nc("@action Go to previous image", "Previous"));
mGoToPreviousAction->setToolTip(i18n("Go to Previous Image"));
mGoToPreviousAction->setShortcut(Qt::Key_Backspace);
mGoToNextAction = view->addAction("go_next",mWindow, SLOT(goToNext()));
- mGoToNextAction->setIcon(KIcon("media-seek-forward"));
+ mGoToNextAction->setIcon(KIcon("media-skip-forward"));
mGoToNextAction->setText(i18nc("@action Go to next image", "Next"));
mGoToNextAction->setToolTip(i18n("Go to Next Image"));
mGoToNextAction->setShortcut(Qt::Key_Space);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/mainwindow.h new/kdegraphics-4.1.96/gwenview/app/mainwindow.h
--- old/kdegraphics-4.1.87/gwenview/app/mainwindow.h 2009-01-01 17:24:40.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/mainwindow.h 2009-01-06 18:19:37.000000000 +0100
@@ -134,7 +134,7 @@
void toggleMenuBar();
private:
- class Private;
+ struct Private;
MainWindow::Private* const d;
void openSelectedDocument();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/semanticinfocontextmanageritem.h new/kdegraphics-4.1.96/gwenview/app/semanticinfocontextmanageritem.h
--- old/kdegraphics-4.1.87/gwenview/app/semanticinfocontextmanageritem.h 2008-11-28 16:33:11.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/semanticinfocontextmanageritem.h 2009-01-06 18:19:37.000000000 +0100
@@ -34,7 +34,7 @@
namespace Gwenview {
-class SemanticInfoContextManagerItemPrivate;
+struct SemanticInfoContextManagerItemPrivate;
class SemanticInfoContextManagerItem : public AbstractContextManagerItem {
Q_OBJECT
public:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/slideshow.desktop new/kdegraphics-4.1.96/gwenview/app/slideshow.desktop
--- old/kdegraphics-4.1.87/gwenview/app/slideshow.desktop 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/slideshow.desktop 2009-01-06 18:19:37.000000000 +0100
@@ -28,7 +28,7 @@
Name[nn]=Start ei lysbiletframvising
Name[pl]=Uruchom pokaz slajdów
Name[pt]=Iniciar uma Apresentação
-Name[pt_BR]=Iniciar uma apresentação
+Name[pt_BR]=Iniciar uma apresentação de slides
Name[ro]=Pornește o prezentare
Name[ru]=Запустить слайд-шоу
Name[sl]=Začni predstavitev
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/thumbnailbarview.h new/kdegraphics-4.1.96/gwenview/app/thumbnailbarview.h
--- old/kdegraphics-4.1.87/gwenview/app/thumbnailbarview.h 2008-08-14 12:44:44.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/thumbnailbarview.h 2009-01-06 18:19:37.000000000 +0100
@@ -35,7 +35,7 @@
namespace Gwenview {
-class ThumbnailBarItemDelegatePrivate;
+struct ThumbnailBarItemDelegatePrivate;
class ThumbnailBarItemDelegate : public QAbstractItemDelegate {
Q_OBJECT
@@ -52,7 +52,7 @@
private:
ThumbnailBarItemDelegatePrivate* const d;
- friend class ThumbnailBarItemDelegatePrivate;
+ friend struct ThumbnailBarItemDelegatePrivate;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/thumbnailviewhelper.cpp new/kdegraphics-4.1.96/gwenview/app/thumbnailviewhelper.cpp
--- old/kdegraphics-4.1.87/gwenview/app/thumbnailviewhelper.cpp 2008-12-04 09:34:08.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/thumbnailviewhelper.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -83,7 +83,7 @@
}
Document::Ptr doc = factory->load(url);
- if (!doc->loadingState() == Document::Loaded) {
+ if (doc->loadingState() != Document::Loaded) {
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/thumbnailviewhelper.h new/kdegraphics-4.1.96/gwenview/app/thumbnailviewhelper.h
--- old/kdegraphics-4.1.87/gwenview/app/thumbnailviewhelper.h 2008-10-17 13:00:03.000000000 +0200
+++ new/kdegraphics-4.1.96/gwenview/app/thumbnailviewhelper.h 2009-01-06 18:19:37.000000000 +0100
@@ -32,7 +32,7 @@
namespace Gwenview {
-class ThumbnailViewHelperPrivate;
+struct ThumbnailViewHelperPrivate;
class ThumbnailViewHelper : public AbstractThumbnailViewHelper {
Q_OBJECT
public:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/app/thumbnailviewpanel.h new/kdegraphics-4.1.96/gwenview/app/thumbnailviewpanel.h
--- old/kdegraphics-4.1.87/gwenview/app/thumbnailviewpanel.h 2009-01-01 17:24:40.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/app/thumbnailviewpanel.h 2009-01-06 18:19:37.000000000 +0100
@@ -39,7 +39,7 @@
class SortedDirModel;
class ThumbnailView;
-class ThumbnailViewPanelPrivate;
+struct ThumbnailViewPanelPrivate;
/**
* This class contains all the necessary widgets displayed in browse mode:
* the thumbnail view, the url navigator, the bottom bar.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/lib/documentview/documentview.cpp new/kdegraphics-4.1.96/gwenview/lib/documentview/documentview.cpp
--- old/kdegraphics-4.1.87/gwenview/lib/documentview/documentview.cpp 2009-01-01 17:24:41.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/lib/documentview/documentview.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -238,7 +238,7 @@
qreal computeMinimumZoom() const {
// There is no point zooming out less than zoomToFit, but make sure it does
// not get too small either
- return qMax(0.001, qMin(mAdapter->computeZoomToFit(), 1.));
+ return qMax(0.001, qMin(double(mAdapter->computeZoomToFit()), 1.));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/lib/redeyereduction/redeyereductionimageoperation.cpp new/kdegraphics-4.1.96/gwenview/lib/redeyereduction/redeyereductionimageoperation.cpp
--- old/kdegraphics-4.1.87/gwenview/lib/redeyereduction/redeyereductionimageoperation.cpp 2008-12-21 21:18:59.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/lib/redeyereduction/redeyereductionimageoperation.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -106,7 +106,7 @@
axs = ramp(sat);
}
- return qBound(0., src.alphaF() * axs, 1.);
+ return qBound(0., double(src.alphaF()) * axs, 1.);
}
@@ -115,7 +115,7 @@
const qreal radius = rectF.width() / 2;
const qreal centerX = rectF.x() + radius;
const qreal centerY = rectF.y() + radius;
- const Ramp radiusRamp(qMin(radius * 0.7, radius - 1), radius, 1., 0.);
+ const Ramp radiusRamp(qMin(double(radius * 0.7), double(radius - 1)), radius, 1., 0.);
uchar* line = img->scanLine(rect.top()) + rect.left() * 4;
for (int y = rect.top(); y < rect.bottom(); ++y, line += img->bytesPerLine()) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/gwenview/lib/thumbnailview/previewitemdelegate.cpp new/kdegraphics-4.1.96/gwenview/lib/thumbnailview/previewitemdelegate.cpp
--- old/kdegraphics-4.1.87/gwenview/lib/thumbnailview/previewitemdelegate.cpp 2009-01-01 17:24:41.000000000 +0100
+++ new/kdegraphics-4.1.96/gwenview/lib/thumbnailview/previewitemdelegate.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -249,6 +249,7 @@
bool hoverEventFilter(QHoverEvent* event) {
QModelIndex index = mView->indexAt(event->pos());
if (mIndexUnderCursor.isValid()) {
+ // Always repaint in case we are over the rating row
mView->update(mIndexUnderCursor);
}
if (index == mIndexUnderCursor) {
@@ -302,14 +303,16 @@
}
#endif
- bool mouseReleaseEventFilter() {
+ bool mouseButtonEventFilter(QEvent::Type type) {
#ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
const QRect rect = ratingRectFromIndexRect(mView->visualRect(mIndexUnderCursor));
const int rating = ratingFromCursorPosition(rect);
if (rating == -1) {
return false;
}
- that->setDocumentRatingRequested(urlForIndex(mIndexUnderCursor) , rating);
+ if (type == QEvent::MouseButtonRelease) {
+ that->setDocumentRatingRequested(urlForIndex(mIndexUnderCursor) , rating);
+ }
return true;
#else
return false;
@@ -612,8 +615,9 @@
case QEvent::HoverLeave:
return d->hoverEventFilter(static_cast(event));
+ case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
- return d->mouseReleaseEventFilter();
+ return d->mouseButtonEventFilter(event->type());
default:
return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/kcolorchooser/CMakeLists.txt new/kdegraphics-4.1.96/kcolorchooser/CMakeLists.txt
--- old/kdegraphics-4.1.87/kcolorchooser/CMakeLists.txt 2008-05-29 13:18:37.000000000 +0200
+++ new/kdegraphics-4.1.96/kcolorchooser/CMakeLists.txt 2009-01-06 18:19:42.000000000 +0100
@@ -2,6 +2,7 @@
set(kcolorchooser_SRCS kcolorchooser.cpp )
+kde4_add_app_icon(kcolorchooser_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kcolorchooser.png")
kde4_add_executable(kcolorchooser ${kcolorchooser_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/kolourpaint/CMakeLists.txt new/kdegraphics-4.1.96/kolourpaint/CMakeLists.txt
--- old/kdegraphics-4.1.87/kolourpaint/CMakeLists.txt 2008-11-28 16:33:12.000000000 +0100
+++ new/kdegraphics-4.1.96/kolourpaint/CMakeLists.txt 2009-01-06 18:19:39.000000000 +0100
@@ -583,6 +583,8 @@
# Executable
#
+kde4_add_app_icon(kolourpaint_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-kolourpaint.png")
+
kde4_add_executable(kolourpaint ${kolourpaint_SRCS})
if( MINGW )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/kruler/CMakeLists.txt new/kdegraphics-4.1.96/kruler/CMakeLists.txt
--- old/kdegraphics-4.1.87/kruler/CMakeLists.txt 2008-12-21 21:19:06.000000000 +0100
+++ new/kdegraphics-4.1.96/kruler/CMakeLists.txt 2009-01-06 18:19:39.000000000 +0100
@@ -6,6 +6,7 @@
set(kruler_SRCS qautosizelabel.cpp klineal.cpp main.cpp)
+kde4_add_app_icon(kruler_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-apps-kruler.png")
kde4_add_executable(kruler ${kruler_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/ksnapshot/CMakeLists.txt new/kdegraphics-4.1.96/ksnapshot/CMakeLists.txt
--- old/kdegraphics-4.1.87/ksnapshot/CMakeLists.txt 2008-08-07 17:20:51.000000000 +0200
+++ new/kdegraphics-4.1.96/ksnapshot/CMakeLists.txt 2009-01-06 18:19:39.000000000 +0100
@@ -20,6 +20,8 @@
kde4_add_ui_files(ksnapshot_SRCS ksnapshotwidget.ui)
+kde4_add_app_icon(ksnapshot_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-ksnapshot.png")
+
kde4_add_executable(ksnapshot ${ksnapshot_SRCS})
target_link_libraries(ksnapshot ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/ksnapshot/ksnapshotobject.cpp new/kdegraphics-4.1.96/ksnapshot/ksnapshotobject.cpp
--- old/kdegraphics-4.1.87/ksnapshot/ksnapshotobject.cpp 2008-08-14 12:44:45.000000000 +0200
+++ new/kdegraphics-4.1.96/ksnapshot/ksnapshotobject.cpp 2009-01-07 01:13:34.000000000 +0100
@@ -65,7 +65,7 @@
QString numAsStr = numSearch.capturedTexts()[ 2 ];
QString number = QString::number( numAsStr.toInt() + 1 );
number = number.rightJustified( numAsStr.length(), '0' );
- name.replace( start, number.length(), number );
+ name.replace( start, numAsStr.length(), number );
}
else {
// no number
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkdcraw/libraw/internal/dcraw_common.cpp new/kdegraphics-4.1.96/libs/libkdcraw/libraw/internal/dcraw_common.cpp
--- old/kdegraphics-4.1.87/libs/libkdcraw/libraw/internal/dcraw_common.cpp 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkdcraw/libraw/internal/dcraw_common.cpp 2009-01-06 18:19:36.000000000 +0100
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Thu Dec 11 18:24:22 2008
+ Generated from dcraw/dcraw.c at Sun Jan 4 16:41:18 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
@@ -1462,6 +1462,7 @@
if (!ljpeg_start (&jh, 0)) return;
free (jh.row);
+ order = 0x4949;
ph1_bits(-1);
for (row=-top_margin; row < height; row++) {
pred[0] = pred[1] = 0x8000;
@@ -1475,6 +1476,7 @@
diff = ph1_bits(len[i]);
if ((diff & (1 << (len[i]-1))) == 0)
diff -= (1 << len[i]) - 1;
+ if (diff == 65535) diff = -32768;
pred[i] += diff;
if (row >= 0 && (unsigned)(col+i) < width)
BAYER(row,col+i) = pred[i];
@@ -1511,7 +1513,7 @@
}
}
-#line 1808 "dcraw/dcraw.c"
+#line 1810 "dcraw/dcraw.c"
void CLASS sinar_4shot_load_raw()
{
ushort *pixel;
@@ -2058,7 +2060,7 @@
#endif
jpeg_destroy_decompress (&cinfo);
throw LIBRAW_EXCEPTION_DECODE_JPEG;
-#line 2357 "dcraw/dcraw.c"
+#line 2359 "dcraw/dcraw.c"
}
buf = (*cinfo.mem->alloc_sarray)
((j_common_ptr) &cinfo, JPOOL_IMAGE, width*3, 1);
@@ -2566,7 +2568,7 @@
smal_decode_segment (seg+i, holes);
if (holes) fill_holes (holes);
}
-#line 3562 "dcraw/dcraw.c"
+#line 3564 "dcraw/dcraw.c"
/*
Seach from the current directory up to the root looking for
@@ -2582,7 +2584,7 @@
RUN_CALLBACK(LIBRAW_PROGRESS_BAD_PIXELS,0,2);
if (fname)
fp = fopen (fname, "r");
-#line 3603 "dcraw/dcraw.c"
+#line 3605 "dcraw/dcraw.c"
if (!fp)
{
imgdata.process_warnings |= LIBRAW_WARN_NO_BADPIXELMAP;
@@ -3873,7 +3875,7 @@
}
}
-#line 4897 "dcraw/dcraw.c"
+#line 4899 "dcraw/dcraw.c"
void CLASS parse_makernote (int base, int uptag)
{
static const uchar xlat[2][256] = {
@@ -4359,7 +4361,7 @@
}
}
-#line 5386 "dcraw/dcraw.c"
+#line 5388 "dcraw/dcraw.c"
int CLASS parse_tiff_ifd (int base)
{
unsigned entries, tag, type, len, plen=16, save;
@@ -4605,6 +4607,7 @@
ima_len = len;
break;
case 46279:
+ if (!ima_len) break;
fseek (ifp, 78, SEEK_CUR);
raw_width = get4();
raw_height = get4();
@@ -4939,7 +4942,7 @@
void CLASS parse_external_jpeg()
{
char *file, *ext, *jname, *jfile, *jext;
-#line 5969 "dcraw/dcraw.c"
+#line 5972 "dcraw/dcraw.c"
ext = strrchr (ifname, '.');
file = strrchr (ifname, '/');
if (!file) file = strrchr (ifname, '\\');
@@ -4982,7 +4985,7 @@
#endif
}
free (jname);
-#line 6014 "dcraw/dcraw.c"
+#line 6017 "dcraw/dcraw.c"
}
/*
@@ -5423,7 +5426,7 @@
data_offset = (INT64) get4() + 8;
data_offset += (INT64) get4() << 32;
}
-#line 6559 "dcraw/dcraw.c"
+#line 6562 "dcraw/dcraw.c"
void CLASS adobe_coeff (const char *p_make, const char *p_model)
{
static const struct {
@@ -7251,7 +7254,7 @@
if (strcmp (input, "embed"))
hInProfile = cmsOpenProfileFromFile (input, "r");
else if (profile_length) {
-#line 8394 "dcraw/dcraw.c"
+#line 8397 "dcraw/dcraw.c"
hInProfile = cmsOpenProfileFromMem (imgdata.color.profile, profile_length);
} else
{
@@ -7401,7 +7404,7 @@
#endif
memset(histogram,0,sizeof(int)*LIBRAW_HISTOGRAM_SIZE*4);
-#line 8546 "dcraw/dcraw.c"
+#line 8549 "dcraw/dcraw.c"
for (img=image[0], row=0; row < height; row++)
for (col=0; col < width; col++, img+=4) {
if (!raw_color) {
@@ -7542,7 +7545,7 @@
}
-#line 8711 "dcraw/dcraw.c"
+#line 8714 "dcraw/dcraw.c"
void CLASS tiff_set (ushort *ntag,
ushort tag, ushort type, int count, int val)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkdcraw/libraw/internal/defines.h new/kdegraphics-4.1.96/libs/libkdcraw/libraw/internal/defines.h
--- old/kdegraphics-4.1.87/libs/libkdcraw/libraw/internal/defines.h 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkdcraw/libraw/internal/defines.h 2009-01-06 18:19:36.000000000 +0100
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Thu Dec 11 18:24:22 2008
+ Generated from dcraw/dcraw.c at Sun Jan 4 16:41:18 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkdcraw/libraw/internal/foveon.cpp new/kdegraphics-4.1.96/libs/libkdcraw/libraw/internal/foveon.cpp
--- old/kdegraphics-4.1.87/libs/libkdcraw/libraw/internal/foveon.cpp 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkdcraw/libraw/internal/foveon.cpp 2009-01-06 18:19:36.000000000 +0100
@@ -1,11 +1,11 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Thu Dec 11 18:24:22 2008
+ Generated from dcraw/dcraw.c at Sun Jan 4 16:41:18 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
-#line 2866 "dcraw/dcraw.c"
+#line 2868 "dcraw/dcraw.c"
#define CLASS LibRaw::
#include "libraw/libraw_types.h"
#define LIBRAW_LIBRARY_BUILD
@@ -16,7 +16,7 @@
#define SRC_USES_CURVE
#include "internal/var_defines.h"
#define sget4(s) sget4((uchar *)s)
-#line 2878 "dcraw/dcraw.c"
+#line 2880 "dcraw/dcraw.c"
/* RESTRICTED code starts here */
@@ -38,7 +38,7 @@
cur = free_decode++;
if (free_decode > first_decode+2048) {
throw LIBRAW_EXCEPTION_DECODE_RAW;
-#line 2903 "dcraw/dcraw.c"
+#line 2905 "dcraw/dcraw.c"
}
if (code)
for (i=0; i < size; i++)
@@ -270,12 +270,12 @@
return i < 0 ? -curve[1-i] : curve[1+i];
}
-#line 3137 "dcraw/dcraw.c"
+#line 3139 "dcraw/dcraw.c"
#ifdef image
#undef image
#endif
#define image ((short(*)[4]) imgdata.image)
-#line 3144 "dcraw/dcraw.c"
+#line 3146 "dcraw/dcraw.c"
void CLASS foveon_interpolate()
{
@@ -692,7 +692,7 @@
#undef image
/* RESTRICTED code ends here */
-#line 6457 "dcraw/dcraw.c"
+#line 6460 "dcraw/dcraw.c"
char * CLASS foveon_gets (int offset, char *str, int len)
{
int i;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkdcraw/libraw/libraw/libraw_version.h new/kdegraphics-4.1.96/libs/libkdcraw/libraw/libraw/libraw_version.h
--- old/kdegraphics-4.1.87/libs/libkdcraw/libraw/libraw/libraw_version.h 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkdcraw/libraw/libraw/libraw_version.h 2009-01-06 18:19:36.000000000 +0100
@@ -26,7 +26,7 @@
#define LIBRAW_MAJOR_VERSION 0
#define LIBRAW_MINOR_VERSION 6
-#define LIBRAW_PATCH_VERSION 3
+#define LIBRAW_PATCH_VERSION 5
#define LIBRAW_VERSION_TAIL Release
#define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkdcraw/libraw/src/libraw_cxx.cpp new/kdegraphics-4.1.96/libs/libkdcraw/libraw/src/libraw_cxx.cpp
--- old/kdegraphics-4.1.87/libs/libkdcraw/libraw/src/libraw_cxx.cpp 2009-01-01 17:24:39.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkdcraw/libraw/src/libraw_cxx.cpp 2009-01-06 18:19:36.000000000 +0100
@@ -822,10 +822,10 @@
return errno;
if(!T.thumb)
- {
- fclose(tfp);
- return LIBRAW_OUT_OF_ORDER_CALL;
- }
+ {
+ fclose(tfp);
+ return LIBRAW_OUT_OF_ORDER_CALL;
+ }
try {
switch (T.tformat)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkdcraw/NEWS new/kdegraphics-4.1.96/libs/libkdcraw/NEWS
--- old/kdegraphics-4.1.87/libs/libkdcraw/NEWS 2008-12-21 21:18:58.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkdcraw/NEWS 2009-01-06 18:19:36.000000000 +0100
@@ -1,10 +1,14 @@
0.4.0 - Released with KDE 4.2.0
------------------------------------------------------------------------
-- Updated to LibRaw to 0.6.3 : NEF processing code changed (some overflow control added).
-- Updated to LibRaw to 0.6.2.
+- Updated to LibRaw 0.6.5 : Fixed file descriptor and buffer memory leak when thumbnail extractor is called,
+ but library object is not properly initialized.
+ Fixes in Imacon files unpacking.
+ Fixes in Hasselblad .fff files unpacking.
+- Updated to LibRaw 0.6.3 : NEF processing code changed (some overflow control added).
+- Updated to LibRaw 0.6.2.
- New cameras: Canon G10 & 5D Mk2, Leaf AFi 7, Leica D-LUX4,
Panasonic FX150 & G 1, Fujifilm IS Pro.
-- Updated to LibRaw to 0.6.1.
+- Updated to LibRaw 0.6.1.
- New cameras: Canon 50D, Sony A900, Nikon D90 & P6000, Panasonic LX3 FZ28.
- Ported to LibRaw Api 0.6.0. Removed dcraw.c and DcrawBinary class.
- Use kDebug(51002) instead qDebug().
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2exif.cpp new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2exif.cpp
--- old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2008-10-17 13:00:03.000000000 +0200
+++ new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -313,6 +313,8 @@
d->exifMetadata.erase(it);
return true;
}
+
+ return true;
}
catch( Exiv2::Error &e )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2.h new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2.h
--- old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2.h 2008-12-10 17:12:55.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2.h 2009-01-06 18:19:33.000000000 +0100
@@ -420,7 +420,7 @@
bool rationalWantSmallDenominator=true, bool setProgramName=true) const;
/** Remove the Exif tag 'exifTagName' from Exif metadata. Return true if tag is
- removed successfully.
+ removed successfully or if no tag was present.
*/
bool removeExifTag(const char *exifTagName, bool setProgramName=true) const;
@@ -521,7 +521,7 @@
bool setIptcTagData(const char *iptcTagName, const QByteArray& data, bool setProgramName=true) const;
/** Remove the all instance of Iptc tags 'iptcTagName' from Iptc metadata. Return true if all
- tags have been removed successfully.
+ tags have been removed successfully (or none were present).
*/
bool removeIptcTag(const char *iptcTagName, bool setProgramName=true) const;
@@ -755,7 +755,7 @@
bool registerXmpNameSpace(const QString& uri, const QString& prefix) const;
/** Remove the Xmp tag 'xmpTagName' from Xmp metadata. Return true if tag is
- removed successfully.
+ removed successfully or if no tag was present.
*/
bool removeXmpTag(const char *xmpTagName, bool setProgramName=true) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2private.h new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2private.h
--- old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2private.h 2008-11-19 11:17:35.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2private.h 2009-01-06 18:19:33.000000000 +0100
@@ -21,6 +21,10 @@
*
* ============================================================ */
+#ifndef KEXIV2PRIVATE_H
+#define KEXIV2PRIVATE_H
+
+
// C++ includes.
#include <cstdlib>
@@ -135,3 +139,4 @@
};
} // NameSpace KExiv2Iface
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp
--- old/kdegraphics-4.1.87/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2008-11-12 17:37:00.000000000 +0100
+++ new/kdegraphics-4.1.96/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -790,6 +790,8 @@
d->xmpMetadata.erase(it);
return true;
}
+
+ return true;
}
catch( Exiv2::Error &e )
{
@@ -816,7 +818,7 @@
QStringList oldkeys = getXmpKeywords();
QStringList newkeys = newKeywords;
- // Create a list of keywords including old one witch already exists.
+ // Create a list of keywords including old one which already exists.
for (QStringList::const_iterator it = oldkeys.constBegin(); it != oldkeys.constEnd(); ++it )
{
if (!newkeys.contains(*it))
@@ -824,7 +826,7 @@
}
if (setXmpTagStringBag("Xmp.dc.subject", newkeys, false))
- return false;
+ return true;
#endif // _XMP_SUPPORT_
@@ -846,7 +848,7 @@
const QStringList oldSubCat = getXmpSubCategories();
QStringList newSubCat = newSubCategories;
- // Create a list of sub-categories including old one witch already exists.
+ // Create a list of sub-categories including old one which already exists.
for (QStringList::const_iterator it = oldSubCat.constBegin(); it != oldSubCat.constEnd(); ++it )
{
if (!newSubCat.contains(*it))
@@ -854,7 +856,7 @@
}
if (setXmpTagStringBag("Xmp.photoshop.SupplementalCategories", newSubCat, false))
- return false;
+ return true;
#endif // _XMP_SUPPORT_
@@ -876,7 +878,7 @@
QStringList oldSubjectCodes = getXmpSubjects();
QStringList newSubjectCodes = newSubjects;
- // Create a list of sub-categories including old one witch already exists.
+ // Create a list of sub-categories including old one which already exists.
for (QStringList::const_iterator it = oldSubjectCodes.constBegin(); it != oldSubjectCodes.constEnd(); ++it )
{
if (!newSubjectCodes.contains(*it))
@@ -884,7 +886,7 @@
}
if (setXmpTagStringBag("Xmp.iptc.SubjectCode", newSubjectCodes, false))
- return false;
+ return true;
#endif // _XMP_SUPPORT_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/core/document.cpp new/kdegraphics-4.1.96/okular/core/document.cpp
--- old/kdegraphics-4.1.87/okular/core/document.cpp 2008-12-21 21:19:00.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/core/document.cpp 2009-01-06 18:19:37.000000000 +0100
@@ -680,6 +680,10 @@
m_pagesVector.clear();
delete m_tempFile;
m_tempFile = 0;
+
+ // TODO: emit a message telling the document is empty
+
+ openOk = false;
}
return openOk;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/core/version.h new/kdegraphics-4.1.96/okular/core/version.h
--- old/kdegraphics-4.1.87/okular/core/version.h 2008-07-22 02:01:12.000000000 +0200
+++ new/kdegraphics-4.1.96/okular/core/version.h 2009-01-07 01:13:34.000000000 +0100
@@ -10,10 +10,10 @@
#ifndef _OKULAR_VERSION_H_
#define _OKULAR_VERSION_H_
-#define OKULAR_VERSION_STRING "0.7.80"
+#define OKULAR_VERSION_STRING "0.7.90"
#define OKULAR_VERSION_MAJOR 0
#define OKULAR_VERSION_MINOR 7
-#define OKULAR_VERSION_RELEASE 80
+#define OKULAR_VERSION_RELEASE 90
#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.1.87/okular/generators/dvi/pageSize.h new/kdegraphics-4.1.96/okular/generators/dvi/pageSize.h
--- old/kdegraphics-4.1.87/okular/generators/dvi/pageSize.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/generators/dvi/pageSize.h 2009-01-06 18:19:38.000000000 +0100
@@ -142,6 +142,7 @@
@param height_in_mm page height in mm
*/
virtual void setPageSize(double width_in_mm, double height_in_mm);
+ using SimplePageSize::setPageSize;
/** \brief Copy operator.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/generators/ooo/converter.cpp new/kdegraphics-4.1.96/okular/generators/ooo/converter.cpp
--- old/kdegraphics-4.1.87/okular/generators/ooo/converter.cpp 2008-07-03 07:05:14.000000000 +0200
+++ new/kdegraphics-4.1.96/okular/generators/ooo/converter.cpp 2009-01-06 18:19:39.000000000 +0100
@@ -195,7 +195,7 @@
if ( !convertHeader( mCursor, child ) )
return false;
} else if ( child.tagName() == QLatin1String( "list" ) ) {
- if ( !convertList( child ) )
+ if ( !convertList( mCursor, child ) )
return false;
} else if ( child.tagName() == QLatin1String( "table" ) ) {
if ( !convertTable( child ) )
@@ -321,21 +321,21 @@
return true;
}
-bool Converter::convertList( const QDomElement &element )
+bool Converter::convertList( QTextCursor *cursor, const QDomElement &element )
{
const QString styleName = element.attribute( "style-name" );
const ListFormatProperty property = mStyleInformation->listProperty( styleName );
QTextListFormat format;
- if ( mCursor->currentList() ) { // we are in a nested list
- format = mCursor->currentList()->format();
+ if ( cursor->currentList() ) { // we are in a nested list
+ format = cursor->currentList()->format();
format.setIndent( format.indent() + 1 );
}
property.apply( &format, 0 );
- QTextList *list = mCursor->insertList( format );
+ QTextList *list = cursor->insertList( format );
QDomElement itemChild = element.firstChildElement();
int loop = 0;
@@ -350,17 +350,17 @@
if ( childElement.tagName() == QLatin1String( "p" ) ) {
if ( loop > 1 )
- mCursor->insertBlock();
+ cursor->insertBlock();
- prevBlock = mCursor->block();
+ prevBlock = cursor->block();
- if ( !convertParagraph( mCursor, childElement, QTextBlockFormat(), true ) )
+ if ( !convertParagraph( cursor, childElement, QTextBlockFormat(), true ) )
return false;
} else if ( childElement.tagName() == QLatin1String( "list" ) ) {
- prevBlock = mCursor->block();
+ prevBlock = cursor->block();
- if ( !convertList( childElement ) )
+ if ( !convertList( cursor, childElement ) )
return false;
}
@@ -391,6 +391,7 @@
*/
int rowCounter = 0;
int columnCounter = 0;
+
QQueue<QDomNode> nodeQueue;
enqueueNodeList( nodeQueue, element.childNodes() );
while ( !nodeQueue.isEmpty() ) {
@@ -420,6 +421,7 @@
* Create table
*/
QTextTable *table = mCursor->insertTable( rowCounter, columnCounter );
+ mCursor->movePosition( QTextCursor::End );
/**
* Fill table
@@ -450,11 +452,24 @@
while ( !paragraphElement.isNull() ) {
if ( paragraphElement.tagName() == QLatin1String( "p" ) ) {
QTextTableCell cell = table->cellAt( rowCounter, columnCounter );
- QTextCursor cursor = cell.firstCursorPosition();
- cursor.setBlockFormat( format );
+ // Insert a frame into the cell and work on that, so we can handle
+ // different parts of the cell having different block formatting
+ QTextCursor cellCursor = cell.lastCursorPosition();
+ QTextFrameFormat frameFormat;
+ frameFormat.setMargin( 1 ); // TODO: this shouldn't be hard coded
+ QTextFrame *frame = cellCursor.insertFrame( frameFormat );
+ QTextCursor frameCursor = frame->firstCursorPosition();
+ frameCursor.setBlockFormat( format );
- if ( !convertParagraph( &cursor, paragraphElement, format ) )
+ if ( !convertParagraph( &frameCursor, paragraphElement, format ) )
+ return false;
+ } else if ( paragraphElement.tagName() == QLatin1String( "list" ) ) {
+ QTextTableCell cell = table->cellAt( rowCounter, columnCounter );
+ // insert a list into the cell
+ QTextCursor cellCursor = cell.lastCursorPosition();
+ if ( !convertList( &cellCursor, paragraphElement ) ) {
return false;
+ }
}
paragraphElement = paragraphElement.nextSiblingElement();
@@ -467,7 +482,11 @@
rowCounter++;
} else if ( el.tagName() == QLatin1String( "table-column" ) ) {
const StyleFormatProperty property = mStyleInformation->styleProperty( el.attribute( "style-name" ) );
- property.applyTableColumn( &tableFormat );
+ const QString tableColumnNumColumnsRepeated = el.attribute( "number-columns-repeated", "1" );
+ int numColumnsToApplyTo = tableColumnNumColumnsRepeated.toInt();
+ for (int i = 0; i < numColumnsToApplyTo; ++i) {
+ property.applyTableColumn( &tableFormat );
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/generators/ooo/converter.h new/kdegraphics-4.1.96/okular/generators/ooo/converter.h
--- old/kdegraphics-4.1.87/okular/generators/ooo/converter.h 2008-02-28 18:05:37.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/generators/ooo/converter.h 2009-01-06 18:19:39.000000000 +0100
@@ -40,7 +40,7 @@
bool convertTextNode( QTextCursor *cursor, const QDomText &element, const QTextCharFormat &format );
bool convertSpan( QTextCursor *cursor, const QDomElement &element, const QTextCharFormat &format );
bool convertLink( QTextCursor *cursor, const QDomElement &element, const QTextCharFormat &format );
- bool convertList( const QDomElement &element );
+ bool convertList( QTextCursor *cursor, const QDomElement &element );
bool convertTable( const QDomElement &element );
bool convertFrame( const QDomElement &element );
bool convertAnnotation( QTextCursor *cursor, const QDomElement &element );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/generators/ooo/formatproperty.cpp new/kdegraphics-4.1.96/okular/generators/ooo/formatproperty.cpp
--- old/kdegraphics-4.1.87/okular/generators/ooo/formatproperty.cpp 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/generators/ooo/formatproperty.cpp 2009-01-06 18:19:39.000000000 +0100
@@ -64,6 +64,11 @@
mWritingMode = mode;
}
+bool ParagraphFormatProperty::writingModeIsRightToLeft() const
+{
+ return ( ( mWritingMode == RLTB ) || ( mWritingMode == TBRL ) || ( mWritingMode == RL ) );
+}
+
void ParagraphFormatProperty::setTextAlignment( Qt::Alignment alignment )
{
mHasAlignment = true;
@@ -365,12 +370,15 @@
}
TableColumnFormatProperty::TableColumnFormatProperty()
- : mWidth( 0 )
+ : mWidth( 0 ), isValid( false )
{
}
void TableColumnFormatProperty::apply( QTextTableFormat *format ) const
{
+ if ( ! isValid ) {
+ return;
+ }
QVector<QTextLength> lengths = format->columnWidthConstraints();
lengths.append( QTextLength( QTextLength::FixedLength, mWidth ) );
@@ -380,6 +388,7 @@
void TableColumnFormatProperty::setWidth( double width )
{
mWidth = width;
+ isValid = true;
}
TableCellFormatProperty::TableCellFormatProperty()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/generators/ooo/formatproperty.h new/kdegraphics-4.1.96/okular/generators/ooo/formatproperty.h
--- old/kdegraphics-4.1.87/okular/generators/ooo/formatproperty.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/generators/ooo/formatproperty.h 2009-01-06 18:19:38.000000000 +0100
@@ -60,6 +60,8 @@
void setTextAlignment( Qt::Alignment alignment );
void setBackgroundColor( const QColor &color );
+ bool writingModeIsRightToLeft() const;
+
private:
int mPageNumber;
WritingMode mWritingMode;
@@ -171,6 +173,7 @@
private:
double mWidth;
+ bool isValid;
};
class TableCellFormatProperty
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/generators/ooo/styleparser.cpp new/kdegraphics-4.1.96/okular/generators/ooo/styleparser.cpp
--- old/kdegraphics-4.1.87/okular/generators/ooo/styleparser.cpp 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/generators/ooo/styleparser.cpp 2009-01-06 18:19:39.000000000 +0100
@@ -291,6 +291,15 @@
alignMap.insert( "center", Qt::AlignCenter );
alignMap.insert( "left", Qt::AlignLeft );
alignMap.insert( "right", Qt::AlignRight );
+ alignMap.insert( "justify", Qt::AlignJustify );
+ if ( property.writingModeIsRightToLeft() ) {
+ alignMap.insert( "start", Qt::AlignRight );
+ alignMap.insert( "end", Qt::AlignLeft );
+ } else {
+ // not right to left
+ alignMap.insert( "start", Qt::AlignLeft );
+ alignMap.insert( "end", Qt::AlignRight );
+ }
}
if ( parent.hasAttribute( "text-align" ) ) {
property.setTextAlignment( alignMap[ parent.attribute( "text-align", "left" ) ] );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/shell/CMakeLists.txt new/kdegraphics-4.1.96/okular/shell/CMakeLists.txt
--- old/kdegraphics-4.1.87/okular/shell/CMakeLists.txt 2008-05-29 13:18:37.000000000 +0200
+++ new/kdegraphics-4.1.96/okular/shell/CMakeLists.txt 2009-01-06 18:19:38.000000000 +0100
@@ -10,6 +10,7 @@
shell.cpp
)
+kde4_add_app_icon(okular_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/data/icons/hi*-apps-okular.png")
kde4_add_executable(okular ${okular_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/ui/data/CMakeLists.txt new/kdegraphics-4.1.96/okular/ui/data/CMakeLists.txt
--- old/kdegraphics-4.1.87/okular/ui/data/CMakeLists.txt 2008-11-19 11:17:39.000000000 +0100
+++ new/kdegraphics-4.1.96/okular/ui/data/CMakeLists.txt 2009-01-06 18:19:39.000000000 +0100
@@ -8,17 +8,17 @@
# install annotation tool images
install(FILES
-# tool_hl_orange.png
-# tool_hl_pink.png
- tool_hl_yellow.png
- tool_ink_green.png
- tool_note.png
- tool_line_okular.png
- tool_polygon_okular.png
- tool_ellipse_okular.png
+ tool-ellipse-okular.png
+ tool-highlighter-okular.png
+ tool-ink-okular.png
+ tool-line-okular.png
tool-note.png
+ tool-note-okular.png
tool-note-inline.png
- tool-stamp.png
+ tool-note-inline-okular.png
+ tool-polygon-okular.png
+ tool-stamp-okular.png
+ tool-underline-okular.png
DESTINATION ${DATA_INSTALL_DIR}/okular/pics)
# install annotation page images
install(FILES
Files old/kdegraphics-4.1.87/okular/ui/data/tool_ellipse_okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool_ellipse_okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-ellipse-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-ellipse-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-highlighter-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-highlighter-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-ink-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-ink-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool_line_okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool_line_okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-line-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-line-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-note-inline-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-note-inline-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-note-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-note-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool_polygon_okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool_polygon_okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-polygon-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-polygon-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-stamp-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-stamp-okular.png differ
Files old/kdegraphics-4.1.87/okular/ui/data/tool-stamp.png and new/kdegraphics-4.1.96/okular/ui/data/tool-stamp.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/ui/data/tools.xml new/kdegraphics-4.1.96/okular/ui/data/tools.xml
--- old/kdegraphics-4.1.87/okular/ui/data/tools.xml 2008-09-26 16:55:42.000000000 +0200
+++ new/kdegraphics-4.1.96/okular/ui/data/tools.xml 2009-01-06 18:19:39.000000000 +0100
@@ -17,63 +17,63 @@
Geom
-->
<annotatingTools>
- <tool id="1" name="Note" pixmap="tool-note">
+ <tool id="1" name="Note" pixmap="tool-note-okular">
<tooltip>Text Annotation</tooltip>
<engine type="PickPoint" color="#FFFF00" hoverIcon="tool-note">
<annotation type="Text" color="#FFFF00" />
</engine>
<shortcut>1</shortcut>
</tool>
- <tool id="2" name="Inline Note" pixmap="tool-note-inline">
+ <tool id="2" name="Inline Note" pixmap="tool-note-inline-okular">
<tooltip>Inline Text Annotation (drag to select a zone)</tooltip>
<engine type="PickPoint" color="#FFFF00" hoverIcon="tool-note-inline" block="true">
<annotation type="FreeText" color="#FFFF00" />
</engine>
<shortcut>2</shortcut>
</tool>
- <tool id="3" name="Green Highlighter" pixmap="draw-brush">
+ <tool id="3" name="Green Highlighter" pixmap="tool-ink-okular">
<tooltip>Green Ink</tooltip>
<engine type="SmoothLine" color="#00FF00">
<annotation type="Ink" color="#00FF00" width="2" />
</engine>
<shortcut>3</shortcut>
</tool>
- <tool id="5" name="Yellow Highlighter" pixmap="tool_hl_yellow">
+ <tool id="5" name="Yellow Highlighter" pixmap="tool-highlighter-okular">
<tooltip>Yellow Highlight</tooltip>
<engine type="TextSelector" color="#FFFF00">
<annotation type="Highlight" color="#FFFF00" />
</engine>
<shortcut>5</shortcut>
</tool>
- <tool id="6" name="Straight Yellow Line" pixmap="tool_line_okular">
+ <tool id="6" name="Straight Yellow Line" pixmap="tool-line-okular">
<tooltip>Straight Yellow Line</tooltip>
<engine type="PolyLine" color="#FFE000" points="2">
<annotation type="Line" width="4" color="#FFE000" />
</engine>
<shortcut>6</shortcut>
</tool>
- <tool id="7" name="Blue Polygon" pixmap="tool_polygon_okular">
+ <tool id="7" name="Blue Polygon" pixmap="tool-polygon-okular">
<tooltip>Draw a polygon (click on the first point to close it)</tooltip>
<engine type="PolyLine" color="#007EEE" points="-1">
<annotation type="Line" width="4" color="#007EEE" />
</engine>
<shortcut>7</shortcut>
</tool>
- <tool id="8" name="Stamp" pixmap="tool-stamp">
+ <tool id="8" name="Stamp" pixmap="tool-stamp-okular">
<tooltip>Put a stamp symbol</tooltip>
<engine type="PickPoint" hoverIcon="okular" size="64" block="true">
<annotation type="Stamp" icon="okular"/>
</engine>
<shortcut>8</shortcut>
</tool>
- <tool id="9" name="Black Underlining" pixmap="under">
+ <tool id="9" name="Black Underlining" pixmap="tool-underline-okular">
<tooltip>Underline the text with a black line</tooltip>
<engine type="TextSelector" color="#000000">
<annotation type="Underline" color="#000000" />
</engine>
<shortcut>9</shortcut>
</tool>
- <tool id="10" name="Cyan Ellipse" pixmap="tool_ellipse_okular">
+ <tool id="10" name="Cyan Ellipse" pixmap="tool-ellipse-okular">
<tooltip>A cyan ellipse</tooltip>
<engine type="PickPoint" color="#00ffff" block="true">
<annotation type="GeomCircle" color="#00ffff" />
Files old/kdegraphics-4.1.87/okular/ui/data/tool-underline-okular.png and new/kdegraphics-4.1.96/okular/ui/data/tool-underline-okular.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/okular/VERSION new/kdegraphics-4.1.96/okular/VERSION
--- old/kdegraphics-4.1.87/okular/VERSION 2008-07-22 02:01:16.000000000 +0200
+++ new/kdegraphics-4.1.96/okular/VERSION 2009-01-07 01:13:34.000000000 +0100
@@ -1 +1 @@
-okular v0.7.80
+okular v0.7.90
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.1.87/strigi-analyzer/xps/kfile_xps.cpp new/kdegraphics-4.1.96/strigi-analyzer/xps/kfile_xps.cpp
--- old/kdegraphics-4.1.87/strigi-analyzer/xps/kfile_xps.cpp 2008-04-18 09:21:25.000000000 +0200
+++ new/kdegraphics-4.1.96/strigi-analyzer/xps/kfile_xps.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -63,7 +63,7 @@
/*
addItemInfo(group, "Pages", i18n("Pages"), QVariant::Int);
*/
- addItemInfo(group, "Documents", i18n("NumDocuments"), QVariant::Int);
+ addItemInfo(group, "Documents", i18n("Number of Documents"), QVariant::Int);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org