Hello community,
here is the log from the commit of package kdegraphics4 for openSUSE:Factory
checked in at Fri Sep 3 14:19:35 CEST 2010.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2010-07-29 13:54:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2010-08-27 15:45:49.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 27 15:45:45 CEST 2010 - dmueller@suse.de
+
+- update to 4.5.1
+ * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdegraphics-4.5.0.tar.bz2
New:
----
kdegraphics-4.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.WoX0d7/_old 2010-09-03 14:18:36.000000000 +0200
+++ /var/tmp/diff_new_pack.WoX0d7/_new 2010-09-03 14:18:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 4.5.0)
+# spec file for package kdegraphics4 (Version 4.5.1)
#
# Copyright (c) 2010 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.5.0
+Version: 4.5.1
Release: 1
Source0: kdegraphics-%version.tar.bz2
Patch0: 4_5_BRANCH.diff
++++++ kdegraphics-4.5.0.tar.bz2 -> kdegraphics-4.5.1.tar.bz2 ++++++
Files old/kdegraphics-4.5.0/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.5.1/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.5.0/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kcontrol/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.5.0/doc/kcontrol/kgamma/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kcontrol/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.5.0/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.5.0/doc/kruler/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.5.0/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.5.1/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-4.5.0/doc/okular/index.cache.bz2 and new/kdegraphics-4.5.1/doc/okular/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkdcraw/libkdcraw/kdcraw_p.cpp new/kdegraphics-4.5.1/libs/libkdcraw/libkdcraw/kdcraw_p.cpp
--- old/kdegraphics-4.5.0/libs/libkdcraw/libkdcraw/kdcraw_p.cpp 2010-05-16 12:06:16.000000000 +0200
+++ new/kdegraphics-4.5.1/libs/libkdcraw/libkdcraw/kdcraw_p.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -116,7 +116,12 @@
identify.pixelAspectRatio = raw->imgdata.sizes.pixel_aspect;
identify.rawColors = raw->imgdata.idata.colors;
identify.rawImages = raw->imgdata.idata.raw_count;
- identify.blackPoint = raw->imgdata.color.black;
+ identify.blackPoint = raw->imgdata.color.cblack[0];
+ //TODO: provide per channel black point with next interface change
+ for (int i = 1; i < raw->imgdata.idata.colors; i++)
+ {
+ identify.blackPoint = qMin(identify.blackPoint, raw->imgdata.color.cblack[i]);
+ }
identify.whitePoint = raw->imgdata.color.maximum;
identify.orientation = (DcrawInfoContainer::ImageOrientation)raw->imgdata.sizes.flip;
memcpy(&identify.cameraColorMatrix1, &raw->imgdata.color.cmatrix, sizeof(raw->imgdata.color.cmatrix));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2exif.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2exif.cpp
--- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2010-05-27 19:22:45.000000000 +0200
+++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -980,10 +980,33 @@
KExiv2::TagsMap KExiv2::getMakernoteTagsList() const
{
-#if (EXIV2_TEST_VERSION(0,18,1))
try
{
QList tags;
+
+#if (EXIV2_TEST_VERSION(0,21,0))
+
+ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
+
+ while (gi->ifdId_ != Exiv2::lastIfdId)
+ {
+ if (QString(gi->name_) == QString("Makernote"))
+ {
+ Exiv2::TagListFct tl = gi->tagList_;
+ const Exiv2::TagInfo* ti = tl();
+
+ while (ti->tag_ != 0xFFFF)
+ {
+ tags << ti;
+ ++ti;
+ }
+ }
+ ++gi;
+ }
+
+#else
+
+#if (EXIV2_TEST_VERSION(0,18,1))
tags
// Canon Makernotes.
<< Exiv2::CanonMakerNote::tagList()
@@ -994,7 +1017,7 @@
<< Exiv2::CanonMakerNote::tagListPi()
#if (EXIV2_TEST_VERSION(0,19,1))
<< Exiv2::CanonMakerNote::tagListFi()
-#endif
+#endif // (EXIV2_TEST_VERSION(0,19,1))
// Sigma Makernotes.
<< Exiv2::SigmaMakerNote::tagList()
// Sony Makernotes.
@@ -1002,7 +1025,7 @@
#if (EXIV2_TEST_VERSION(0,19,1))
<< Exiv2::SonyMakerNote::tagListCs()
<< Exiv2::SonyMakerNote::tagListCs2()
-#endif
+#endif // (EXIV2_TEST_VERSION(0,19,1))
// Minolta Makernotes.
<< Exiv2::MinoltaMakerNote::tagList()
<< Exiv2::MinoltaMakerNote::tagListCsStd()
@@ -1031,6 +1054,10 @@
// Fuji Makernotes.
<< Exiv2::FujiMakerNote::tagList();
+#endif // (EXIV2_TEST_VERSION(0,18,1))
+
+#endif // (EXIV2_TEST_VERSION(0,21,0))
+
TagsMap tagsMap;
for (QList::iterator it = tags.begin(); it != tags.end(); ++it)
{
@@ -1050,7 +1077,6 @@
{
d->printExiv2ExceptionError("Cannot get Makernote Tags list using Exiv2 ", e);
}
-#endif
return TagsMap();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.cpp
--- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.cpp 2010-05-16 12:06:16.000000000 +0200
+++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -33,7 +33,9 @@
imageComments.clear();
exifMetadata.clear();
iptcMetadata.clear();
+#ifdef _XMP_SUPPORT_
xmpMetadata.clear();
+#endif
}
KExiv2Priv::KExiv2Priv()
@@ -50,7 +52,7 @@
void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e)
{
std::string s(e.what());
- kDebug(51003) << msg.toAscii().constData() << " (Error #"
+ kDebug(51003) << msg.toAscii().constData() << " (Error #"
<< e.code() << ": " << s.c_str() << endl;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.h new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.h
--- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.h 2010-05-16 12:06:16.000000000 +0200
+++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.h 2010-08-27 10:12:04.000000000 +0200
@@ -26,7 +26,7 @@
#include "kexiv2.h"
- // C++ includes.
+ // C++ includes
#include <cstdlib>
#include <cstdio>
@@ -37,7 +37,7 @@
#include <iomanip>
#include <string>
-// Qt includes.
+// Qt includes
#include <QBuffer>
#include <QFile>
@@ -49,7 +49,7 @@
#include <QDataStream>
#include <QSharedData>
-// KDE includes.
+// KDE includes
#include
#include
@@ -57,7 +57,10 @@
#include
#include
-// Exiv2 includes.
+// Exiv2 includes -------------------------------------------------------
+
+// NOTE: All Exiv2 header must be stay there to not expose external source code to Exiv2 API
+// and reduce Exiv2 dependency to client code.
// The pragmas are required to be able to catch exceptions thrown by libexiv2:
// See http://gcc.gnu.org/wiki/Visibility, the section about c++ exceptions.
@@ -65,6 +68,8 @@
#ifdef __GNUC__
#pragma GCC visibility push(default)
#endif
+
+#include
#include
#include
#include
@@ -74,25 +79,11 @@
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-//#include
-#ifdef __GNUC__
-#pragma GCC visibility pop
-#endif
+#include
// Check if Exiv2 support XMP
-#if (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION ==15 && EXIV2_PATCH_VERSION >=99) || \
- (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION >15 ) || \
- (EXIV2_MAJOR_VERSION >0)
+#ifdef EXV_HAVE_XMP_TOOLKIT
# define _XMP_SUPPORT_ 1
#endif
@@ -107,15 +98,28 @@
# define EXIV2_TEST_VERSION(major,minor,patch) (false)
#endif
-#ifndef _XMP_SUPPORT_
+#if (EXIV2_TEST_VERSION(0,21,0))
-// Dummy redifinition of XmpData class to compile fine
-// if XMP metadata support is not available from Exiv2
-namespace Exiv2
-{
- class XmpData{};
-}
-#endif // _XMP_SUPPORT_
+// With exiv2 > 0.20.0, all makernote header files have been removed to increase binary compatibility.
+// See Exiv2 bugzilla entry http://dev.exiv2.org/issues/719
+// and wiki topic http://dev.exiv2.org/boards/3/topics/583
+#else
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#endif
+
+#ifdef __GNUC__
+#pragma GCC visibility pop
+#endif
+
+// End of Exiv2 headers ------------------------------------------------------
namespace KExiv2Iface
{
@@ -163,14 +167,20 @@
const Exiv2::ExifData& exifMetadata() const { return data.constData()->exifMetadata; }
const Exiv2::IptcData& iptcMetadata() const { return data.constData()->iptcMetadata; }
- const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; }
const std::string& imageComments() const { return data.constData()->imageComments; }
+#ifdef _XMP_SUPPORT_
+ const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; }
+#endif
+
Exiv2::ExifData& exifMetadata() { return data.data()->exifMetadata; }
Exiv2::IptcData& iptcMetadata() { return data.data()->iptcMetadata; }
- Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; }
std::string& imageComments() { return data.data()->imageComments; }
+#ifdef _XMP_SUPPORT_
+ Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; }
+#endif
+
public:
bool writeRawFiles;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp
--- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-05-16 12:06:16.000000000 +0200
+++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -44,7 +44,7 @@
catch( Exiv2::Error& e )
{
std::string s(e.what());
- kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #"
+ kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #"
<< e.code() << ": " << s.c_str() << ")" << endl;
}
@@ -52,9 +52,11 @@
#else
- return false;
+ Q_UNUSED(filePath);
#endif // _XMP_SUPPORT_
+
+ return false;
}
bool KExiv2::hasXmp() const
@@ -142,6 +144,10 @@
d->printExiv2ExceptionError("Cannot set Xmp data using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(data);
+
#endif // _XMP_SUPPORT_
return false;
@@ -229,6 +235,11 @@
d->printExiv2ExceptionError("Cannot parse Xmp metadata using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpKeysFilter);
+ Q_UNUSED(invertSelection);
+
#endif // _XMP_SUPPORT_
return MetaDataMap();
@@ -238,17 +249,21 @@
{
#ifdef _XMP_SUPPORT_
- try
+ try
{
std::string xmpkey(xmpTagName);
Exiv2::XmpKey xk(xmpkey);
return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyTitle(xk) );
}
- catch (Exiv2::Error& e)
+ catch (Exiv2::Error& e)
{
d->printExiv2ExceptionError("Cannot get Xmp metadata tag title using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+
#endif // _XMP_SUPPORT_
return QString();
@@ -257,16 +272,22 @@
QString KExiv2::getXmpTagDescription(const char* xmpTagName)
{
#ifdef _XMP_SUPPORT_
- try
+
+ try
{
std::string xmpkey(xmpTagName);
Exiv2::XmpKey xk(xmpkey);
return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyDesc(xk) );
}
- catch (Exiv2::Error& e)
+ catch (Exiv2::Error& e)
{
d->printExiv2ExceptionError("Cannot get Xmp metadata tag description using Exiv2 ", e);
}
+
+#else
+
+ Q_UNUSED(xmpTagName);
+
#endif // _XMP_SUPPORT_
return QString();
@@ -299,6 +320,11 @@
.arg(xmpTagName), e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(escapeCR);
+
#endif // _XMP_SUPPORT_
return QString();
@@ -325,6 +351,12 @@
d->printExiv2ExceptionError("Cannot set Xmp tag string into image using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(value);
+ Q_UNUSED(setProgramName);
+
#endif // _XMP_SUPPORT_
return false;
@@ -345,8 +377,8 @@
AltLangMap map;
const Exiv2::LangAltValue &value = static_cast(it->value());
- for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin();
- it2 != value.value_.end(); ++it2)
+ for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin();
+ it2 != value.value_.end(); ++it2)
{
QString lang = QString::fromUtf8(it2->first.c_str());
QString text = QString::fromUtf8(it2->second.c_str());
@@ -366,12 +398,17 @@
.arg(xmpTagName), e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(escapeCR);
+
#endif // _XMP_SUPPORT_
return AltLangMap();
}
-bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values,
+bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values,
bool setProgramName) const
{
#ifdef _XMP_SUPPORT_
@@ -407,6 +444,12 @@
d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(values);
+ Q_UNUSED(setProgramName);
+
#endif // _XMP_SUPPORT_
return false;
@@ -448,12 +491,18 @@
.arg(xmpTagName), e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(langAlt);
+ Q_UNUSED(escapeCR);
+
#endif // _XMP_SUPPORT_
return QString();
}
-bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value,
+bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value,
const QString& langAlt, bool setProgramName) const
{
#ifdef _XMP_SUPPORT_
@@ -465,7 +514,7 @@
{
QString language("x-default"); // default alternative language.
- if (!langAlt.isEmpty())
+ if (!langAlt.isEmpty())
language = langAlt;
QString txtLangAlt = QString("lang=%1 %2").arg(language).arg(value);
@@ -499,6 +548,13 @@
d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(value);
+ Q_UNUSED(langAlt);
+ Q_UNUSED(setProgramName);
+
#endif // _XMP_SUPPORT_
return false;
@@ -542,6 +598,11 @@
.arg(xmpTagName), e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(escapeCR);
+
#endif // _XMP_SUPPORT_
return QStringList();
@@ -580,6 +641,12 @@
d->printExiv2ExceptionError("Cannot set Xmp tag string Seq into image using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(seq);
+ Q_UNUSED(setProgramName);
+
#endif // _XMP_SUPPORT_
return false;
@@ -622,6 +689,11 @@
.arg(xmpTagName), e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(escapeCR);
+
#endif // _XMP_SUPPORT_
return QStringList();
@@ -660,6 +732,12 @@
d->printExiv2ExceptionError("Cannot set Xmp tag string Bag into image using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(bag);
+ Q_UNUSED(setProgramName);
+
#endif // _XMP_SUPPORT_
return false;
@@ -668,8 +746,6 @@
bool KExiv2::addToXmpTagStringBag(const char* xmpTagName, const QStringList& entriesToAdd,
bool setProgramName) const
{
-//#ifdef _XMP_SUPPORT_
-
if (!setProgramId(setProgramName))
return false;
@@ -686,16 +762,12 @@
if (setXmpTagStringBag(xmpTagName, newEntries, false))
return true;
-//#endif // _XMP_SUPPORT_
-
return false;
}
bool KExiv2::removeFromXmpTagStringBag(const char* xmpTagName, const QStringList& entriesToRemove,
bool setProgramName) const
{
-//#ifdef _XMP_SUPPORT_
-
if (!setProgramId(setProgramName))
return false;
@@ -712,8 +784,6 @@
if (setXmpTagStringBag(xmpTagName, newEntries, false))
return true;
-//#endif // _XMP_SUPPORT_
-
return false;
}
@@ -801,7 +871,7 @@
QMap map;
// access the ValueType std::map< std::string, std::string>
Exiv2::LangAltValue::ValueType::const_iterator i;
- for (i = value.value_.begin(); i != value.value_.end(); ++i)
+ for (i = value.value_.begin(); i != value.value_.end(); ++i)
{
map[QString::fromUtf8(i->first.c_str())] = QString::fromUtf8(i->second.c_str());
}
@@ -818,6 +888,12 @@
.arg(xmpTagName), e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(rationalAsListOfInts);
+ Q_UNUSED(stringEscapeCR);
+
#endif // _XMP_SUPPORT_
return QVariant();
@@ -839,6 +915,11 @@
KExiv2Priv::printExiv2ExceptionError("Cannot register a new Xmp namespace using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(uri);
+ Q_UNUSED(prefix);
+
#endif // _XMP_SUPPORT_
return false;
@@ -860,6 +941,10 @@
KExiv2Priv::printExiv2ExceptionError("Cannot unregister a new Xmp namespace using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(uri);
+
#endif // _XMP_SUPPORT_
return false;
@@ -887,6 +972,11 @@
d->printExiv2ExceptionError("Cannot remove Xmp tag using Exiv2 ", e);
}
+#else
+
+ Q_UNUSED(xmpTagName);
+ Q_UNUSED(setProgramName);
+
#endif // _XMP_SUPPORT_
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/document.cpp new/kdegraphics-4.5.1/okular/core/document.cpp
--- old/kdegraphics-4.5.0/okular/core/document.cpp 2010-04-22 10:04:04.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/core/document.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -3370,6 +3370,11 @@
if ( docFileName == QLatin1String( "-" ) )
return false;
+ QString docPath = d->m_docFileName;
+ const QFileInfo fi( docPath );
+ if ( fi.isSymLink() )
+ docPath = fi.symLinkTarget();
+
KZip okularArchive( fileName );
if ( !okularArchive.open( QIODevice::WriteOnly ) )
return false;
@@ -3407,7 +3412,7 @@
okularArchive.writeFile( "content.xml", user.loginName(), userGroup.name(),
contentDocXml.constData(), contentDocXml.length() );
- okularArchive.addLocalFile( d->m_docFileName, docFileName );
+ okularArchive.addLocalFile( docPath, docFileName );
okularArchive.addLocalFile( metadataFile.fileName(), "metadata.xml" );
if ( !okularArchive.close() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/document.h new/kdegraphics-4.5.1/okular/core/document.h
--- old/kdegraphics-4.5.0/okular/core/document.h 2010-04-15 10:58:26.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/core/document.h 2010-08-27 10:12:04.000000000 +0200
@@ -791,7 +791,7 @@
/**
* If 'rePos.enabled == true' then this structure contains the
- * viewport center.
+ * viewport center or top left depending on the value of pos.
*/
struct {
bool enabled;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/version.h new/kdegraphics-4.5.1/okular/core/version.h
--- old/kdegraphics-4.5.0/okular/core/version.h 2010-07-28 23:04:13.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/core/version.h 2010-08-27 10:12:04.000000000 +0200
@@ -10,10 +10,10 @@
#ifndef _OKULAR_VERSION_H_
#define _OKULAR_VERSION_H_
-#define OKULAR_VERSION_STRING "0.11"
+#define OKULAR_VERSION_STRING "0.11.1"
#define OKULAR_VERSION_MAJOR 0
#define OKULAR_VERSION_MINOR 11
-#define OKULAR_VERSION_RELEASE 0
+#define OKULAR_VERSION_RELEASE 1
#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.5.0/okular/generators/comicbook/generator_comicbook.cpp new/kdegraphics-4.5.1/okular/generators/comicbook/generator_comicbook.cpp
--- old/kdegraphics-4.5.0/okular/generators/comicbook/generator_comicbook.cpp 2010-07-28 23:04:14.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/generators/comicbook/generator_comicbook.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -25,7 +25,7 @@
"okular_comicbook",
"okular_comicbook",
ki18n( "ComicBook Backend" ),
- "0.2",
+ "0.2.1",
ki18n( "A renderer for various comic book formats" ),
KAboutData::License_GPL,
ki18n( "© 2007-2008 Tobias Koenig" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/comicbook/unrar.cpp new/kdegraphics-4.5.1/okular/generators/comicbook/unrar.cpp
--- old/kdegraphics-4.5.0/okular/generators/comicbook/unrar.cpp 2010-04-07 13:25:20.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/generators/comicbook/unrar.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -232,7 +232,7 @@
mProcess->start();
QEventLoop loop;
mLoop = &loop;
- ret = loop.exec( QEventLoop::WaitForMoreEvents );
+ ret = loop.exec( QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents );
mLoop = 0;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/faxdocument.cpp new/kdegraphics-4.5.1/okular/generators/fax/faxdocument.cpp
--- old/kdegraphics-4.5.0/okular/generators/fax/faxdocument.cpp 2008-09-26 16:55:41.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/generators/fax/faxdocument.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -136,6 +136,8 @@
if ( pn->strips == 0 )
pn->rowsperstrip = pn->size.height();
+ pn->dataOrig = (t16bits *)data;
+
return data;
}
@@ -241,6 +243,7 @@
d->mPageNode.vres = 1;
d->mPageNode.inverse = 0;
d->mPageNode.data = 0;
+ d->mPageNode.dataOrig = 0;
d->mPageNode.imageData = 0;
d->mType = type;
@@ -252,7 +255,7 @@
FaxDocument::~FaxDocument()
{
- delete [] d->mPageNode.data;
+ delete [] d->mPageNode.dataOrig;
delete [] d->mPageNode.imageData;
delete d;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/faxexpand.h new/kdegraphics-4.5.1/okular/generators/fax/faxexpand.h
--- old/kdegraphics-4.5.0/okular/generators/fax/faxexpand.h 2008-09-26 16:55:41.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/generators/fax/faxexpand.h 2010-08-27 10:12:04.000000000 +0200
@@ -59,6 +59,7 @@
int stripnum; /* current strip while expanding */
struct strip *strips; /* array of strips containing fax data in file */
t16bits *data; /* in-memory copy of strip */
+ t16bits *dataOrig; /* copy of `data', in case we shift it */
size_t length; /* length of data */
QSize size; /* width & height of page in pixels */
int inverse; /* black <=> white */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/generator_fax.cpp new/kdegraphics-4.5.1/okular/generators/fax/generator_fax.cpp
--- old/kdegraphics-4.5.0/okular/generators/fax/generator_fax.cpp 2008-11-19 11:17:38.000000000 +0100
+++ new/kdegraphics-4.5.1/okular/generators/fax/generator_fax.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -26,7 +26,7 @@
"okular_fax",
"okular_fax",
ki18n( "Fax Backend" ),
- "0.1",
+ "0.1.1",
ki18n( "A G3/G4 fax document backend" ),
KAboutData::License_GPL,
ki18n( "© 2008 Tobias Koenig" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/plucker/generator_plucker.cpp new/kdegraphics-4.5.1/okular/generators/plucker/generator_plucker.cpp
--- old/kdegraphics-4.5.0/okular/generators/plucker/generator_plucker.cpp 2008-04-23 17:51:19.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/generators/plucker/generator_plucker.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -26,7 +26,7 @@
"okular_plucker",
"okular_plucker",
ki18n( "Plucker Document Backend" ),
- "0.1",
+ "0.1.1",
ki18n( "A renderer for Plucker eBooks" ),
KAboutData::License_GPL,
ki18n( "© 2007-2008 Tobias Koenig" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/plucker/unpluck/image.cpp new/kdegraphics-4.5.1/okular/generators/plucker/unpluck/image.cpp
--- old/kdegraphics-4.5.0/okular/generators/plucker/unpluck/image.cpp 2008-02-21 10:27:47.000000000 +0100
+++ new/kdegraphics-4.5.1/okular/generators/plucker/unpluck/image.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -289,8 +289,23 @@
for (j = 0; j < bytes_per_row;) {
incount = *palm_ptr++;
inval = *palm_ptr++;
- memset (rowbuf + j, inval, incount);
- j += incount;
+ if (incount + j <= bytes_per_row * width)
+ {
+ memset (rowbuf + j, inval, incount);
+ j += incount;
+ }
+ else
+ {
+ free (rowbuf);
+ free (lastrow);
+ free (jpeg_row);
+
+ jpeg_destroy_compress (&cinfo);
+
+ fclose( outfile );
+
+ return false;
+ }
}
}
else if ((flags & PALM_IS_COMPRESSED_FLAG)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/ui/annotationtools.h new/kdegraphics-4.5.1/okular/ui/annotationtools.h
--- old/kdegraphics-4.5.0/okular/ui/annotationtools.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.5.1/okular/ui/annotationtools.h 2010-08-27 10:12:04.000000000 +0200
@@ -24,7 +24,7 @@
}
/**
- * @short Engine: filter events to distill Annotation's.
+ * @short Engine: filter events to distill Annotations.
*/
class AnnotatorEngine
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/ui/pageview.cpp new/kdegraphics-4.5.1/okular/ui/pageview.cpp
--- old/kdegraphics-4.5.0/okular/ui/pageview.cpp 2010-08-04 21:15:45.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/ui/pageview.cpp 2010-08-27 10:12:04.000000000 +0200
@@ -1427,7 +1427,13 @@
int deltaY = d->mouseMidLastY - mouseY;
// wrap mouse from top to bottom
- QRect mouseContainer = KGlobalSettings::desktopGeometry( this );
+ const QRect mouseContainer = KGlobalSettings::desktopGeometry( this );
+ const int absDeltaY = abs(deltaY);
+ if ( absDeltaY > mouseContainer.height() / 2 )
+ {
+ deltaY = mouseContainer.height() - absDeltaY;
+ }
+
if ( mouseY <= mouseContainer.top() + 4 &&
d->zoomFactor < 3.99 )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/VERSION new/kdegraphics-4.5.1/okular/VERSION
--- old/kdegraphics-4.5.0/okular/VERSION 2010-07-28 23:04:18.000000000 +0200
+++ new/kdegraphics-4.5.1/okular/VERSION 2010-08-27 10:12:04.000000000 +0200
@@ -1 +1 @@
-okular v0.11
+okular v0.11.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org