Hello community, here is the log from the commit of package gwenview for openSUSE:Factory checked in at 2014-08-25 10:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenview (Old) and /work/SRC/openSUSE:Factory/.gwenview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenview" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenview/gwenview.changes 2014-07-16 16:16:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gwenview.new/gwenview.changes 2014-08-25 10:59:01.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 15 08:27:54 UTC 2014 - [email protected] + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- +Thu Jul 17 16:43:51 UTC 2014 - [email protected] + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php + +------------------------------------------------------------------- Old: ---- gwenview-4.13.80.tar.xz New: ---- gwenview-4.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview.spec ++++++ --- /var/tmp/diff_new_pack.xC7Nl4/_old 2014-08-25 10:59:02.000000000 +0200 +++ /var/tmp/diff_new_pack.xC7Nl4/_new 2014-08-25 10:59:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: gwenview -Version: 4.13.80 +Version: 4.14.0 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ ++++++ gwenview-4.13.80.tar.xz -> gwenview-4.14.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.13.80/tests/auto/CMakeLists.txt new/gwenview-4.14.0/tests/auto/CMakeLists.txt --- old/gwenview-4.13.80/tests/auto/CMakeLists.txt 2014-07-06 06:29:41.000000000 +0200 +++ new/gwenview-4.14.0/tests/auto/CMakeLists.txt 2014-07-18 10:27:00.000000000 +0200 @@ -26,7 +26,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -gv_add_unit_test(imagescalertest) +gv_add_unit_test(imagescalertest testutils.cpp) gv_add_unit_test(paintutilstest) gv_add_unit_test(documenttest testutils.cpp) gv_add_unit_test(transformimageoperationtest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.13.80/tests/auto/imagescalertest.cpp new/gwenview-4.14.0/tests/auto/imagescalertest.cpp --- old/gwenview-4.13.80/tests/auto/imagescalertest.cpp 2014-07-06 06:29:41.000000000 +0200 +++ new/gwenview-4.14.0/tests/auto/imagescalertest.cpp 2014-07-18 10:27:00.000000000 +0200 @@ -60,7 +60,7 @@ QImage scaledImage = client.createFullImage(); QImage expectedImage = doc->image().scaled(doc->size() * zoom); - QCOMPARE(scaledImage, expectedImage); + QVERIFY(TestUtils::imageCompare(scaledImage, expectedImage)); } #if 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.13.80/tests/auto/testutils.cpp new/gwenview-4.14.0/tests/auto/testutils.cpp --- old/gwenview-4.13.80/tests/auto/testutils.cpp 2014-07-06 06:29:41.000000000 +0200 +++ new/gwenview-4.14.0/tests/auto/testutils.cpp 2014-07-18 10:27:00.000000000 +0200 @@ -104,6 +104,58 @@ kClearDebugConfig(); } +static QImage simplifyFormats(const QImage& img) +{ + switch (img.format()) { + case QImage::Format_RGB32: + case QImage::Format_ARGB32_Premultiplied: + return img.convertToFormat(QImage::Format_ARGB32); + default: + return img; + } +} + +inline bool fuzzyColorComponentCompare(int c1, int c2, int delta) +{ + return qAbs(c1 - c2) < delta; +} + +bool fuzzyImageCompare(const QImage& img1_, const QImage& img2_, int delta) +{ + if (img1_.size() != img2_.size()) { + kWarning() << "Different sizes" << img1_.size() << "!=" << img2_.size(); + return false; + } + QImage img1 = simplifyFormats(img1_); + QImage img2 = simplifyFormats(img2_); + if (img1.format() != img2.format()) { + kWarning() << "Different formats" << img1.format() << "!=" << img2.format(); + return false; + } + + for (int posY = 0; posY < img1.height(); ++posY) { + for (int posX = 0; posX < img2.width(); ++posX) { + QColor col1 = img1.pixel(posX, posY); + QColor col2 = img2.pixel(posX, posY); + bool ok = + fuzzyColorComponentCompare(col1.red(), col2.red(), delta) + && fuzzyColorComponentCompare(col1.green(), col2.green(), delta) + && fuzzyColorComponentCompare(col1.blue(), col2.blue(), delta) + && fuzzyColorComponentCompare(col1.alpha(), col2.alpha(), delta); + if (!ok) { + kWarning() << "Different at" << QPoint(posX, posY) << col1.name() << "!=" << col2.name(); + return false; + } + } + } + return true; +} + +bool imageCompare(const QImage& img1, const QImage& img2) +{ + return fuzzyImageCompare(img1, img2, 1); +} + SandBoxDir::SandBoxDir() : mTempDir(QDir::currentPath() + "/sandbox-") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.13.80/tests/auto/testutils.h new/gwenview-4.14.0/tests/auto/testutils.h --- old/gwenview-4.13.80/tests/auto/testutils.h 2014-07-06 06:29:41.000000000 +0200 +++ new/gwenview-4.14.0/tests/auto/testutils.h 2014-07-18 10:27:00.000000000 +0200 @@ -72,28 +72,6 @@ return false; } -inline bool fuzzyImageCompare(const QImage& img1, const QImage& img2) -{ - if (img1.size() != img2.size()) { - kWarning() << "Different sizes" << img1.size() << img2.size(); - return false; - } - if (img1.format() != img2.format()) { - kWarning() << "Different formats" << img1.format() << img2.format(); - return false; - } - - for (int posY = 0; posY < img1.height(); ++posY) { - for (int posX = 0; posX < img2.width(); ++posX) { - if (qAbs(img1.pixel(posX, posY) - img2.pixel(posX, posY)) > 2) { - kWarning() << "Different at" << QPoint(posX, posY); - return false; - } - } - } - return true; -} - void createEmptyFile(const QString& path); /** @@ -113,6 +91,10 @@ namespace TestUtils { +bool fuzzyImageCompare(const QImage& img1, const QImage& img2, int delta = 2); + +bool imageCompare(const QImage& img1, const QImage& img2); + void purgeUserConfiguration(); class SandBoxDir : public QDir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.13.80/tests/auto/thumbnailprovidertest.cpp new/gwenview-4.14.0/tests/auto/thumbnailprovidertest.cpp --- old/gwenview-4.13.80/tests/auto/thumbnailprovidertest.cpp 2014-07-06 06:29:41.000000000 +0200 +++ new/gwenview-4.14.0/tests/auto/thumbnailprovidertest.cpp 2014-07-18 10:27:00.000000000 +0200 @@ -192,7 +192,7 @@ QPixmap thumbnailPix; SandBox sandBox; sandBox.initDir(); - // This image is red and 256x128 but contains a white 128x64 thumbnail + // This image is red (0xfe0000) and 256x128 but contains a white 128x64 thumbnail sandBox.copyTestImage("embedded-thumbnail.jpg", 256, 128); KFileItemList list; @@ -210,7 +210,7 @@ QCOMPARE(spy.count(), 1); expectedThumbnail = createColoredImage(128, 64, Qt::white); thumbnailPix = qvariant_cast<QPixmap>(spy.at(0).at(1)); - QVERIFY(fuzzyImageCompare(expectedThumbnail, thumbnailPix.toImage())); + QVERIFY(TestUtils::imageCompare(expectedThumbnail, thumbnailPix.toImage())); } // Loading a large thumbnail should bring the red one @@ -222,9 +222,9 @@ syncRun(&provider); QCOMPARE(spy.count(), 1); - expectedThumbnail = createColoredImage(256, 128, Qt::red); + expectedThumbnail = createColoredImage(256, 128, QColor(254, 0, 0)); thumbnailPix = qvariant_cast<QPixmap>(spy.at(0).at(1)); - QVERIFY(fuzzyImageCompare(expectedThumbnail, thumbnailPix.toImage())); + QVERIFY(TestUtils::imageCompare(expectedThumbnail, thumbnailPix.toImage())); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
