[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog [release_0
From: |
Udo Giacomozzi |
Subject: |
[Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog [release_0_7_2] |
Date: |
Tue, 31 Oct 2006 12:29:58 +0000 |
CVSROOT: /cvsroot/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Udo Giacomozzi <udog> 06/10/31 12:29:58
Modified files:
backend : render_handler_agg.cpp
. : ChangeLog
Log message:
Fixed outlines width
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29.2.3&r2=1.29.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.25&r2=1.1412.2.26
Patches:
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -b -r1.29.2.3 -r1.29.2.4
--- backend/render_handler_agg.cpp 31 Oct 2006 09:52:47 -0000 1.29.2.3
+++ backend/render_handler_agg.cpp 31 Oct 2006 12:29:58 -0000 1.29.2.4
@@ -16,7 +16,7 @@
-/* $Id: render_handler_agg.cpp,v 1.29.2.3 2006/10/31 09:52:47 nihilus Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.29.2.4 2006/10/31 12:29:58 udog Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -681,7 +681,7 @@
for (int subshape=0; subshape<subshape_count; subshape++) {
draw_shape(subshape, paths, fill_styles, cx, mat, true);
- draw_outlines(subshape, paths, line_styles, cx);
+ draw_outlines(subshape, paths, line_styles, cx, mat);
}
} // if not drawing mask
@@ -1082,7 +1082,8 @@
/// Just like draw_shapes() except that it draws an outline.
void draw_outlines(int subshape_id, const std::vector<path> &paths,
- const std::vector<line_style> &line_styles, const cxform& cx) {
+ const std::vector<line_style> &line_styles, const cxform& cx,
+ const matrix& linestyle_matrix) {
if (m_alpha_mask.empty()) {
@@ -1093,7 +1094,7 @@
scanline_type sl;
draw_outlines_impl<scanline_type> (subshape_id, paths, line_styles,
- cx, sl);
+ cx, linestyle_matrix, sl);
} else {
@@ -1104,7 +1105,7 @@
scanline_type sl(m_alpha_mask.back()->get_amask());
draw_outlines_impl<scanline_type> (subshape_id, paths, line_styles,
- cx, sl);
+ cx, linestyle_matrix, sl);
}
@@ -1130,6 +1131,10 @@
int pno, eno;
int pcount, ecount;
+ // use avg between x and y scale
+ const float stroke_scale =
+ (linestyle_matrix.get_x_scale() + linestyle_matrix.get_y_scale()) / 2.0f;
+
// AGG stuff
renderer_base rbase(*m_pixf);
agg::rasterizer_scanline_aa<> ras; // anti alias
@@ -1170,7 +1175,7 @@
if (width==1)
stroke.width(1);
else
- stroke.width(width*scale);
+ stroke.width(width*scale*stroke_scale);
stroke.line_cap(agg::round_cap);
stroke.line_join(agg::round_join);
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.25
retrieving revision 1.1412.2.26
diff -u -b -r1.1412.2.25 -r1.1412.2.26
--- ChangeLog 31 Oct 2006 11:27:43 -0000 1.1412.2.25
+++ ChangeLog 31 Oct 2006 12:29:58 -0000 1.1412.2.26
@@ -7,6 +7,8 @@
* testsuite/movies.all/gravity-embed.swf: improved by providing
explicit size control buttons and debugging textfield.
+ * backend/render_handler_agg.cpp: Outline sizes now respect the
+ transformation matrix
2006-10-31 Sandro Santilli <address@hidden>
- [Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog [release_0_7_2],
Udo Giacomozzi <=