Fix floating point exception divide by 0 in qpedecoration

1 files changed, 12 insertions, 11 deletions

diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index 222d906..c2eb751 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -27,33 +27,33 @@
 #include <qwhatsthis.h>
 #include "qcopenvelope_qws.h"
 #include "qpedecoration_qws.h"
 #include <qdialog.h>
 #include <qdrawutil.h>
 #include <qgfx_qws.h>
 #include "qpeapplication.h"
 #include "resource.h"
 #include "global.h"
 #include "qlibrary.h"
 #include "windowdecorationinterface.h"
 #include <qfile.h>
 #include <qsignal.h>
 
 #include <stdlib.h>
 
-extern QRect qt_maxWindowRect; 
+extern QRect qt_maxWindowRect;
 
 #define WHATSTHIS_MODE
 
 #ifndef QT_NO_QWS_QPE_WM_STYLE
 
 #ifndef QT_NO_IMAGEIO_XPM
 
 /* XPM */
 static const char * const qpe_close_xpm[] = {
 "16 16 3 1",
 "       c None",
 ".      c #FFFFFF",
 "+      c #000000",
 "                ",
 "                ",
 "      .....     ",
@@ -94,33 +94,34 @@ static const char * const qpe_accept_xpm[] = {
 "      .....     ",
 "                "};
 
 #endif // QT_NO_IMAGEIO_XPM
 
 class HackWidget : public QWidget
 {
 public:
     bool needsOk() {
 	return (getWState() & WState_Reserved1 ) ||
 		 (inherits( "QDialog" ) && !inherits( "QMessageBox" ) );
     }
 };
 
 static QImage scaleButton( const QImage &img, int height )
 {
-    if ( img.height() != height ) {
+    qWarning("Height %d %d",  height, img.height() );
+    if ( img.height()!=0 && img.height() != height ) {
 	return img.smoothScale( img.width()*height/img.height(), height );
     } else {
 	return img;
     }
 }
 
 class TLWidget : public QWidget
 {
 public:
     QWSManager *manager()
     {
 	return topData()->qwsManager;
     }
 
     QTLWExtra *topExtra()
     {
@@ -634,89 +635,89 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor
 	    break;
 	case Help:
 	    if ( helpExists || widget->testWFlags(Qt::WStyle_ContextHelp) ) {
 		QRect r(rect.left(), rect.top() - titleHeight,
 			  helpWidth, titleHeight);
 		region = r;
 	    }
 	    break;
 	case Top:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		int b = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
 		region = m & QRect( br.left()+grab, br.top(),
 				    br.width()-2*grab, b );
 	    }
-	    break; 
+	    break;
 	case Left:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		int b = wdiface->metric(WindowDecorationInterface::LeftBorder,&wd);
 		region = m & QRect( br.left(), br.top()+grab,
 				    b, br.height()-2*grab );
 	    }
-	    break; 
+	    break;
 	case Right:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		int b = wdiface->metric(WindowDecorationInterface::RightBorder,&wd);
 		region = m & QRect( rect.right(), br.top()+grab,
 				    b, br.height()-2*grab );
 	    }
-	    break; 
+	    break;
 	case Bottom:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		int b = wdiface->metric(WindowDecorationInterface::BottomBorder,&wd);
 		region = m & QRect( br.left()+grab, rect.bottom(),
 				    br.width()-2*grab, b );
 	    }
 	    break;
 	case TopLeft:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		int tb = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
 		int lb = wdiface->metric(WindowDecorationInterface::LeftBorder,&wd);
 		QRegion crgn( br.left(), br.top(), grab, tb );
 		crgn |= QRect( br.left(), br.top(), lb, grab );
 		region = m & crgn;
 	    }
-	    break; 
+	    break;
 	case TopRight:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		int tb = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
 		int rb = wdiface->metric(WindowDecorationInterface::RightBorder,&wd);
 		QRegion crgn( br.right()-grab, br.top(), grab, tb );
 		crgn |= QRect( br.right()-rb, br.top(), rb, grab );
 		region = m & crgn;
 	    }
 	    break;
 	case BottomLeft:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		region = m & QRect( br.left(), br.bottom()-grab, grab, grab );
 	    }
-	    break; 
+	    break;
 	case BottomRight:
 	    if ( !widget->isMaximized() ) {
 		QRegion m = wdiface->mask(&wd);
 		QRect br = m.boundingRect();
 		region = m & QRect( br.right()-grab, br.bottom()-grab, grab, grab );
 	    }
 	    break;
 	case All:
 	    if ( widget->isMaximized() )
 		region = QWSDefaultDecoration::region(widget, rect, type);
 	    else
 		region = wdiface->mask(&wd) - rect;
 	    break;
 	default:
 	    region = QWSDefaultDecoration::region(widget, rect, type);
 	    break;
@@ -809,64 +810,64 @@ void QPEDecoration::paintButton(QPainter *painter, const QWidget *w,
     if ( wd.flags & WindowDecorationInterface::WindowData::Active )
 	painter->setPen( cg.color(QColorGroup::HighlightedText) );
     else
 	painter->setPen( cg.color(QColorGroup::Text) );
 
     QRegion oldClip = painter->clipRegion();
     painter->setClipRegion( QRect(brect.x(), tr.y(), brect.width(), tr.height()) ); // reduce flicker
     wdiface->drawArea( WindowDecorationInterface::Title, painter, &wd );
     wdiface->drawButton( b, painter, &wd, brect.x(), brect.y(), brect.width(), brect.height(), (QWSButton::State)state );
     painter->setClipRegion( oldClip );
 }
 
 //#define QPE_DONT_SHOW_TITLEBAR
 
 void QPEDecoration::maximize( QWidget *widget )
 {
-#ifdef QPE_DONT_SHOW_TITLEBAR    
+#ifdef QPE_DONT_SHOW_TITLEBAR
     if ( !widget->inherits( "QDialog" ) ) {
 	widget->setGeometry( qt_maxWindowRect );
-    } else 
-#endif	
+    } else
+#endif
 	{
 	QWSDecoration::maximize( widget );
     }
 }
 
 #ifndef QT_NO_DIALOG
 class HackDialog : public QDialog
 {
 public:
     void acceptIt() {
 	if ( isA( "QMessageBox" ) )
 	    qApp->postEvent( this, new QKeyEvent( QEvent::KeyPress, Key_Enter, '\n', 0, "\n" ) );
 	else
 	    accept();
     }
 };
 #endif
 
 
 void QPEDecoration::minimize( QWidget *widget )
 {
 #ifndef QT_NO_DIALOG
     // We use the minimize button as an "accept" button.
     if ( widget->inherits( "QDialog" ) ) {
         HackDialog *d = (HackDialog *)widget;
         d->acceptIt();
-    } 
+    }
 #endif
     else if ( ((HackWidget *)widget)->needsOk() ) {
 	QSignal s;
 	s.connect( widget, SLOT( accept() ) );
 	s.activate();
     } else {
 	help( widget );
     }
 }
 
 void QPEDecoration::help( QWidget *w )
 {
     if ( helpExists ) {
 	Global::execute( "helpbrowser", helpFile );
     } else if ( w && w->testWFlags(Qt::WStyle_ContextHelp) ) {
 	QWhatsThis::enterWhatsThisMode();