[Gnash-commit] gnash ChangeLog backend/render_handler.h backen...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/08 14:24:06

Modified files:
        .              : ChangeLog 
        backend        : render_handler.h render_handler_tri.cpp 

Log message:
        Mem-fixes + Scoping.
        Defining the virtual dtor as {}.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1072&r2=1.1073
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_tri.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1072
retrieving revision 1.1073
diff -u -b -r1.1072 -r1.1073
--- ChangeLog   8 Oct 2006 14:00:20 -0000       1.1072
+++ ChangeLog   8 Oct 2006 14:24:06 -0000       1.1073
@@ -4,7 +4,7 @@
        * server/parser/shape_character_def.h: Added ID-tag. removed unused 
          include.
        * backend/render_handler_tri.cpp: added id-tag. static_cast from float
-         to short int.
+         to short int. Mem-fixes + Scoping.
        * backend/render_handler_agg.cpp: added id-tag, static_cast to int16*.
        * backend/render_handler_tri.h: added id-tag.
        * backend/render_handler.h: added virtual desctror and id-tag.

Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- backend/render_handler.h    8 Oct 2006 14:00:20 -0000       1.3
+++ backend/render_handler.h    8 Oct 2006 14:24:06 -0000       1.4
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.3 2006/10/08 14:00:20 nihilus Exp $ */
+/* $Id: render_handler.h,v 1.4 2006/10/08 14:24:06 nihilus Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -162,8 +162,9 @@
 class DSOEXPORT render_cache_manager
 {
 public:
+  //Virtual dtor, removes compiler warning.
+  virtual ~render_cache_manager(){}
   /// Clears the cache completely (necessary for runtime shapes / drawing API)
-  virtual ~render_cache_manager();
   virtual void clear() 
   {
     // TODO: Make this abstract to force real implementation!!

Index: backend/render_handler_tri.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_tri.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- backend/render_handler_tri.cpp      8 Oct 2006 14:00:20 -0000       1.3
+++ backend/render_handler_tri.cpp      8 Oct 2006 14:24:06 -0000       1.4
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: render_handler_tri.cpp,v 1.3 2006/10/08 14:00:20 nihilus Exp $ */
+/* $Id: render_handler_tri.cpp,v 1.4 2006/10/08 14:24:06 nihilus Exp $ */
 
 #include "render_handler_tri.h"
 
@@ -156,8 +156,6 @@
   const std::vector<fill_style>& fill_styles,
   const std::vector<line_style>& line_styles) {    
   tri_cache_manager* cman = get_cache_of(def);
-  mesh_set* m;
-  int from_cache;
   
   // Compute the error tolerance in object-space.
   float        max_scale = mat.get_max_scale();
@@ -174,8 +172,8 @@
   // NOTE: gnash_debug_show_paths ommitted
   
   // Try to find a usable mesh set in the cache
-  m = cman->search_candidate(object_space_max_error);
-  from_cache = m != NULL;
+  mesh_set *m = cman->search_candidate(object_space_max_error);
+  int from_cache = m != NULL;
    
   if (!from_cache) {
     // no cache hit, construct a new mesh to handle this error tolerance.
@@ -316,10 +314,10 @@
 void  triangulating_render_handler::draw_poly(const point* corners, 
   int corner_count, const rgba fill, const rgba outline) {
 
+  unsigned int vno=0;
   // Create points array to vertex array
-  int cno, vno=0;  
-  int16_t *vertex = (int16_t*)malloc((corner_count+1)*2*sizeof(int16_t));
-  for (cno=0; cno<corner_count; cno++) {
+  int16_t *vertex = new int16_t[(corner_count+1)*2];
+  for (unsigned int cno=0; cno<corner_count; cno++) {
     vertex[vno  ] = static_cast<int16_t>(corners[cno].m_x);
     vertex[vno+1] = static_cast<int16_t>(corners[cno].m_y);
     vno+=2;
@@ -341,7 +339,7 @@
     draw_line_strip(vertex, corner_count+1);
   } 
   
-  free(vertex);
+  delete[] vertex;
   
 } // draw_poly