[Gnash-commit] /srv/bzr/gnash/trunk r12355: Use intrusive_ptr<>::operator== because reset() didn't exist in earlier

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12355 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-05 19:17:55 +0200
message:
  Use intrusive_ptr<>::operator== because reset() didn't exist in earlier
  versions of boost.
  
  Drop an unused variable in agg.
modified:
  libcore/asobj/flash/display/BitmapData_as.cpp
  librender/Renderer_agg.cpp

=== modified file 'libcore/asobj/flash/display/BitmapData_as.cpp'
--- a/libcore/asobj/flash/display/BitmapData_as.cpp     2010-08-04 06:37:08 
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp     2010-08-05 17:17:55 
+0000
@@ -92,7 +92,7 @@
     
     // If there is a renderer, cache the image there, otherwise we store it.
     Renderer* r = getRunResources(*_owner).renderer();
-    if (r) _cachedBitmap.reset(r->createCachedBitmap(im));
+    if (r) _cachedBitmap = r->createCachedBitmap(im);
     else _image.reset(im.release());
 }
     
@@ -194,7 +194,7 @@
 BitmapData_as::dispose()
 {
     if (_cachedBitmap) _cachedBitmap->dispose();
-    _cachedBitmap.reset();
+    _cachedBitmap = 0;
     _image.reset();
     updateObjects();
 }

=== modified file 'librender/Renderer_agg.cpp'
--- a/librender/Renderer_agg.cpp        2010-08-05 14:36:40 +0000
+++ b/librender/Renderer_agg.cpp        2010-08-05 16:44:57 +0000
@@ -1591,17 +1591,6 @@
     typedef agg::rasterizer_compound_aa<agg::rasterizer_sl_clip_dbl> 
rasc_type;  
     rasc_type rasc;
     
-    // renderer base
-    renderer_base& rbase = _alphaMasks.back()->get_rbase();
-    
-    // solid fills
-    typedef agg::renderer_scanline_aa_solid< renderer_base > ren_sl_type;
-    ren_sl_type ren_sl(rbase);
-    
-    // span allocator
-    typedef agg::span_allocator<agg::gray8> alloc_type;
-    alloc_type alloc; 
-      
 
     // activate even-odd filling rule
     if (even_odd) rasc.filling_rule(agg::fill_even_odd);
@@ -1634,6 +1623,14 @@
     
     } // for path
     
+    // renderer base
+    renderer_base& rbase = _alphaMasks.back()->get_rbase();
+    
+    // span allocator
+    typedef agg::span_allocator<agg::gray8> alloc_type;
+    alloc_type alloc; 
+      
+    
     // now render that thing!
     agg::render_scanlines_compound_layered (rasc, sl, rbase, alloc, sh);