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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/06/06 16:15:01

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp 

Log message:
        backend/render_handler_agg.cpp: add checks for known scale and preset 
scale to 1:1 so that "make check" succeeds again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3474&r2=1.3475
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3474
retrieving revision 1.3475
diff -u -b -r1.3474 -r1.3475
--- ChangeLog   6 Jun 2007 15:41:11 -0000       1.3474
+++ ChangeLog   6 Jun 2007 16:15:00 -0000       1.3475
@@ -1,3 +1,8 @@
+2007-06-06 Udo Giacomozzi <address@hidden>
+
+       * backend/render_handler_agg.cpp: add checks for known scale    
+         and preset scale to 1:1 so that "make check" succeeds again
+
 2007-06-06 Tomas Groth Christensen <address@hidden>
 
        * libbase/embedVideoDecoder.h: Added docs and made decodeFrame 

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- backend/render_handler_agg.cpp      6 Jun 2007 13:42:38 -0000       1.87
+++ backend/render_handler_agg.cpp      6 Jun 2007 16:15:00 -0000       1.88
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.87 2007/06/06 13:42:38 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.88 2007/06/06 16:15:00 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -333,6 +333,7 @@
   int bpp;  // bits per pixel
   // double xscale, yscale;  <-- deprecated, to be removed
   gnash::matrix stage_matrix;  // conversion from TWIPS to pixels
+  bool scale_set;
   
   
 
@@ -571,8 +572,15 @@
       yscale(1.0/20.0),*/
       m_enable_antialias(true),
       m_pixf(NULL),
-      m_drawing_mask(false)
+      m_drawing_mask(false),
+      scale_set(false)
   {
+       // TODO: we really don't want to set the scale here as the core should
+       // tell us the right values before rendering anything. However this is
+       // currently difficult to implement. Removing the next call will
+       // lead to an assertion failure in begin_display() because we check
+       // whether the scale is known there.
+       set_scale(1.0f, 1.0f);
   }   
 
   // Destructor
@@ -641,6 +649,8 @@
   {
     assert(m_pixf != NULL);
 
+    assert(scale_set);
+
     // clear the stage using the background color
     for (unsigned int i=0; i<_clipbounds.size(); i++) 
       clear_framebuffer(_clipbounds[i], agg::rgba8_pre(background_color.m_r,
@@ -2015,6 +2025,8 @@
     /*xscale = new_xscale/20.0f;
     yscale = new_yscale/20.0f;*/
     
+    scale_set=true;
+    
     stage_matrix.set_identity();
                stage_matrix.set_scale(new_xscale/20.0f, new_yscale/20.0f);
   }