Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2014-01-27 11:15:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2013-12-19 13:16:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2014-01-27 11:15:22.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 11 15:37:19 UTC 2014 - [email protected] + +- Update to 4.12.1 + * KDE 4.12.1 release + * See http://www.kde.org/announcements/announce-4.12.1.php + +------------------------------------------------------------------- Old: ---- libksane-4.12.0.tar.xz New: ---- libksane-4.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.ymCfDZ/_old 2014-01-27 11:15:22.000000000 +0100 +++ /var/tmp/diff_new_pack.ymCfDZ/_new 2014-01-27 11:15:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libksane # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ License: GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.12.0 +Version: 4.12.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libksane-4.12.0.tar.xz -> libksane-4.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.12.0/libksane/ksane_preview_thread.cpp new/libksane-4.12.1/libksane/ksane_preview_thread.cpp --- old/libksane-4.12.0/libksane/ksane_preview_thread.cpp 2013-08-15 21:22:30.000000000 +0200 +++ new/libksane-4.12.1/libksane/ksane_preview_thread.cpp 2014-01-05 12:23:25.000000000 +0100 @@ -48,7 +48,7 @@ m_saneHandle(handle), m_invertColors(false), m_readStatus(READ_READY), - m_scanProgress(0), +// m_scanProgress(0), m_saneStartDone(false), m_imageResized(false) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.12.0/libksane/ksane_preview_thread.h new/libksane-4.12.1/libksane/ksane_preview_thread.h --- old/libksane-4.12.0/libksane/ksane_preview_thread.h 2013-08-15 21:22:30.000000000 +0200 +++ new/libksane-4.12.1/libksane/ksane_preview_thread.h 2014-01-05 12:23:25.000000000 +0100 @@ -84,7 +84,7 @@ SANE_Handle m_saneHandle; bool m_invertColors; ReadStatus m_readStatus; - int m_scanProgress; +// int m_scanProgress; bool m_saneStartDone; bool m_imageResized; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.12.0/libksane/ksane_widget.cpp new/libksane-4.12.1/libksane/ksane_widget.cpp --- old/libksane-4.12.0/libksane/ksane_widget.cpp 2013-08-15 21:22:30.000000000 +0200 +++ new/libksane-4.12.1/libksane/ksane_widget.cpp 2014-01-05 12:23:25.000000000 +0100 @@ -566,7 +566,7 @@ 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); + imgLine = reinterpret_cast<QRgb*>(img.scanLine(i)); for (j=0; (j<img.width() && dI<data.size()); j++) { imgLine[j] = qRgb(data[dI], data[dI], data[dI]); dI++; @@ -579,7 +579,7 @@ 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); + imgLine = reinterpret_cast<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; @@ -592,7 +592,7 @@ 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); + imgLine = reinterpret_cast<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; @@ -605,7 +605,7 @@ 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); + imgLine = reinterpret_cast<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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.12.0/libksane/ksane_widget_private.cpp new/libksane-4.12.1/libksane/ksane_widget_private.cpp --- old/libksane-4.12.0/libksane/ksane_widget_private.cpp 2013-08-15 21:22:30.000000000 +0200 +++ new/libksane-4.12.1/libksane/ksane_widget_private.cpp 2014-01-05 12:23:25.000000000 +0100 @@ -819,6 +819,9 @@ if (m_optResY != 0) m_optResY->restoreSavedData(); if (m_optPreview != 0) m_optPreview->restoreSavedData(); + m_previewViewer->setQImage(&m_previewImg); + m_previewViewer->zoom2Fit(); + if ((m_previewThread->status != SANE_STATUS_GOOD) && (m_previewThread->status != SANE_STATUS_EOF)) { @@ -832,8 +835,6 @@ m_scanOngoing = false; m_updProgressTmr.stop(); - m_previewViewer->updateImage(); - emit (q->scanDone(KSaneWidget::NoError, "")); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.12.0/libksane/splittercollapser.h new/libksane-4.12.1/libksane/splittercollapser.h --- old/libksane-4.12.0/libksane/splittercollapser.h 2013-08-15 21:22:30.000000000 +0200 +++ new/libksane-4.12.1/libksane/splittercollapser.h 2014-01-05 12:23:25.000000000 +0100 @@ -33,7 +33,7 @@ namespace KSaneIface { -class SplitterCollapserPrivate; +struct SplitterCollapserPrivate; /** * A button which appears on the side of a splitter handle and allows easy * collapsing of the widget on the opposite side -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
