[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-1142-g5793f50

[Rob Savoye]

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, hwaccel has been updated
       via  5793f50ad1f632f96f239543b64fd6124a4cfe4b (commit)
       via  5a14dbbeb1ad88a2eb25c690c4dad63d62086471 (commit)
       via  71d22cb298a47aed816738532daf513c19e65a46 (commit)
       via  ca329ddd50d29fa69be2f9a76a3dee07e5f95b8d (commit)
      from  c0d7d7abc0775132f5a2136d5c1b1057d4435aa3 (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=5793f50ad1f632f96f239543b64fd6124a4cfe4b


commit 5793f50ad1f632f96f239543b64fd6124a4cfe4b
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 22 11:23:22 2011 -0600

    remove style changes, they're now in a new branch instead

diff --git a/librender/openvg/OpenVGStyle.h b/librender/openvg/OpenVGStyle.h
index d048fa5..a0872bb 100644
--- a/librender/openvg/OpenVGStyle.h
+++ b/librender/openvg/OpenVGStyle.h
@@ -38,122 +38,6 @@ namespace renderer {
 
 namespace openvg {
 
-// Forward declarations.
-namespace {
-    /// Creates 8 bitmap functions
-    template<typename FillMode, typename Pixel>
-            void storeBitmap(StyleHandler& st, const OpenVGBitmap* bi,
-            const SWFMatrix& mat, const SWFCxForm& cx,
-            bool smooth);
-    template<typename FillMode> void storeBitmap(StyleHandler& st,
-            const OpenVGBitmap* bi, const SWFMatrix& mat, const SWFCxForm& cx,
-            bool smooth);
-
-    /// Creates many (should be 18) gradient functions.
-    void storeGradient(StyleHandler& st, const GradientFill& fs,
-            const SWFMatrix& mat, const SWFCxForm& cx);
-    template<typename Spread> void storeGradient(StyleHandler& st,
-            const GradientFill& fs, const SWFMatrix& mat, const SWFCxForm& cx);
-    template<typename Spread, typename Interpolation>
-            void storeGradient(StyleHandler& st, const GradientFill& fs,
-            const SWFMatrix& mat, const SWFCxForm& cx);
-}
-
-/// @note These helper functions are used by the boost::variant used
-/// for fill styles. A variant is a C++ style version of the C union.
-/// Before accessing any of the data of the variant, we have to use
-/// boost::apply_visitor() to bind one of these classes to the style
-/// to extract the data.
-
-/// Transfer FillStyles to OpenVG styles.
-struct OpenVGStyles : boost::static_visitor<>
-{
-    OpenVGStyles(SWFMatrix stage, SWFMatrix fill, const SWFCxForm& c,
-                 StyleHandler& sh, Quality q)
-        : _stageMatrix(stage.invert()),
-          _fillMatrix(fill.invert()),
-          _cx(c),
-          _sh(sh),
-          _quality(q)
-        {
-            GNASH_REPORT_FUNCTION;
-        }
-    
-    void operator()(const GradientFill& f) const {
-        SWFMatrix m = f.matrix();
-        m.concatenate(_fillMatrix);
-        m.concatenate(_stageMatrix);
-        storeGradient(_sh, f, m, _cx);
-    }
-
-    void operator()(const SolidFill& f) const {
-        const rgba color = _cx.transform(f.color());
-
-        // add the color to our self-made style handler (basically
-        // just a list)
-        // _sh.add_color(agg::rgba8_pre(color.m_r, color.m_g, color.m_b,
-        //           color.m_a));
-    }
-
-    void operator()(const BitmapFill& f) const {
-        SWFMatrix m = f.matrix();
-        m.concatenate(_fillMatrix);
-        m.concatenate(_stageMatrix);
-
-        // Smoothing policy:
-        //
-        // - If unspecified, smooth when _quality >= BEST
-        // - If ON or forced, smooth when _quality > LOW
-        // - If OFF, don't smooth
-        //
-        // TODO: take a forceBitmapSmoothing parameter.
-        //       which should be computed by the VM looking
-        //       at MovieClip.forceSmoothing.
-        bool smooth = false;
-        if (_quality > QUALITY_LOW) {
-            // TODO: if forceSmoothing is true, smooth !
-            switch (f.smoothingPolicy()) {
-                case BitmapFill::SMOOTHING_UNSPECIFIED:
-                    if (_quality >= QUALITY_BEST) {
-                        smooth = true;
-                    }
-                    break;
-                case BitmapFill::SMOOTHING_ON:
-                    smooth = true;
-                    break;
-                default: break;
-            }
-        }
-
-        const bool tiled = (f.type() == BitmapFill::TILED);
-
-        const CachedBitmap* bm = f.bitmap(); 
-
-#if 0
-        if (!bm) {
-            // See misc-swfmill.all/missing_bitmap.swf
-            _sh.add_color(agg::rgba8_pre(255,0,0,255));
-        } else if ( bm->disposed() ) {
-            // See misc-ming.all/BeginBitmapFill.swf
-            _sh.add_color(agg::rgba8_pre(0,0,0,0));
-        } else {
-            _sh.add_bitmap(dynamic_cast<const agg_bitmap_info*>(bm),
-                           m, _cx, tiled, smooth);
-        }
-#endif
-    }
-    
-private:
-    /// The inverted stage matrix.
-    const SWFMatrix _stageMatrix;
-    
-    /// The inverted fill matrix.
-    const SWFMatrix _fillMatrix;
-    const SWFCxForm& _cx;
-    StyleHandler& _sh;
-    const Quality _quality;
-};
-    
 /// Get the color of a style from the variant
 class GetColor : public boost::static_visitor<rgba>
 {

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


commit 5a14dbbeb1ad88a2eb25c690c4dad63d62086471
Merge: ca329dd 71d22cb
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 22 10:07:35 2011 -0600

    Merge branch 'master' into hwaccel


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


commit ca329ddd50d29fa69be2f9a76a3dee07e5f95b8d
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 22 10:02:23 2011 -0600

    add 2011 to copyright date.

diff --git a/librender/opengles1/Renderer_gles1.cpp 
b/librender/opengles1/Renderer_gles1.cpp
index 878211f..5989035 100644
--- a/librender/opengles1/Renderer_gles1.cpp
+++ b/librender/opengles1/Renderer_gles1.cpp
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 //   Foundation, Inc
 // 
 // This program is free software; you can redistribute it and/or modify

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

Summary of changes:
 librender/opengles1/Renderer_gles1.cpp |    2 +-
 librender/openvg/OpenVGStyle.h         |  116 --------------------------------
 plugin/npapi/mozilla-sdk/npp_gate.cpp  |    2 +-
 3 files changed, 2 insertions(+), 118 deletions(-)


hooks/post-receive
-- 
Gnash