[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/15 22:40:57

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp 
        gui            : gtk_glue_agg.cpp gtk_glue_gtkglext.h kde_glue.h 

Log message:
        Added RGBA16/RGBA32 pixel-formats.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1225&r2=1.1226
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -b -r1.1225 -r1.1226
--- ChangeLog   15 Oct 2006 22:15:12 -0000      1.1225
+++ ChangeLog   15 Oct 2006 22:40:57 -0000      1.1226
@@ -5,10 +5,11 @@
        * macros/docbook.m4: Make an invalid directory passing message refer
        to the relevant directory.
 
-2006-10-15 Markus Gothe <address@hidden>
+2006-10-16 Markus Gothe <address@hidden>
 
        * backend/render_handler_agg.cpp: Added log_error on unknown 
-         pixelformat.
+         pixelformat. Added RGBA16/RGBA32 pixel-formats.
+       * gui/gtk_glue_agg.cpp: Added RGBA16/RGBA32 pixel-formats.
        * plugin/klash/klash.cpp: Fixed windowid in accordance to Bastiaan's
          code clean-up in action.cpp
        

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- backend/render_handler_agg.cpp      15 Oct 2006 17:02:12 -0000      1.22
+++ backend/render_handler_agg.cpp      15 Oct 2006 22:40:57 -0000      1.23
@@ -34,7 +34,7 @@
 // forward this exception.
  
 
-/* $Id: render_handler_agg.cpp,v 1.22 2006/10/15 17:02:12 nihilus Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.23 2006/10/15 22:40:57 nihilus Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -88,36 +88,36 @@
 #include "shape_character_def.h" 
 #include "generic_character.h"  
 
-#include "agg_rendering_buffer.h"
-#include "agg_renderer_base.h"
-#include "agg_pixfmt_rgb.h"
-#include "agg_pixfmt_rgb_packed.h"
-#include "agg_pixfmt_rgba.h"
-#include "agg_pixfmt_gray.h"
-#include "agg_color_rgba.h"
-#include "agg_color_gray.h"
-#include "agg_ellipse.h"
-#include "agg_conv_transform.h"
-#include "agg_trans_affine.h"
-#include "agg_scanline_u.h"
-#include "agg_scanline_p.h"
-#include "agg_renderer_scanline.h"
+#include <agg_rendering_buffer.h>
+#include <agg_renderer_base.h>
+#include <agg_pixfmt_rgb.h>
+#include <agg_pixfmt_rgb_packed.h>
+#include <agg_pixfmt_rgba.h>
+#include <agg_pixfmt_gray.h>
+#include <agg_color_rgba.h>
+#include <agg_color_gray.h>
+#include <agg_ellipse.h>
+#include <agg_conv_transform.h>
+#include <agg_trans_affine.h>
+#include <agg_scanline_u.h>
+#include <agg_scanline_p.h>
+#include <agg_renderer_scanline.h>
 // must only include if render_scanlines_compound_layered is not defined
 #if ! HAVE_AGG_SCANLINES_COMPOUND_LAYERED
 #warning including compound
 #include "render_handler_agg_compat.h"
 #endif
-#include "agg_rasterizer_scanline_aa.h"
-#include "agg_rasterizer_compound_aa.h"
-#include "agg_span_allocator.h"
-#include "agg_path_storage.h"
-#include "agg_conv_curve.h"
-#include "agg_conv_stroke.h"
-#include "agg_vcgen_stroke.h"
-#include "agg_bezier_arc.h"
-#include "agg_renderer_primitives.h"
-#include "agg_gamma_functions.h"
-#include "agg_math_stroke.h"
+#include <agg_rasterizer_scanline_aa.h>
+#include <agg_rasterizer_compound_aa.h>
+#include <agg_span_allocator.h>
+#include <agg_path_storage.h>
+#include <agg_conv_curve.h>
+#include <agg_conv_stroke.h>
+#include <agg_vcgen_stroke.h>
+#include <agg_bezier_arc.h>
+#include <agg_renderer_primitives.h>
+#include <agg_gamma_functions.h>
+#include <agg_math_stroke.h>
 
 
 
@@ -1348,7 +1348,7 @@
   if (!strcmp(pixelformat, "RGB555"))
          return new render_handler_agg<agg::pixfmt_rgb555> (16); // yep, 16!
        
-       else if (!strcmp(pixelformat, "RGB565"))
+       else if (!strcmp(pixelformat, "RGB565") || !strcmp(pixelformat, 
"RGBA16"))
          return new render_handler_agg<agg::pixfmt_rgb565> (16);
        
        else if (!strcmp(pixelformat, "RGB24"))
@@ -1357,6 +1357,9 @@
        else if (!strcmp(pixelformat, "BGR24"))
          return new render_handler_agg<agg::pixfmt_bgr24> (24);
          
+       else if (!strcmp(pixelformat, "RGBA32"))
+         return new render_handler_agg<agg::pixfmt_rgba32> (32);
+                 
        else {
                log_error("Unknown pixelformat: %s\n", pixelformat);
                assert(0);

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gui/gtk_glue_agg.cpp        13 Oct 2006 16:38:55 -0000      1.1
+++ gui/gtk_glue_agg.cpp        15 Oct 2006 22:40:57 -0000      1.2
@@ -35,9 +35,11 @@
 //
 //
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
+/* $Id: gtk_glue_agg.cpp,v 1.2 2006/10/15 22:40:57 nihilus Exp $ */
+
+#include <cstdio>
+#include <cerrno>
+#include <cstring>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
@@ -94,16 +96,16 @@
 
                switch(_bpp) {
        case 8:
-               strncpy(bppformat, "RGB8", sizeof(bppformat));
+               strncpy(bppformat, "RGBA8", sizeof(bppformat));
                break;
        case 16:
-               strncpy(bppformat, "RGB16", sizeof(bppformat));
+               strncpy(bppformat, "RGBA16", sizeof(bppformat));
                break;
        case 24:
                strncpy(bppformat, "RGB24", sizeof(bppformat));
                break;
        case 32:
-               strncpy(bppformat, "RGB32", sizeof(bppformat));
+               strncpy(bppformat, "RGBA32", sizeof(bppformat));
                break;
        default:
                log_error("%i bits per pixel not supported by the AGG 
renderer!\n", _bpp);

Index: gui/gtk_glue_gtkglext.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gui/gtk_glue_gtkglext.h     14 Oct 2006 00:36:50 -0000      1.5
+++ gui/gtk_glue_gtkglext.h     15 Oct 2006 22:40:57 -0000      1.6
@@ -35,14 +35,16 @@
 //
 //
 
+/* $Id: gtk_glue_gtkglext.h,v 1.6 2006/10/15 22:40:57 nihilus Exp $ */
+
 #include "gtk_glue.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
-# include <gtk/gtkgl.h>
-# include <GL/gl.h>
-# include <GL/glu.h>
+#include <gtk/gtkgl.h>
+
+#include "tu_opengl_includes.h"
 
 
 

Index: gui/kde_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gui/kde_glue.h      25 Aug 2006 18:27:01 -0000      1.2
+++ gui/kde_glue.h      15 Oct 2006 22:40:57 -0000      1.3
@@ -35,10 +35,13 @@
 //
 //
 
+
+/* $Id: kde_glue.h,v 1.3 2006/10/15 22:40:57 nihilus Exp $ */
+
 #include "gnash.h"
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include "tu_opengl_includes.h"
+
 #include <qapplication.h>
 #include <qgl.h>
 #include <qeventloop.h>