Bug 200558 - Crash when saving scanned image to .tiff
Summary: Crash when saving scanned image to .tiff
Status: RESOLVED FIXED
Alias: None
Product: libksane
Classification: Frameworks and Libraries
Component: general (show other bugs)
Version: unspecified
Platform: Debian testing Linux
: NOR crash
Target Milestone: ---
Assignee: imaging-bugs-null
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-07-17 15:11 UTC by Michael G. Hansen
Modified: 2015-09-17 09:29 UTC (History)
4 users (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Michael G. Hansen 2009-07-17 15:11:44 UTC
Version:           0.5 (using KDE 4.2.4)
OS:                Linux
Installed from:    Debian testing/unstable Packages

When I scan an image and save it as '.tiff', acquireimages crashes. A crashdump is attached below. The crashdump is saved when starting acquireimages from a simple test program, but they happen in Digikam (1.0b1) all the same. I tried to different scanners, and the crash occurred on both.

Application: Kipi Test (kipitest), signal SIGSEGV
0x00007fde13003821 in nanosleep () from /lib/libc.so.6
Current language:  auto; currently c
[Current thread is 1 (Thread 0x7fde16baa760 (LWP 10038))]

Thread 2 (Thread 0x7fddf5320950 (LWP 10052)):
#0  0x00007fde1302a066 in *__GI___poll (fds=0xac3120, nfds=2, timeout=-1) at ../sysdeps/unix/sysv/linux/poll.c:87
#1  0x00007fddf553ac8b in ?? () from /usr/lib/libavahi-common.so.3
#2  0x00007fddf55397ae in avahi_simple_poll_run () from /usr/lib/libavahi-common.so.3
#3  0x00007fddf5539f3d in avahi_simple_poll_iterate () from /usr/lib/libavahi-common.so.3
#4  0x00007fddf5539f6d in avahi_simple_poll_loop () from /usr/lib/libavahi-common.so.3
#5  0x00007fddf553aace in ?? () from /usr/lib/libavahi-common.so.3
#6  0x00007fde1173af7a in start_thread (arg=<value optimized out>) at pthread_create.c:300
#7  0x00007fde1303289d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:112
#8  0x0000000000000000 in ?? ()

Thread 1 (Thread 0x7fde16baa760 (LWP 10038)):
[KCrash Handler]
#5  0x00007fde0b34d5bb in ?? () from /usr/lib/libtiff.so.4
#6  0x00007fde0b34c948 in TIFFSetField () from /usr/lib/libtiff.so.4
#7  0x00007fde0ba34e9e in KIPIPlugins::KPWriteImage::write2TIFF (this=0x7fff1ecf1940, destPath=...) at /c/temp/svntrack/kipi-plugins/common/libkipiplugins/kpwriteimage.cpp:537
#8  0x00007fddff44e3d9 in KIPIAcquireImagesPlugin::ScanDialog::slotSaveImage (this=0x7fff1ecf2c10, ksane_data=..., width=320, height=240, bytes_per_line=1280, ksaneformat=3)
    at /c/temp/svntrack/kipi-plugins/acquireimages/scandialog.cpp:312
#9  0x00007fddff44f5a4 in KIPIAcquireImagesPlugin::ScanDialog::qt_metacall (this=0x7fff1ecf2c10, _c=QMetaObject::InvokeMetaMethod, _id=0, _a=0x7fff1ecf1ff0) at ./scandialog.moc:70
#10 0x00007fde147d6602 in QMetaObject::activate (sender=0xa52f50, from_signal_index=<value optimized out>, to_signal_index=27, argv=0x0) at kernel/qobject.cpp:3112
#11 0x00007fddff233906 in KSaneIface::KSaneWidget::imageReady(QByteArray&, int, int, int, int) () from /usr/lib/libksane.so.0
#12 0x00007fddff2339bc in KSaneIface::KSaneWidget::scanDone() () from /usr/lib/libksane.so.0
#13 0x00007fddff23a6a2 in KSaneIface::KSaneWidget::processData() () from /usr/lib/libksane.so.0
#14 0x00007fddff23b470 in KSaneIface::KSaneWidget::qt_metacall(QMetaObject::Call, int, void**) () from /usr/lib/libksane.so.0
#15 0x00007fde147d6602 in QMetaObject::activate (sender=0xa696a0, from_signal_index=<value optimized out>, to_signal_index=4, argv=0x0) at kernel/qobject.cpp:3112
#16 0x00007fde147d0b73 in QObject::event (this=0xa696a0, e=0x10) at kernel/qobject.cpp:1074
#17 0x00007fde13c397ad in QApplicationPrivate::notify_helper (this=0x8193b0, receiver=0xa696a0, e=0x7fff1ecf28e0) at kernel/qapplication.cpp:4056
#18 0x00007fde13c4180a in QApplication::notify (this=0x7fff1ecf3020, receiver=0xa696a0, e=0x7fff1ecf28e0) at kernel/qapplication.cpp:4021
#19 0x00007fde1561438b in KApplication::notify (this=0x7fff1ecf3020, receiver=0xa696a0, event=0x7fff1ecf28e0) at ../../kdeui/kernel/kapplication.cpp:307
#20 0x00007fde147c149c in QCoreApplication::notifyInternal (this=0x7fff1ecf3020, receiver=0xa696a0, event=0x7fff1ecf28e0) at kernel/qcoreapplication.cpp:610
#21 0x00007fde147ed7a6 in QCoreApplication::sendEvent (this=0x81d0f0) at ../../include/QtCore/../../src/corelib/kernel/qcoreapplication.h:213
#22 QTimerInfoList::activateTimers (this=0x81d0f0) at kernel/qeventdispatcher_unix.cpp:572
#23 0x00007fde147e9c1d in timerSourceDispatch (source=<value optimized out>) at kernel/qeventdispatcher_glib.cpp:165
#24 0x00007fde104577aa in g_main_context_dispatch () from /usr/lib/libglib-2.0.so.0
#25 0x00007fde1045adf8 in ?? () from /usr/lib/libglib-2.0.so.0
#26 0x00007fde1045afac in g_main_context_iteration () from /usr/lib/libglib-2.0.so.0
#27 0x00007fde147e9b7f in QEventDispatcherGlib::processEvents (this=0x80d5d0, flags=<value optimized out>) at kernel/qeventdispatcher_glib.cpp:327
#28 0x00007fde13cd05ef in QGuiEventDispatcherGlib::processEvents (this=0x1299200, flags=<value optimized out>) at kernel/qguieventdispatcher_glib.cpp:202
#29 0x00007fde147bfd62 in QEventLoop::processEvents (this=<value optimized out>, flags=...) at kernel/qeventloop.cpp:149
#30 0x00007fde147c0134 in QEventLoop::exec (this=0x7fff1ecf2b90, flags=...) at kernel/qeventloop.cpp:201
#31 0x00007fde140c3a3e in QDialog::exec (this=0x7fff1ecf2c10) at dialogs/qdialog.cpp:498
#32 0x00007fddff44c280 in Plugin_AcquireImages::slotActivate (this=0x894550) at /c/temp/svntrack/kipi-plugins/acquireimages/plugin_acquireimages.cpp:124
#33 0x00007fddff44cb4a in Plugin_AcquireImages::qt_metacall (this=0x894550, _c=QMetaObject::InvokeMetaMethod, _id=0, _a=0x7fff1ecf2dc0) at ./plugin_acquireimages.moc:68
#34 0x00007fde147d6602 in QMetaObject::activate (sender=0xa66970, from_signal_index=<value optimized out>, to_signal_index=6, argv=0x0) at kernel/qobject.cpp:3112
#35 0x00007fde13c338d7 in QAction::triggered (this=0x1299200, _t1=false) at .moc/release-shared/moc_qaction.cpp:236
#36 0x00007fde13c34d50 in QAction::activate (this=0xa66970, event=<value optimized out>) at kernel/qaction.cpp:1160
#37 0x0000000000406600 in QAction::trigger (this=0xa66970) at /usr/include/qt4/QtGui/qaction.h:203
#38 0x0000000000403f26 in CallAction (actionText=..., libraryName=...) at /home/src/kipitest/main.cpp:229
#39 0x0000000000404fe8 in main (argc=3, argv=0x7fff1ecf3488) at /home/src/kipitest/main.cpp:303
Comment 1 Michael G. Hansen 2009-07-17 15:16:54 UTC
libtiff4 version: 3.8.2-13
Comment 2 Nicolas L. 2009-07-17 18:34:11 UTC
reproduced here with current trunk
Comment 3 Nicolas L. 2009-07-17 19:34:13 UTC
i try to understand the issue.
the main pb comes from common/libkipiplugins/kpwriteimage.cpp line 537 
TIFFSetField(tif, TIFFTAG_EXTRASAMPLES,    EXTRASAMPLE_ASSOCALPHA);

i commented it for test purposes and all is OK

i will try to debug more today
Comment 4 caulier.gilles 2009-07-17 19:51:54 UTC
Nicolas,

Look there : http://www.awaresystems.be/imaging/tiff/tifftags/extrasamples.html

In other words, this want mean that tiff image will have an alpha chanel, typicaly taken from ARGB QImage container. Imagine that QIMage data is composed of RGB components... boum...

I see recently tat Kare as changed a lots of code from libksane. This can be the problem.

A wrap around is to check if the QImage has an alpha chanel and adapt tiff image tag accordingly

Gilles Caulier
Comment 5 Nicolas L. 2009-07-17 23:29:30 UTC
after looking deeper i have clue:

in acquireimages/scandialog.cpp line 292 we have 

    if ( frmt != KSaneIface::KSaneWidget::FormatRGB_16_C )
    {
        QByteArray data((const char*)img.bits(), img.numBytes());
        wImageIface.setImageData(data, img.width(), img.height(), false, true, prof, meta);
    }

this is used when there is no alpha Channel, but KSaneIface::KSaneWidget::FormatRGB_8_C doesn't have any alpha channel too so i want to add :

Index: acquireimages/scandialog.cpp
===================================================================
--- acquireimages/scandialog.cpp        (révision 998526)
+++ acquireimages/scandialog.cpp        (copie de travail)
@@ -288,14 +288,15 @@
     meta.setImageColorWorkSpace(KExiv2Iface::KExiv2::WORKSPACE_SRGB);

     KIPIPlugins::KPWriteImage wImageIface;
-    if (frmt != KSaneIface::KSaneWidget::FormatRGB_16_C)
+
+    if ( frmt != KSaneIface::KSaneWidget::FormatRGB_16_C || frmt != KSaneIface::KSaneWidget::FormatRGB_8_C )
     {
         QByteArray data((const char*)img.bits(), img.numBytes());
         wImageIface.setImageData(data, img.width(), img.height(), false, true, prof, meta);
     }
     else
     {
-        // 16 bits color depth image.
+        // 8 and 16 bits color depth image.
         wImageIface.setImageData(ksane_data, width, height, true, false, prof, meta);
     }


this doesn't fix the issue for me but this seems cleaner and maybe fix some other crashes
Comment 6 Nicolas L. 2009-07-18 00:35:30 UTC
My logic was wrong.

This patch fixes the issue. can i commit this ?

Index: acquireimages/scandialog.cpp
===================================================================
--- acquireimages/scandialog.cpp        (révision 998526)
+++ acquireimages/scandialog.cpp        (copie de travail)
@@ -288,15 +288,16 @@
     meta.setImageColorWorkSpace(KExiv2Iface::KExiv2::WORKSPACE_SRGB);

     KIPIPlugins::KPWriteImage wImageIface;
-    if (frmt != KSaneIface::KSaneWidget::FormatRGB_16_C)
+
+    if ( (frmt = KSaneIface::KSaneWidget::FormatRGB_16_C) || (frmt = KSaneIface::KSaneWidget::FormatRGB_8_C) )
     {
-        QByteArray data((const char*)img.bits(), img.numBytes());
-        wImageIface.setImageData(data, img.width(), img.height(), false, true, prof, meta);
+        // 8 and 16 bits color depth image.
+        wImageIface.setImageData(ksane_data, width, height, true, false, prof, meta);
     }
     else
     {
-        // 16 bits color depth image.
-        wImageIface.setImageData(ksane_data, width, height, true, false, prof, meta);
+        QByteArray data((const char*)img.bits(), img.numBytes());
+        wImageIface.setImageData(data, img.width(), img.height(), false, true, prof, meta);
     }

     if (format == QString("JPEG"))
Comment 7 caulier.gilles 2009-07-18 05:23:06 UTC
Fine for me

Gilles
Comment 8 Nicolas L. 2009-07-18 10:15:55 UTC
sorry i forgot to close the bugreport when commiting.

i commited revision 998596.

Please reopen if the bug still appear
Comment 9 Michael G. Hansen 2009-07-23 06:13:24 UTC
I'm sorry to say that the patch still does not work for me. I am now also getting crashes when saving to PNG. I think the problem is that wImageIface.setImageData is now called with sixteenBit=true for both 8 and 16 bit cases.

Declaration: void setImageData(const QByteArray& data, uint width, uint height,
                      bool sixteenBit, bool hasAlpha,
                      const QByteArray& iccProfile,
                      const KExiv2Iface::KExiv2& metadata)

// relevant code:
if ( (frmt = KSaneIface::KSaneWidget::FormatRGB_16_C) || (frmt =
KSaneIface::KSaneWidget::FormatRGB_8_C) )
     {
        // 8 and 16 bits color depth image.
        wImageIface.setImageData(ksane_data, width, height, true, false, prof,
meta);
Comment 10 Michael G. Hansen 2009-07-23 06:14:27 UTC
sorry, forgot to re-open
Comment 11 Nicolas L. 2009-07-23 08:30:16 UTC
can you provide a backtrace for you crash and for the crash with a PNG file please ?
Comment 12 Nicolas L. 2009-07-23 08:53:03 UTC
[KCrash Handler]
#6  KIPIPlugins::KPWriteImage::write2PNG (this=0xbf802de0, destPath=@0xbf802dd0) at /home/niconico/Documents/SVN_KDE/extragear/graphics/kipi-plugins/common/libkipiplugins/kpwriteimage.cpp:455
#7  0xa8b4742e in KIPIAcquireImagesPlugin::ScanDialog::slotSaveImage (this=0xbf8039e4, ksane_data=@0xd47036c, width=5098, height=7012, bytes_per_line=20392, ksaneformat=3)
    at /home/niconico/Documents/SVN_KDE/extragear/graphics/kipi-plugins/acquireimages/scandialog.cpp:309
#8  0xa8b486cb in KIPIAcquireImagesPlugin::ScanDialog::qt_metacall (this=0xbf8039e4, _c=QMetaObject::InvokeMetaMethod, _id=73, _a=0xbf803018)
    at /home/niconico/Documents/SVN_KDE/extragear/graphics/kipi-plugins/build/acquireimages/scandialog.moc:70
#9  0xb5815f29 in QMetaObject::activate (sender=0xd1b8b30, from_signal_index=27, to_signal_index=27, argv=0xbf803018) at kernel/qobject.cpp:3104
#10 0xb5816c65 in QMetaObject::activate (sender=0xd1b8b30, m=0xa8b228e8, local_signal_index=0, argv=0xbf803018) at kernel/qobject.cpp:3178
#11 0xa8b075ee in KSaneIface::KSaneWidget::imageReady (this=0xd1b8b30, _t1=@0xd47036c, _t2=5098, _t3=7012, _t4=20392, _t5=3)
    at /usr/src/debug/kdegraphics-4.2.96/build/libs/libksane/libksane/ksane.moc:93
#12 0xa8b076a7 in KSaneIface::KSaneWidget::qt_metacall (this=0xd1b8b30, _c=QMetaObject::InvokeMetaMethod, _id=27, _a=0xbf803158)
    at /usr/src/debug/kdegraphics-4.2.96/build/libs/libksane/libksane/ksane.moc:77
#13 0xb5815f29 in QMetaObject::activate (sender=0xd4702b8, from_signal_index=4, to_signal_index=4, argv=0xbf803158) at kernel/qobject.cpp:3104
#14 0xb5816c65 in QMetaObject::activate (sender=0xd4702b8, m=0xa8b22a08, local_signal_index=0, argv=0xbf803158) at kernel/qobject.cpp:3178
#15 0xa8b0c3ee in KSaneIface::KSaneWidgetPrivate::imageReady (this=0xd4702b8, _t1=@0xd47036c, _t2=5098, _t3=7012, _t4=20392, _t5=3)
    at /usr/src/debug/kdegraphics-4.2.96/build/libs/libksane/libksane/ksane_widget_private.moc:118
#16 0xa8b0c553 in KSaneIface::KSaneWidgetPrivate::scanDone (this=0xd4702b8) at /usr/src/debug/kdegraphics-4.2.96/libs/libksane/libksane/ksane_widget_private.cpp:867
#17 0xa8b0c8a3 in KSaneIface::KSaneWidgetPrivate::processData (this=0xd4702b8) at /usr/src/debug/kdegraphics-4.2.96/libs/libksane/libksane/ksane_widget_private.cpp:993
#18 0xa8b0d194 in KSaneIface::KSaneWidgetPrivate::qt_metacall (this=0xd4702b8, _c=QMetaObject::InvokeMetaMethod, _id=18, _a=0xbbada10)
    at /usr/src/debug/kdegraphics-4.2.96/build/libs/libksane/libksane/ksane_widget_private.moc:106
#19 0xb580e68a in QMetaCallEvent::placeMetaCall (this=0xd4f47b8, object=0xd4702b8) at kernel/qobject.cpp:477
#20 0xb580fda6 in QObject::event (this=0xd4702b8, e=0xd4f47b8) at kernel/qobject.cpp:1102
#21 0xb5cd63ac in QApplicationPrivate::notify_helper (this=0x9c582d0, receiver=0xd4702b8, e=0xd4f47b8) at kernel/qapplication.cpp:4056
#22 0xb5cddefe in QApplication::notify (this=0xbf805c98, receiver=0xd4702b8, e=0xd4f47b8) at kernel/qapplication.cpp:3603
#23 0xb676fcd8 in KApplication::notify (this=0xbf805c98, receiver=0xd4702b8, event=0xd4f47b8) at /usr/src/debug/kdelibs-4.2.96/kdeui/kernel/kapplication.cpp:302
#24 0xb57ff79e in QCoreApplication::notifyInternal (this=0xbf805c98, receiver=0xd4702b8, event=0xd4f47b8) at kernel/qcoreapplication.cpp:610
#25 0xb580040a in QCoreApplicationPrivate::sendPostedEvents (receiver=0x0, event_type=0, data=0x9c328a0) at ../../src/corelib/kernel/qcoreapplication.h:213
#26 0xb58005ec in QCoreApplication::sendPostedEvents (receiver=0x0, event_type=0) at kernel/qcoreapplication.cpp:1140
#27 0xb582bdcd in postEventSourceDispatch (s=0x9c5b108) at ../../src/corelib/kernel/qcoreapplication.h:218
Comment 13 caulier.gilles 2009-07-23 09:07:46 UTC
/home/niconico/Documents/SVN_KDE/extragear/graphics/kipi-plugins/common/libkipiplugins/kpwriteimage.cpp:455

Sound like you is outside image data...

Gilles
Comment 14 Nicolas L. 2009-07-23 09:17:47 UTC
what do you mean gilles ?
Comment 15 Nicolas L. 2009-07-23 09:19:54 UTC
i think i understand what you mean.  How can we know this ? i mean how to know if a PNG image can be set with sixteenBit ?
Comment 16 Michael G. Hansen 2009-07-23 09:55:14 UTC
I googled a bit on the offending line in kwriteimage.cpp that caused the original crash and found this bugreport on libimlib2 including a patch:
http://www.mail-archive.com/debian-bugs-closed@lists.debian.org/msg98527.html

Applying this patch to kwriteimage.cpp and reverting the changes to scandialog.cpp to pre-998596 fixes the crashes for me (for 8-bit tiff, that is, as I do not have a way to test 16-bit).

Index: common/libkipiplugins/kpwriteimage.cpp
===================================================================
--- common/libkipiplugins/kpwriteimage.cpp      (revision 998734)
+++ common/libkipiplugins/kpwriteimage.cpp      (working copy)
@@ -533,8 +533,9 @@

     if (d->hasAlpha)
     {
-        TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 4);
-        TIFFSetField(tif, TIFFTAG_EXTRASAMPLES,    EXTRASAMPLE_ASSOCALPHA);
+        uint16 extras[] = { EXTRASAMPLE_ASSOCALPHA };
+        TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 4);
+        TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, 1, extras);
     }
     else
     {
Comment 17 caulier.gilles 2009-07-23 10:02:22 UTC
Nicolas,

Few pointers to check and compare. digiKam has TIFF, PNG, and JPEG image loader. Code is similar in kpwriteimage, but simplified a little. 

Look there :

http://websvn.kde.org/trunk/extragear/graphics/digikam/libs/dimg/loaders/tiffloader.cpp?revision=997129&view=markup

http://websvn.kde.org/trunk/extragear/graphics/digikam/libs/dimg/loaders/pngloader.cpp?revision=997129&view=markup

http://websvn.kde.org/trunk/extragear/graphics/digikam/libs/dimg/loaders/jpegloader.cpp?revision=998736&view=markup

Excepted for JPEG, PNG and TIFF loader support 16 bits/colors/pixels.

Gilles Caulier
Comment 18 Michael G. Hansen 2009-07-23 10:05:51 UTC
From `man TIFFSetField`:

Tag Name                        Count  Types              Notes
TIFFTAG_EXTRASAMPLES            2      uint16,uint16*     † count & types array

For "TIFFTAG_EXTRASAMPLES", "TIFFSetField" expects two parameters, instead of just one value, so the code from the patch is right.
Comment 19 Michael G. Hansen 2009-07-23 10:21:12 UTC
Looking at http://websvn.kde.org/trunk/extragear/graphics/digikam/libs/dimg/loaders/tiffloader.cpp?revision=997129&view=markup

Isn't the parameter to TIFFSetField here also wrong? "EXTRASAMPLE_ASSOCALPHA" just happens to be 1, that's why it does not show:

Index: libs/dimg/loaders/tiffloader.cpp
===================================================================
--- libs/dimg/loaders/tiffloader.cpp    (revision 1001413)
+++ libs/dimg/loaders/tiffloader.cpp    (working copy)
@@ -587,7 +587,7 @@
     {
         uint16 sampleinfo[1] = { EXTRASAMPLE_UNASSALPHA };
         TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 4);
-        TIFFSetField(tif, TIFFTAG_EXTRASAMPLES,    EXTRASAMPLE_ASSOCALPHA, sampleinfo);
+        TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, 1, sampleinfo);
     }
     else
     {
Comment 20 caulier.gilles 2009-07-23 10:34:39 UTC
Marcel, look comment #19 from Michael. What do you think about...

Michael, digiKam tiff loader is inspired from and old version of ImageMagick tiff loader, and checking last code, i think you has right :

http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.5.4/coders/tiff.c#L2309

Gilles Caulier
Comment 21 Marcel Wiesweg 2009-07-23 17:41:41 UTC
Indeed our code is strange there. We should apply the patch.
Further down in the code, we premultiply by alpha; so I think we have associated alpha (EXTRASAMPLE_ASSOCALPHA)?
Comment 22 caulier.gilles 2009-07-24 08:26:42 UTC
Nicolas,

To test without a real sane device, just go to /etc/sane.d/dll.conf and uncomment "test" driver.

After that, you will see 2 test devices in sane list. You can select bits depth (8 or 16) to test indeep code.

Gilles Caulier
Comment 23 caulier.gilles 2009-07-24 09:15:36 UTC
SVN commit 1001752 by cgilles:

fix associed alpha chanel registration with tiff image writer
BUGS: 200558


 M  +5 -1      kpwriteimage.cpp  


WebSVN link: http://websvn.kde.org/?view=rev&revision=1001752
Comment 24 Dario Andres 2009-08-26 00:23:36 UTC
*** Bug 205140 has been marked as a duplicate of this bug. ***
Comment 25 Kåre Särs 2009-09-22 22:13:30 UTC
SVN commit 1026910 by sars:

Revert commit 998596: "Fix crash when saving images in .tiff format"
998596 broke saving 8bit color images.

This should fix 208107 "corrupted image when saving a scan" and has should not break 200558 again as there was another fix for that.

I can now save 8 and 16 bit PNG, and 8 bitt TIFF, but the 16bit TIFFs are corrupted.

BUG:208107
CCBUG:200558

 M  +5 -6      scandialog.cpp  


WebSVN link: http://websvn.kde.org/?view=rev&revision=1026910