[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 516251ba306699fd1d64
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 516251ba306699fd1d64a63b7249a614509a5e1f |
Date: |
Fri, 17 Sep 2010 09:47:13 +0000 |
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 516251ba306699fd1d64a63b7249a614509a5e1f (commit)
via adfd11c26fa0b8c2764c7bd661efb9d6bc6b408c (commit)
from 87fb7a38dd63cfac4daa930335e3bf6c709c62ab (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=516251ba306699fd1d64a63b7249a614509a5e1f
commit 516251ba306699fd1d64a63b7249a614509a5e1f
Author: Benjamin Wolsey <address@hidden>
Date: Thu Sep 16 16:26:05 2010 +0200
Be less verbose.
diff --git a/librender/Renderer_agg_style.h b/librender/Renderer_agg_style.h
index 02660e1..b11733c 100644
--- a/librender/Renderer_agg_style.h
+++ b/librender/Renderer_agg_style.h
@@ -474,15 +474,11 @@ public:
void addFocalGradient(const GradientFill& fs, const SWFMatrix& mat,
const SWFCxForm& cx)
{
- // move the center of the radial fill to where it should be
- SWFMatrix transl;
- transl.concatenate(mat);
-
typename T::GradientType gr;
gr.init(32.0, fs.focalPoint() * 32.0, 0.0);
// div 2 because we need radius, not diameter
- typename T::Type* st = new typename T::Type(fs, transl, cx, 32.0, gr);
+ typename T::Type* st = new typename T::Type(fs, mat, cx, 32.0, gr);
// NOTE: The value 64 is based on the bitmap texture used by other
// Gnash renderers which is normally 64x64 pixels for radial gradients.
@@ -493,12 +489,9 @@ public:
void addRadialGradient(const GradientFill& fs, const SWFMatrix& mat,
const SWFCxForm& cx)
{
- // move the center of the radial fill to where it should be
- SWFMatrix transl;
- transl.concatenate(mat);
// div 2 because we need radius, not diameter
- typename T::Type* st = new typename T::Type(fs, transl, cx, 64 / 2);
+ typename T::Type* st = new typename T::Type(fs, mat, cx, 64 / 2);
// NOTE: The value 64 is based on the bitmap texture used by other
// Gnash renderers which is normally 64x64 pixels for radial gradients.
http://git.savannah.gnu.org/cgit//commit/?id=adfd11c26fa0b8c2764c7bd661efb9d6bc6b408c
commit adfd11c26fa0b8c2764c7bd661efb9d6bc6b408c
Author: Benjamin Wolsey <address@hidden>
Date: Thu Sep 16 16:15:47 2010 +0200
Don't translate gradient matrices stupidly.
diff --git a/libcore/FillStyle.cpp b/libcore/FillStyle.cpp
index af80a63..1b325ef 100644
--- a/libcore/FillStyle.cpp
+++ b/libcore/FillStyle.cpp
@@ -74,7 +74,6 @@ gradientMatrix(GradientFill::Type t, const SWFMatrix& m)
base.set_scale(1.0 / 128, 1.0 / 128);
break;
case GradientFill::RADIAL:
- base.set_translation(32, 32);
base.set_scale(1.0 / 512, 1.0 / 512);
break;
}
diff --git a/librender/Renderer_agg_style.h b/librender/Renderer_agg_style.h
index 7542459..02660e1 100644
--- a/librender/Renderer_agg_style.h
+++ b/librender/Renderer_agg_style.h
@@ -476,14 +476,13 @@ public:
{
// move the center of the radial fill to where it should be
SWFMatrix transl;
- transl.set_translation(-32, -32);
transl.concatenate(mat);
typename T::GradientType gr;
gr.init(32.0, fs.focalPoint() * 32.0, 0.0);
// div 2 because we need radius, not diameter
- typename T::Type* st = new typename T::Type(fs, transl, cx, 64/2, gr);
+ typename T::Type* st = new typename T::Type(fs, transl, cx, 32.0, gr);
// NOTE: The value 64 is based on the bitmap texture used by other
// Gnash renderers which is normally 64x64 pixels for radial gradients.
@@ -496,7 +495,6 @@ public:
{
// move the center of the radial fill to where it should be
SWFMatrix transl;
- transl.set_translation(-32, -32);
transl.concatenate(mat);
// div 2 because we need radius, not diameter
diff --git a/librender/Renderer_cairo.cpp b/librender/Renderer_cairo.cpp
index e8da916..f2c407e 100644
--- a/librender/Renderer_cairo.cpp
+++ b/librender/Renderer_cairo.cpp
@@ -248,7 +248,6 @@ struct StyleHandler :
boost::static_visitor<cairo_pattern_t*>
// Undo the translation our parser applied.
gnash::SWFMatrix transl;
- transl.concatenate_translation(-32, -32);
transl.concatenate(m);
cairo_matrix_t mat;
-----------------------------------------------------------------------
Summary of changes:
libcore/FillStyle.cpp | 1 -
librender/Renderer_agg_style.h | 13 ++-----------
librender/Renderer_cairo.cpp | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 516251ba306699fd1d64a63b7249a614509a5e1f,
Benjamin Wolsey <=