Hello community, here is the log from the commit of package converseen for openSUSE:Factory checked in at 2014-08-11 10:07:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/converseen (Old) and /work/SRC/openSUSE:Factory/.converseen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "converseen" Changes: -------- --- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2014-07-25 09:09:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.converseen.new/converseen.changes 2014-08-11 10:08:04.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Aug 2 15:49:28 UTC 2014 - [email protected] + +- Update to 0.8. + * Fixed glitches and artifacts with picture previews. + * Added important improvements and optimizations to picture + preview algorithms. + * Various bugfixes. +- Change URL. + +------------------------------------------------------------------- Old: ---- converseen-0.7.3.tar.bz2 New: ---- converseen-0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ converseen.spec ++++++ --- /var/tmp/diff_new_pack.pHWXWi/_old 2014-08-11 10:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.pHWXWi/_new 2014-08-11 10:08:05.000000000 +0200 @@ -17,12 +17,12 @@ Name: converseen -Version: 0.7.3 +Version: 0.8 Release: 0 Summary: Batch Image Conversion Tool License: GPL-3.0+ Group: Productivity/Graphics/Convertors -Url: http://converseen.sourceforge.net/ +Url: http://converseen.fasterland.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: ImageMagick %if 0%{?suse_version} >= 1320 ++++++ converseen-0.7.3.tar.bz2 -> converseen-0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.7.3/converseen.rc new/converseen-0.8/converseen.rc --- old/converseen-0.7.3/converseen.rc 2014-07-15 15:53:39.000000000 +0200 +++ new/converseen-0.8/converseen.rc 2014-07-28 20:18:17.000000000 +0200 @@ -60,8 +60,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,3,0 - PRODUCTVERSION 0,7,3,0 + FILEVERSION 0,8,0,0 + PRODUCTVERSION 0,8,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,13 +79,13 @@ VALUE "Comments", "The batch image converter and resizer" VALUE "CompanyName", "Faster" VALUE "FileDescription", "Converseen - The batch converter and resizer" - VALUE "FileVersion", "0.7.3.0" + VALUE "FileVersion", "0.8.0.0" VALUE "InternalName", "Converseen" VALUE "LegalCopyright", "(C) 2009 - 2014 Francesco Mondello GNU - GPL" VALUE "LegalTrademarks", "(C) 2009 - 2014 Francesco Mondello GNU - GPL" VALUE "OriginalFilename", "converseen.exe" VALUE "ProductName", "Converseen" - VALUE "ProductVersion", "0.7.3.0" + VALUE "ProductVersion", "0.8.0.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.7.3/src/globals.h new/converseen-0.8/src/globals.h --- old/converseen-0.7.3/src/globals.h 2014-07-15 15:53:39.000000000 +0200 +++ new/converseen-0.8/src/globals.h 2014-07-28 20:18:17.000000000 +0200 @@ -29,8 +29,8 @@ namespace globals { const QString PROGRAM_NAME = "Converseen"; - const int CURRENT_INTERNAL_VERSION = 730; - const QString VERSION = "0.7.3"; + const int CURRENT_INTERNAL_VERSION = 800; + const QString VERSION = "0.8"; } #endif // GLOBALS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.7.3/src/thumbnailgeneratorthread.cpp new/converseen-0.8/src/thumbnailgeneratorthread.cpp --- old/converseen-0.7.3/src/thumbnailgeneratorthread.cpp 2014-07-15 15:53:39.000000000 +0200 +++ new/converseen-0.8/src/thumbnailgeneratorthread.cpp 2014-07-28 20:18:17.000000000 +0200 @@ -67,21 +67,26 @@ QImage* ThumbnailGeneratorThread::toQImage(const Image &image) { - QImage *newQImage = new QImage(image.columns(), image.rows(), QImage::Format_RGB32); + QImage *qmg = new QImage(); + Image tmpImage = image; - Magick::ColorRGB rgb; - for (int y = 0; y < newQImage->height(); y++) { - const Magick::PixelPacket *pixels; - pixels = image.getConstPixels(0, y, newQImage->width(), 1); - for (int x = 0; x < newQImage->width(); x++) { - rgb = (*(pixels + x)); - newQImage->setPixel(x, y, QColor((int) (255 * rgb.red()) - , (int) (255 * rgb.green()) - , (int) (255 * rgb.blue())).rgb()); - } - } + Geometry geometry; + + geometry.width(MAX_THUMB_W); + geometry.height(MAX_THUMB_H); + geometry.aspect(false); + + tmpImage.resize(geometry); - return newQImage; + Blob blob; + tmpImage.magick("PNG"); // or PNG + tmpImage.write(&blob); + const QByteArray imageData((char*)(blob.data()),blob.length()); + + // Convert the data to a QPixmap in the vector + qmg->loadFromData(imageData); + + return qmg; } void ThumbnailGeneratorThread::setThumbnailGeneration(bool generate) @@ -109,8 +114,12 @@ img_dens_x = tmpImage.logicalDpiX(); img_dens_y = tmpImage.logicalDpiY(); - if (m_generateThumbnail) - thumbnail = tmpImage; + if (m_generateThumbnail) { + thumbnail = tmpImage.scaled(QSize(MAX_THUMB_W, MAX_THUMB_H), + Qt::KeepAspectRatio, + Qt::SmoothTransformation); + + } } else { try @@ -141,26 +150,6 @@ { //setText(tr("Sorry! Selected image is damaged!")); } - - } - - if (m_generateThumbnail) { - int n_heigth = (MAX_THUMB_W * img_height) / img_width; - - if (!((img_width <= MAX_THUMB_W) && (img_height <= MAX_THUMB_H))) { - if (img_width > img_height) { - thumbnail = thumbnail.scaled(QSize(MAX_THUMB_W, n_heigth), - Qt::IgnoreAspectRatio, - Qt::SmoothTransformation); - } - else - if ((img_width <= img_height) || (n_heigth > MAX_THUMB_H)) { - int n_width = (MAX_THUMB_H * img_width) / img_height; - thumbnail = thumbnail.scaled(QSize(n_width, MAX_THUMB_H), - Qt::IgnoreAspectRatio, - Qt::SmoothTransformation); - } - } } CachingSystem::insert(m_fileName, thumbnail, img_width, img_height, img_dens_x, img_dens_y); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
