[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-281-g96fd922

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  96fd922b2466cd1a357227c8e57d53a6291e774d (commit)
       via  ff5dcb07389a7f086dc88154427aac904fa73373 (commit)
       via  f7717577adc96ba1d771cfbb64a7c4d63ebed581 (commit)
       via  10882398b49ab99cdf891b39ac343af1233b52fe (commit)
      from  7b4e903e14b5c525baa6ddeea8166cee9408171d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=96fd922b2466cd1a357227c8e57d53a6291e774d


commit 96fd922b2466cd1a357227c8e57d53a6291e774d
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 16 16:07:00 2011 +0100

    Reduce scope of iterator.

diff --git a/libcore/DisplayList.cpp b/libcore/DisplayList.cpp
index 09343e8..db56263 100644
--- a/libcore/DisplayList.cpp
+++ b/libcore/DisplayList.cpp
@@ -547,8 +547,9 @@ DisplayList::display(Renderer& renderer, const Transform& 
base)
     
     // We only display DisplayObjects which are out of the "removed" zone
     // (or should we check unloaded?)
-    iterator it = beginNonRemoved(_charsByDepth);
-    for (iterator endIt = _charsByDepth.end(); it != endIt; ++it) {
+    for (iterator it = beginNonRemoved(_charsByDepth),
+            endIt = _charsByDepth.end(); it != endIt; ++it) {
+
         DisplayObject* ch = *it;
         assert(!ch->isDestroyed());
 
@@ -560,7 +561,6 @@ DisplayList::display(Renderer& renderer, const Transform& 
base)
         // Check if this charater or any of its parents is a mask.
         // Characters acting as masks should always be rendered to the
         // mask buffer despite their visibility.
-        //
         DisplayObject* p = ch->parent();
         bool renderAsMask = ch->isMaskLayer();
 
@@ -569,7 +569,7 @@ DisplayList::display(Renderer& renderer, const Transform& 
base)
             p = p->parent();
         }
         
-        // check for non-mask hiden DisplayObjects
+        // check for non-mask hidden DisplayObjects
         if (!renderAsMask && (!ch->visible())) {
             ch->omit_display();
             // Don't display non-mask hidden DisplayObjects

http://git.savannah.gnu.org/cgit//commit/?id=ff5dcb07389a7f086dc88154427aac904fa73373


commit ff5dcb07389a7f086dc88154427aac904fa73373
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 16 15:38:03 2011 +0100

    Update completion list.

diff --git a/librender/agg/Renderer_agg.cpp b/librender/agg/Renderer_agg.cpp
index fe6c5f2..250093c 100644
--- a/librender/agg/Renderer_agg.cpp
+++ b/librender/agg/Renderer_agg.cpp
@@ -50,17 +50,14 @@ Status
     linear gradients  COMPLETE
     radial gradients  COMPLETE
     focal gradients   COMPLETE
-    ext. spread modes NOT IMPLEMENTED *
-    linear RGB mode   NOT IMPLEMENTED *
+    ext. spread modes COMPLETE
+    linear RGB mode   COMPLETE
     bitmaps, tiled    COMPLETE
     bitmaps, clipped  COMPLETE
     bitmaps, smooth   COMPLETE
     bitmaps, hard     COMPLETE    
     color xform       COMPLETE
     
-    * special fill styles are not yet supported by Gnash itself AFAIK, but AGG 
-    supports them and it should be easy to add them.    
-    
   fonts               COMPLETE
     
   masks               COMPLETE

http://git.savannah.gnu.org/cgit//commit/?id=f7717577adc96ba1d771cfbb64a7c4d63ebed581


commit f7717577adc96ba1d771cfbb64a7c4d63ebed581
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Mar 14 18:30:59 2011 +0100

    Remove commented-out code.

diff --git a/libcore/DisplayList.cpp b/libcore/DisplayList.cpp
index 7c7ebb9..09343e8 100644
--- a/libcore/DisplayList.cpp
+++ b/libcore/DisplayList.cpp
@@ -543,8 +543,6 @@ DisplayList::display(Renderer& renderer, const Transform& 
base)
 {
     testInvariant();
 
-    //log_debug("Displaying list: %s", *this);
-
     std::stack<int> clipDepthStack;
     
     // We only display DisplayObjects which are out of the "removed" zone

http://git.savannah.gnu.org/cgit//commit/?id=10882398b49ab99cdf891b39ac343af1233b52fe


commit 10882398b49ab99cdf891b39ac343af1233b52fe
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Mar 14 18:30:53 2011 +0100

    Use a ptr_vector

diff --git a/librender/agg/Renderer_agg.cpp b/librender/agg/Renderer_agg.cpp
index 43e5b04..fe6c5f2 100644
--- a/librender/agg/Renderer_agg.cpp
+++ b/librender/agg/Renderer_agg.cpp
@@ -172,6 +172,7 @@ AGG resources
 
 
 #include <boost/numeric/conversion/converter.hpp>
+#include <boost/ptr_container/ptr_vector.hpp>
 
 namespace gnash {
 
@@ -181,7 +182,7 @@ class AlphaMask;
 
 typedef std::vector<agg::path_storage> AggPaths;
 typedef std::vector<geometry::Range2d<int> > ClipBounds;
-typedef std::vector<AlphaMask*> AlphaMasks;
+typedef boost::ptr_vector<AlphaMask> AlphaMasks;
 typedef std::vector<Path> GnashPaths;
 
 template <class Rasterizer>
@@ -465,7 +466,7 @@ public:
         else {
             // Untested.
             typedef agg::scanline_u8_am<agg::alpha_mask_gray8> Scanline;
-            Scanline sl(masks.back()->getMask());
+            Scanline sl(masks.back().getMask());
             renderScanlines(path, rbase, sl);
         }
     } 
@@ -612,7 +613,7 @@ private:
         else {
             // Untested.
             typedef agg::scanline_u8_am<agg::alpha_mask_gray8> Scanline;
-            Scanline sl(masks.back()->getMask());
+            Scanline sl(masks.back().getMask());
             renderScanlines(path, rbase, sl, sg);
         }
     } 
@@ -983,7 +984,7 @@ public:
         else {
             // Mask is active!
             typedef agg::scanline_u8_am<agg::alpha_mask_gray8> sl_type;
-            sl_type sl(_alphaMasks.back()->getMask());      
+            sl_type sl(_alphaMasks.back().getMask());      
             lr.render(sl, stroke, color);
         }
 
@@ -995,14 +996,14 @@ public:
         // Set flag so that rendering of shapes is simplified (only solid 
fill) 
         m_drawing_mask = true;
 
-        AlphaMask* new_mask = new AlphaMask(xres, yres);
+        _alphaMasks.push_back(new AlphaMask(xres, yres));
+        AlphaMask& new_mask = _alphaMasks.back();
 
         for (ClipBounds::const_iterator i = _clipbounds.begin(), 
                 e = _clipbounds.end(); i != e; ++i) {
-            new_mask->clear(*i);
+            new_mask.clear(*i);
         }
 
-        _alphaMasks.push_back(new_mask);
     }
 
     void end_submit_mask()
@@ -1012,8 +1013,7 @@ public:
 
     void disable_mask()
     {
-        assert( ! _alphaMasks.empty() );
-        delete _alphaMasks.back();
+        assert(!_alphaMasks.empty());
         _alphaMasks.pop_back();
     }
   
@@ -1451,7 +1451,7 @@ public:
       
       typedef agg::scanline_u8_am<agg::alpha_mask_gray8> scanline_type;
       
-      scanline_type sl(_alphaMasks.back()->getMask());
+      scanline_type sl(_alphaMasks.back().getMask());
       
       draw_shape_impl<scanline_type> (subshape_id, paths, agg_paths, 
         sh, even_odd, sl);
@@ -1576,7 +1576,7 @@ public:
       
       typedef agg::scanline_u8_am<agg::alpha_mask_gray8> scanline_type;
       
-      scanline_type sl(_alphaMasks[mask_count-2]->getMask());
+      scanline_type sl(_alphaMasks[mask_count - 2].getMask());
       
       draw_mask_shape_impl(paths, even_odd, sl);
         
@@ -1635,7 +1635,7 @@ public:
     } // for path
     
     // renderer base
-    renderer_base& rbase = _alphaMasks.back()->get_rbase();
+    renderer_base& rbase = _alphaMasks.back().get_rbase();
     
     // span allocator
     typedef agg::span_allocator<agg::gray8> alloc_type;
@@ -1672,7 +1672,7 @@ public:
       
       typedef agg::scanline_u8_am<agg::alpha_mask_gray8> scanline_type;
       
-      scanline_type sl(_alphaMasks.back()->getMask());
+      scanline_type sl(_alphaMasks.back().getMask());
       
       draw_outlines_impl<scanline_type> (subshape_id, paths, agg_paths,
         line_styles, cx, linestyle_matrix, sl);
@@ -1894,7 +1894,7 @@ public:
       
       typedef agg::scanline_u8_am<agg::alpha_mask_gray8> sl_type; 
       
-      sl_type sl(_alphaMasks.back()->getMask());
+      sl_type sl(_alphaMasks.back().getMask());
          
       draw_poly_impl<sl_type>(&corners.front(), corners.size(), fill, outline, 
sl, mat);       
     

-----------------------------------------------------------------------

Summary of changes:
 libcore/DisplayList.cpp        |   10 ++++------
 librender/agg/Renderer_agg.cpp |   35 ++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Gnash