Hello community, here is the log from the commit of package libkexiv2 for openSUSE:Factory checked in at 2014-10-16 18:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkexiv2 (Old) and /work/SRC/openSUSE:Factory/.libkexiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkexiv2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkexiv2/libkexiv2.changes 2014-10-14 08:59:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkexiv2.new/libkexiv2.changes 2014-10-16 18:12:06.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 12 12:02:01 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.2 + * KDE 4.14.2 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.2.php + +------------------------------------------------------------------- Old: ---- libkexiv2-4.14.1.tar.xz New: ---- libkexiv2-4.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkexiv2.spec ++++++ --- /var/tmp/diff_new_pack.WRHH30/_old 2014-10-16 18:12:07.000000000 +0200 +++ /var/tmp/diff_new_pack.WRHH30/_new 2014-10-16 18:12:07.000000000 +0200 @@ -19,7 +19,7 @@ %define _so 11 Name: libkexiv2 -Version: 4.14.1 +Version: 4.14.2 Release: 0 Summary: Library to manipulate picture meta data License: GPL-2.0+ ++++++ libkexiv2-4.14.1.tar.xz -> libkexiv2-4.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-4.14.1/CMakeLists.txt new/libkexiv2-4.14.2/CMakeLists.txt --- old/libkexiv2-4.14.1/CMakeLists.txt 2014-07-06 09:18:05.000000000 +0200 +++ new/libkexiv2-4.14.2/CMakeLists.txt 2014-10-07 08:07:22.000000000 +0200 @@ -78,7 +78,7 @@ # Library API version SET(KEXIV2_LIB_MAJOR_VERSION "2") SET(KEXIV2_LIB_MINOR_VERSION "3") -SET(KEXIV2_LIB_PATCH_VERSION "1") +SET(KEXIV2_LIB_PATCH_VERSION "2") # Suffix to add at end of version string. Usual values are: # "-git" : alpha code unstable from git. Do not use in production diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-4.14.1/libkexiv2/altlangstredit.cpp new/libkexiv2-4.14.2/libkexiv2/altlangstredit.cpp --- old/libkexiv2-4.14.1/libkexiv2/altlangstredit.cpp 2014-07-06 09:18:05.000000000 +0200 +++ new/libkexiv2-4.14.2/libkexiv2/altlangstredit.cpp 2014-10-07 08:07:22.000000000 +0200 @@ -458,6 +458,13 @@ QString editedText = d->valueEdit->toPlainText(); QString previousText = d->values.value(d->currentLanguage); + // Special case : if edited and previous strings are empty, do nothing. + // See bug #152948. + if (editedText.isEmpty() && previousText.isNull()) + { + return; + } + if (editedText.isEmpty()) { slotDeleteValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-4.14.1/libkexiv2/kexiv2previews.cpp new/libkexiv2-4.14.2/libkexiv2/kexiv2previews.cpp --- old/libkexiv2-4.14.1/libkexiv2/kexiv2previews.cpp 2014-07-06 09:18:05.000000000 +0200 +++ new/libkexiv2-4.14.2/libkexiv2/kexiv2previews.cpp 2014-10-07 08:07:22.000000000 +0200 @@ -51,16 +51,17 @@ void load(Exiv2::Image::AutoPtr image_) { - image = image_; + image = image_; image->readMetadata(); - manager = new Exiv2::PreviewManager(*image); + manager = new Exiv2::PreviewManager(*image); Exiv2::PreviewPropertiesList props = manager->getPreviewProperties(); // reverse order of list, which is smallest-first Exiv2::PreviewPropertiesList::reverse_iterator it; - for (it = props.rbegin(); it != props.rend(); ++it) + + for (it = props.rbegin() ; it != props.rend() ; ++it) { properties << *it; } @@ -123,6 +124,7 @@ { if (d->image.get()) return QSize(d->image->pixelWidth(), d->image->pixelHeight()); + return QSize(); } @@ -130,6 +132,7 @@ { if (d->image.get()) return d->image->mimeType().c_str(); + return QString(); } @@ -140,31 +143,46 @@ int KExiv2Previews::dataSize(int index) { + if (index < 0 || index >= size()) return 0; + return d->properties[index].size_; } int KExiv2Previews::width(int index) { + if (index < 0 || index >= size()) return 0; + return d->properties[index].width_; } int KExiv2Previews::height(int index) { + if (index < 0 || index >= size()) return 0; + return d->properties[index].height_; } QString KExiv2Previews::mimeType(int index) { + if (index < 0 || index >= size()) return 0; + return QString::fromLatin1(d->properties[index].mimeType_.c_str()); } QString KExiv2Previews::fileExtension(int index) { + if (index < 0 || index >= size()) return 0; + return QString::fromLatin1(d->properties[index].extension_.c_str()); } QByteArray KExiv2Previews::data(int index) { + if (index < 0 || index >= size()) return QByteArray(); + + kDebug() << "index: " << index; + kDebug() << "d->properties: " << count(); + try { Exiv2::PreviewImage image = d->manager->getPreviewImage(d->properties[index]); @@ -185,7 +203,8 @@ QImage KExiv2Previews::image(int index) { QByteArray previewData = data(index); - QImage image; + QImage image; + if (!image.loadFromData(previewData)) return QImage(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
