CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/27 17:28:03
Modified files:
. : ChangeLog
server/parser : shape_character_def.cpp
Log message:
* server/parser/shape_character_def.cpp (read): make effective
use of the SHAPE_LOG compile-time macro, by removing any
overhead
associated with it, when set to something != 0.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4120&r2=1.4121
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.35&r2=1.36
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4120
retrieving revision 1.4121
diff -u -b -r1.4120 -r1.4121
--- ChangeLog 27 Aug 2007 16:52:28 -0000 1.4120
+++ ChangeLog 27 Aug 2007 17:28:02 -0000 1.4121
@@ -1,5 +1,11 @@
2007-08-27 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/parser/shape_character_def.cpp (read): make effective
+ use of the SHAPE_LOG compile-time macro, by removing any overhead
+ associated with it, when set to something != 0.
+
+2007-08-27 Sandro Santilli <[EMAIL PROTECTED]>
+
* server/parser/shape_character_def.cpp (read): use ints for twips
values, convert to float only when needed (construction of the
edges and paths).
Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/parser/shape_character_def.cpp 27 Aug 2007 16:52:28 -0000
1.35
+++ server/parser/shape_character_def.cpp 27 Aug 2007 17:28:02 -0000
1.36
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: shape_character_def.cpp,v 1.35 2007/08/27 16:52:28 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.36 2007/08/27 17:28:02 strk Exp $ */
// Based on the public domain shape.cpp of Thatcher Ulrich <[EMAIL PROTECTED]>
2003
@@ -262,11 +262,12 @@
current_path.m_ax = x;
current_path.m_ay = y;
+#if SHAPE_LOG
IF_VERBOSE_PARSE
(
- if (SHAPE_LOG)
log_parse(_(" shape_character read: moveto %4g %4g"), x,
y);
);
+#endif
}
if ((flags & flagFillStyle0Change) && num_fill_bits > 0)
{
@@ -304,11 +305,11 @@
}
current_path.setLeftFill(style);
+#if SHAPE_LOG
IF_VERBOSE_PARSE(
- if (SHAPE_LOG) {
log_parse(_(" shape_character read: fill0 (left) = %d"),
current_path.getLeftFill());
- }
);
+#endif
}
if ((flags & flagFillStyle1Change) && num_fill_bits > 0)
@@ -346,11 +347,11 @@
}
}
current_path.setRightFill(style); // getRightFill() = style;
+#if SHAPE_LOG
IF_VERBOSE_PARSE (
- if (SHAPE_LOG) {
log_parse(_(" shape_character read: fill1 (right) = %d"),
current_path.getRightFill());
- }
)
+#endif
}
if ((flags & flagLineStyleChange) && num_line_bits > 0)
{
@@ -386,12 +387,11 @@
}
}
current_path.setLineStyle(style);
+#if SHAPE_LOG
IF_VERBOSE_PARSE (
- if (SHAPE_LOG)
- {
log_parse(_(" shape_character_read: line = %d"),
current_path.getLineStyle());
- }
)
+#endif
}
if (flags & flagHasNewStyles)
{
@@ -439,12 +439,11 @@
float ax = cx + in->read_sint(num_bits);
float ay = cy + in->read_sint(num_bits);
+#if SHAPE_LOG
IF_VERBOSE_PARSE (
- if (SHAPE_LOG)
- {
log_parse(_(" shape_character read: curved edge = %4g
%4g - %4g %4g - %4g %4g"), x, y, cx, cy, ax, ay);
- }
);
+#endif
current_path.m_edges.push_back(edge(cx, cy, ax, ay));
@@ -470,12 +469,11 @@
}
}
+#if SHAPE_LOG
IF_VERBOSE_PARSE (
- if (SHAPE_LOG)
- {
log_parse(_(" shape_character_read: straight edge = %4g
%4g - %4g %4g"), x, y, x + dx, y + dy);
- }
);
+#endif
current_path.m_edges.push_back(edge(x + dx, y + dy, x + dx, y +
dy));
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
