[Digikam-devel] [Bug 146072] Slideshow shows black screen

[Gilles Caulier]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=146072         
caulier.gilles gmail com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From caulier.gilles gmail com  2007-05-29 18:00 -------
SVN commit 669532 by cgilles:

digikam from trunk : fix Slideshow and Threaded Image IO interface witch is broken since the last one is ported from QImage to Dimg
BUG: 146072


 M  +8 -7      slideshow.cpp  
 M  +2 -1      slideshow.h  


--- trunk/extragear/graphics/digikam/utilities/slideshow/slideshow.cpp #669531:669532
 @ -44,6 +44,7  @
 // Local includes.
 
 #include "ddebug.h"
+#include "dimg.h"
 #include "toolbar.h"
 #include "previewloadthread.h"
 #include "slideshow.h"
 @ -81,7 +82,7  @
 
     QPixmap            pixmap;
 
-    QImage             preview;
+    DImg               preview;
 
     KURL               currentImage;
 
 @ -149,8 +150,8  @
     d->timer                = new QTimer();
     d->mouseMoveTimer       = new QTimer();
 
-    connect(d->previewThread, SIGNAL(signalPreviewLoaded(const LoadingDescription &, const QImage &)),
-            this, SLOT(slotGotImagePreview(const LoadingDescription &, const QImage&)));
+    connect(d->previewThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)),
+            this, SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&)));
 
     connect(d->mouseMoveTimer, SIGNAL(timeout()),
             this, SLOT(slotMouseMoveTimeOut()));
 @ -221,7 +222,7  @
     else
     {
         d->currentImage = KURL();
-        d->preview = QImage();
+        d->preview = DImg();
         updatePixmap();
         update();
     }
 @ -256,14 +257,14  @
     else
     {
         d->currentImage = KURL();
-        d->preview = QImage();
+        d->preview = DImg();
         updatePixmap();
         update();
     }
 
 }
 
-void SlideShow::slotGotImagePreview(const LoadingDescription&, const QImage& preview)
+void SlideShow::slotGotImagePreview(const LoadingDescription&, const DImg& preview)
 {
     d->preview = preview;
 
 @ -310,7 +311,7  @
         {
             // Preview extraction is complete... Draw the image.
 
-            QPixmap pix(d->preview.smoothScale(size(), QImage::ScaleMin));
+            QPixmap pix(d->preview.smoothScale(width(), height(), QSize::ScaleMin).convertToPixmap());
             p.drawPixmap((width()-pix.width())/2,
                          (height()-pix.height())/2, pix,
                          0, 0, pix.width(), pix.height());
--- trunk/extragear/graphics/digikam/utilities/slideshow/slideshow.h #669531:669532
 @ -37,6 +37,7  @
 namespace Digikam
 {
 
+class DImg;
 class SlideShowPriv;
 
 class DIGIKAM_EXPORT SlideShow : public QWidget
 @ -62,7 +63,7  @
 
     void slotTimeOut();
     void slotMouseMoveTimeOut();
-    void slotGotImagePreview(const LoadingDescription &, const QImage &);
+    void slotGotImagePreview(const LoadingDescription &, const DImg &);
 
     void slotPause();
     void slotPlay();