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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/04/20 11:51:23

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp render_handler_agg.h 

Log message:
        implement initTestBuffer() for AGG

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2951&r2=1.2952
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2951
retrieving revision 1.2952
diff -u -b -r1.2951 -r1.2952
--- ChangeLog   20 Apr 2007 11:41:26 -0000      1.2951
+++ ChangeLog   20 Apr 2007 11:51:23 -0000      1.2952
@@ -17,6 +17,7 @@
 2007-04-20 Udo Giacomozzi <address@hidden>
 
        * backend/render_handler.h: Prototype for initTestBuffer() 
+       * backend/render_handler_agg.{cpp,h}: implement initTestBuffer() 
                
 2007-04-20 Sandro Santilli <address@hidden>
 

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- backend/render_handler_agg.cpp      18 Apr 2007 17:07:34 -0000      1.74
+++ backend/render_handler_agg.cpp      20 Apr 2007 11:51:23 -0000      1.75
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.74 2007/04/18 17:07:34 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.75 2007/04/20 11:51:23 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1901,6 +1901,10 @@
     scale.m_y = PIXELS_TO_TWIPS(yscale);
   }
   
+  virtual unsigned int getBytesPerPixel() {
+    return bpp/8;
+  }  
+  
 private:  // private methods  
 
   /// Returns the cache manager instance of the given character definition.

Index: backend/render_handler_agg.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- backend/render_handler_agg.h        30 Nov 2006 21:52:37 -0000      1.11
+++ backend/render_handler_agg.h        20 Apr 2007 11:51:23 -0000      1.12
@@ -21,18 +21,39 @@
 
 #ifndef BACKEND_RENDER_HANDLER_AGG_H
 #define BACKEND_RENDER_HANDLER_AGG_H
-
+#include <stdio.h>
 namespace gnash {
 
 // Base class to shield GUIs from AGG's pixelformat classes 
 class render_handler_agg_base : public render_handler
 {
+private:
+
+  unsigned char *_testBuffer; // buffer used by initTestBuffer() only
+  
 public:
-  // these methods need to be accessed from outside:
-  virtual void init_buffer(unsigned char *mem, int size, int x, int y)=0;  
+  
+  render_handler_agg_base() : _testBuffer(0) { }  
 
   // virtual classes should have virtual destructors
   virtual ~render_handler_agg_base() {}
+  
+  // these methods need to be accessed from outside:
+  virtual void init_buffer(unsigned char *mem, int size, int x, int y)=0;
+
+  virtual unsigned int getBytesPerPixel()=0;
+  
+  virtual bool initTestBuffer(unsigned width, unsigned height) {
+    int size = width * height * getBytesPerPixel();
+    
+    _testBuffer        = static_cast<unsigned char *>( realloc(_testBuffer, 
size) );
+    
+    init_buffer(_testBuffer, size, width, height);
+    
+    return true;
+  }
+  
+  
 };