[Gnash-commit] gnash ChangeLog gui/gtk_glue_agg.cpp [release_0_7_2]

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Markus Gothe <nihilus>  06/10/29 22:06:22

Modified files:
        .              : ChangeLog 
        gui            : gtk_glue_agg.cpp 

Log message:
        Added latest AGG-patch from Hannes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.2&r2=1.1412.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7&r2=1.7.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.2
retrieving revision 1.1412.2.3
diff -u -b -r1.1412.2.2 -r1.1412.2.3
--- ChangeLog   29 Oct 2006 21:55:49 -0000      1.1412.2.2
+++ ChangeLog   29 Oct 2006 22:06:21 -0000      1.1412.2.3
@@ -3,6 +3,11 @@
        * configure.ac, packaging/redhat/gnash.spec: Changed version to 
          "0.7.2".
 
+2006-10-27 Hannes Mayr <address@hidden>
+
+       * gtk_glue_agg.cpp: Fixed rendering for screens with 8-bit and
+         16-bit color depth.
+
 2006-10-26 Sandro Santilli <address@hidden>
 
        * server/as_object.h: new add_property() method

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- gui/gtk_glue_agg.cpp        26 Oct 2006 13:15:46 -0000      1.7
+++ gui/gtk_glue_agg.cpp        29 Oct 2006 22:06:22 -0000      1.7.2.1
@@ -14,28 +14,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// Linking Gnash statically or dynamically with other modules is making a
-// combined work based on Gnash. Thus, the terms and conditions of the GNU
-// General Public License cover the whole combination.
-//
-// As a special exception, the copyright holders of Gnash give you
-// permission to combine Gnash with free software programs or libraries
-// that are released under the GNU LGPL and with code included in any
-// release of Talkback distributed by the Mozilla Foundation. You may
-// copy and distribute such a system following the terms of the GNU GPL
-// for all but the LGPL-covered parts and Talkback, and following the
-// LGPL for the LGPL-covered parts.
-//
-// Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is their
-// choice whether to do so. The GNU General Public License gives permission
-// to release a modified version without this exception; this exception
-// also makes it possible to release a modified version which carries
-// forward this exception.
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.7 2006/10/26 13:15:46 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.7.2.1 2006/10/29 22:06:22 nihilus Exp $ */
 
 #include <cstdio>
 #include <cerrno>
@@ -72,7 +54,9 @@
 {
     gdk_rgb_init();
 
-               _bpp = gdk_visual_get_best_depth();
+               // GDK's gdk_draw_rgb_image() needs 24-bit RGB data, so we 
initialize the
+               // AGG renderer with RGB24 and let GTK take care of the proper 
pixel format.
+               _bpp = 24;
     
     return true;
 }
@@ -86,30 +70,7 @@
 render_handler*
 GtkAggGlue::createRenderHandler()
 {
-               char bppformat[7] = {0,}; // char *bppformat;?
-
-               switch(_bpp) {
-       case 8:
-               strncpy(bppformat, "RGBA8", sizeof(bppformat));
-               break;
-       case 16:
-               strncpy(bppformat, "RGBA16", sizeof(bppformat));
-               break;
-       case 24:
-               strncpy(bppformat, "RGB24", sizeof(bppformat));
-               break;
-       case 32:
-               strncpy(bppformat, "RGBA32", sizeof(bppformat));
-               break;
-       default:
-               log_error("%i bits per pixel not supported by the AGG 
renderer!\n", _bpp);
-               return NULL;
-    }
-
-               log_msg("GTK-AGG: Create renderer with pixelformat %s\n", 
bppformat);
-               _agg_renderer = create_render_handler_agg(
-       bppformat
-    );
+               _agg_renderer = create_render_handler_agg("RGB24");
     return _agg_renderer;
 }
 
@@ -205,7 +166,7 @@
        miny,
                maxx-minx,
                maxy-miny,
-               GDK_RGB_DITHER_NONE,
+               GDK_RGB_DITHER_NORMAL,
                _offscreenbuf + miny*(_width*(_bpp/8)) + minx*(_bpp/8),
                (int)((_width)*_bpp/8)
        );