[Gnash-commit] gnash ChangeLog gui/kde_glue_agg.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/23 20:33:38

Modified files:
        .              : ChangeLog 
        gui            : kde_glue_agg.cpp 

Log message:
        keep rendering no matter what HAVE_QTOPIA says
        (or rendering would be disabled for normal kde-gnash)
        [ this is a dejavu.. see ChangeLog entry of 2007-11-30 ]
        Fixes bug #22093.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5481&r2=1.5482
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue_agg.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5481
retrieving revision 1.5482
diff -u -b -r1.5481 -r1.5482
--- ChangeLog   23 Jan 2008 18:13:13 -0000      1.5481
+++ ChangeLog   23 Jan 2008 20:33:37 -0000      1.5482
@@ -1,3 +1,10 @@
+2008-01-23 Sandro Santilli <address@hidden>
+
+       * gui/kde_glue_agg.cpp: keep rendering no matter what HAVE_QTOPIA says
+         (or rendering would be disabled for normal kde-gnash)
+         [ this is a dejavu.. see ChangeLog entry of 2007-11-30 ]
+         Fixes bug #22093.
+
 2008-01-23 Bastiaan Jacques <address@hidden>
 
        * server/asobj/SoundGst.cpp: loadSound: if this is a streaming sound,

Index: gui/kde_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue_agg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gui/kde_glue_agg.cpp        21 Jan 2008 20:55:41 -0000      1.10
+++ gui/kde_glue_agg.cpp        23 Jan 2008 20:33:38 -0000      1.11
@@ -105,9 +105,8 @@
 {
     // In order to use our buffer in QT, we must copy it into a pixmap. This is
     // an expensive operation, but, as far as I can see, the only way to do it.
-#if HAVE_QTOPIA > 2
     QPixmap qpixmap(*_qimage);
-#endif
+
     for (unsigned bno=0; bno < _drawbounds.size(); bno++) {
        geometry::Range2d<int>& bounds = _drawbounds[bno];
 
@@ -117,10 +116,8 @@
        QRect src_rect(bounds.getMinX(), bounds.getMinY(), bounds.width(),
                       bounds.height());
        
-#if HAVE_QTOPIA > 2
        bitBlt (_drawing_area, dest_point, &qpixmap, src_rect, Qt::CopyROP,
                true /* ignore mask */ );
-#endif
     }
 }