Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2013-03-14 14:44:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2013-03-01 07:25:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2013-03-14 14:44:43.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 2 15:37:44 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- Old: ---- libksane-4.10.0.tar.xz New: ---- libksane-4.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.DxwMYy/_old 2013-03-14 14:44:46.000000000 +0100 +++ /var/tmp/diff_new_pack.DxwMYy/_new 2013-03-14 14:44:46.000000000 +0100 @@ -29,7 +29,7 @@ License: GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.10.0 +Version: 4.10.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libksane-4.10.0.tar.xz -> libksane-4.10.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.10.0/libksane/ksane_widget.cpp new/libksane-4.10.1/libksane/ksane_widget.cpp --- old/libksane-4.10.0/libksane/ksane_widget.cpp 2013-01-23 23:01:23.000000000 +0100 +++ new/libksane-4.10.1/libksane/ksane_widget.cpp 2013-03-01 08:02:26.000000000 +0100 @@ -312,6 +312,11 @@ QString myFolderName("ksane"); QMap<QString, QString> wallet_entry; + if (d->m_saneHandle != 0) { + // this KSaneWidget already has an open device + return false; + } + // don't bother trying to open if the device string is empty if (deviceName.isEmpty()) { return false; @@ -530,9 +535,8 @@ { QImage img; int j=0; - int pixel_x = 0; - int pixel_y = 0; QVector<QRgb> table; + QRgb *imgLine; switch (format) { @@ -549,69 +553,57 @@ break; case FormatGrayScale8: - img = QImage(width, - height, - QImage::Format_RGB32); - j=0; - for (int i=0; i<data.size(); i++) { - img.bits()[j+0] = data.data()[i]; - img.bits()[j+1] = data.data()[i]; - img.bits()[j+2] = data.data()[i]; - j+=4; + { + img = QImage(width, height, QImage::Format_RGB32); + int dI = 0; + for (int i=0; (i<img.height() && dI<data.size()); i++) { + imgLine = (QRgb *)img.scanLine(i); + for (j=0; (j<img.width() && dI<data.size()); j++) { + imgLine[j] = qRgb(data[dI], data[dI], data[dI]); + dI++; + } } break; - + } case FormatGrayScale16: - img = QImage(width, - height, - QImage::Format_RGB32); - j=0; - for (int i=1; i<data.size(); i+=2) { - img.bits()[j+0] = data.data()[i]; - img.bits()[j+1] = data.data()[i]; - img.bits()[j+2] = data.data()[i]; - j+=4; + { + img = QImage(width, height, QImage::Format_RGB32); + int dI = 1; + for (int i=0; (i<img.height() && dI<data.size()); i++) { + imgLine = (QRgb *)img.scanLine(i); + for (j=0; (j<img.width() && dI<data.size()); j++) { + imgLine[j] = qRgb(data[dI], data[dI], data[dI]); + dI+=2; + } } break; - + } case FormatRGB_8_C: - pixel_x = 0; - pixel_y = 0; - - img = QImage(width, - height, - QImage::Format_RGB32); - - for (int i=0; i<data.size(); i+=3) { - img.setPixel(pixel_x, - pixel_y, - qRgb(data[i], - data[i+1], - data[i+2])); - - inc_pixel(pixel_x, pixel_y, width); + { + img = QImage(width, height, QImage::Format_RGB32); + int dI = 0; + for (int i=0; (i<img.height() && dI<data.size()); i++) { + imgLine = (QRgb *)img.scanLine(i); + for (j=0; (j<img.width() && dI<data.size()); j++) { + imgLine[j] = qRgb(data[dI], data[dI+1], data[dI+2]); + dI+=3; + } } break; - + } case FormatRGB_16_C: - pixel_x = 0; - pixel_y = 0; - - img = QImage(width, - height, - QImage::Format_RGB32); - - for (int i=1; i<data.size(); i+=6) { - img.setPixel(pixel_x, - pixel_y, - qRgb(data[i], - data[i+2], - data[i+4])); - - inc_pixel(pixel_x, pixel_y, width); + { + img = QImage(width, height, QImage::Format_RGB32); + int dI = 1; + for (int i=0; (i<img.height() && dI<data.size()); i++) { + imgLine = (QRgb *)img.scanLine(i); + for (j=0; (j<img.width() && dI<data.size()); j++) { + imgLine[j] = qRgb(data[dI], data[dI+2], data[dI+4]); + dI+=6; + } } break; - + } case FormatNone: default: kDebug() << "Unsupported conversion"; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
