1 files changed, 5 insertions, 0 deletions

diff --git a/noncore/graphics/drawpad/filltool.cpp b/noncore/graphics/drawpad/filltool.cpp
index 2a39d04..b47aa60 100644
--- a/noncore/graphics/drawpad/filltool.cpp
+++ b/noncore/graphics/drawpad/filltool.cpp
@@ -1,102 +1,107 @@
 /***************************************************************************
  *                                                                         *
  *   DrawPad - a drawing program for Opie Environment                      *
  *                                                                         *
  *   (C) 2002 by S. Prud'homme <prudhomme@laposte.net>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "filltool.h"
 
 #include "drawpad.h"
 #include "drawpadcanvas.h"
 #include "page.h"
 
 #include <qimage.h>
 
 const int FILL_THRESHOLD = 65536;
 
 FillTool::FillTool(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas)
     : Tool(drawPad, drawPadCanvas)
 {
 }
 
 FillTool::~FillTool()
 {
 }
 
 void FillTool::mousePressEvent(QMouseEvent* e)
 {
     int x = e->x();
     int y = e->y();
 
     m_image = m_pDrawPadCanvas->currentPage()->pixmap()->convertToImage();
+
+    if (m_image.depth() <= 8) {
+        m_image = m_image.convertDepth(32);
+    }
+
     m_fillRgb = m_pDrawPad->brush().color().rgb();
     m_oldRgb = m_image.pixel(x, y);
 
     if (m_oldRgb != m_fillRgb) {
         m_pDrawPadCanvas->backupPage();
 
         if (m_pDrawPad->antiAliasing()) {
             m_mask.create(m_image.width(), m_image.height(), 8, 2);
             m_mask.fill(0);
 
             fillMaskLine(x, y);
 
             for (int i = 0; i < m_image.width(); i++) {
                 for (int j = 0; j < m_image.height(); j++) {
                     if (m_mask.pixelIndex(i, j) == 1) {
                         setInterpolatedPixel(i, j);
                     }
                 }
             }
 
         } else {
             fillLine(x, y);
         }
 
         m_pDrawPadCanvas->currentPage()->pixmap()->convertFromImage(m_image);
         m_pDrawPadCanvas->viewport()->update();
     }
 }
 
 void FillTool::mouseReleaseEvent(QMouseEvent* e)
 {
     Q_UNUSED(e)
 }
 
 void FillTool::mouseMoveEvent(QMouseEvent* e)
 {
     Q_UNUSED(e)
 }
 
 void FillTool::fillLine(int x, int y)
 {
     if ((x >= 0) && (x < m_image.width()) && (y >= 0) && (y < m_image.height())) {
         if (m_image.pixel(x, y) == m_oldRgb) {
             int x1, x2;
 
             x1 = x - 1;
             x2 = x + 1;
 
             while ((x1 >= 0) && (m_image.pixel(x1, y) == m_oldRgb)) {
                 x1--;
             }
 
             while ((x2 < m_image.width()) && (m_image.pixel(x2, y) == m_oldRgb)) {
                 x2++;
             }
 
             for (int i = x1 + 1; i < x2; i++) {
                 m_image.setPixel(i, y, m_fillRgb);
             }
 
             for (int i = x1 + 1; i < x2; i++) {
                 fillLine(i, y - 1);
             }