[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/ActionExec.cpp server/ac...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/ActionExec.cpp server/ac... |
|
Date: |
Mon, 28 Aug 2006 11:14:20 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/08/28 11:14:20
Modified files:
. : ChangeLog
server : ActionExec.cpp action.cpp impl.cpp morph.cpp
sprite_instance.h
Log message:
* server/ActionExec.cpp, server/action.cpp, server/impl.cpp,
server/sprite_instance.h: removed "stream.h" inclusion.
* server/morph.cpp: log_msg -> log_parse, minor indentations
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.747&r2=1.748
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ActionExec.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/morph.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.21&r2=1.22
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.747
retrieving revision 1.748
diff -u -b -r1.747 -r1.748
--- ChangeLog 28 Aug 2006 11:07:14 -0000 1.747
+++ ChangeLog 28 Aug 2006 11:14:20 -0000 1.748
@@ -1,5 +1,8 @@
2006-08-28 Sandro Santilli <address@hidden>
+ * server/ActionExec.cpp, server/action.cpp, server/impl.cpp,
+ server/sprite_instance.h: removed "stream.h" inclusion.
+ * server/morph.cpp: log_msg -> log_parse, minor indentations
* server/parser/movie_def_impl.cpp (resolve_import):
fixed infinite loop.
Index: server/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ActionExec.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/ActionExec.cpp 28 Aug 2006 11:07:15 -0000 1.26
+++ server/ActionExec.cpp 28 Aug 2006 11:14:20 -0000 1.27
@@ -42,7 +42,7 @@
#include "action_buffer.h"
#include "swf_function.h"
#include "log.h"
-#include "stream.h"
+//#include "stream.h"
#include "swf.h"
#include "ASHandlers.h"
Index: server/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/action.cpp 23 Aug 2006 13:35:15 -0000 1.98
+++ server/action.cpp 28 Aug 2006 11:14:20 -0000 1.99
@@ -50,7 +50,7 @@
#include "as_object.h"
#include "impl.h"
#include "log.h"
-#include "stream.h"
+//#include "stream.h"
#include "tu_random.h"
//#include "gstring.h"
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/impl.cpp 26 Aug 2006 22:58:12 -0000 1.54
+++ server/impl.cpp 28 Aug 2006 11:14:20 -0000 1.55
@@ -60,7 +60,7 @@
//#include "morph2.h"
#include "render.h"
#include "shape.h"
-#include "stream.h"
+//#include "stream.h"
#include "styles.h"
#include "dlist.h"
#include "timers.h"
Index: server/morph.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/morph.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/morph.cpp 27 Aug 2006 01:28:48 -0000 1.7
+++ server/morph.cpp 28 Aug 2006 11:14:20 -0000 1.8
@@ -82,16 +82,16 @@
{
assert(tag_type == 46);
int pos = in->get_underlying_stream()->get_position();
- log_parse("smd: initial pos %d\n", pos);
m_bound_orig.read(in);
m_bound_target.read(in);
- if (dbglogfile.getParserDump()) {
+ IF_VERBOSE_PARSE (
+ log_parse("smd: initial pos %d", pos);
log_parse("smd: orig bounds ");
m_bound_orig.print();
log_parse("smd: target bounds ");
m_bound_target.print();
- }
+ );
int offset = in->read_u32();
UNUSED(offset);
@@ -99,32 +99,46 @@
int fill_style_count = in->read_variable_count();
- IF_VERBOSE_PARSE(log_msg("smd: fsc = %d\n", fill_style_count));
+ IF_VERBOSE_PARSE(
+ log_parse("smd: fsc = %d", fill_style_count)
+ );
+
for (int i = 0; i < fill_style_count; i++) {
m_fill_styles.push_back(morph_fill_style(in, m));
}
int line_style_count = in->read_variable_count();
- IF_VERBOSE_PARSE(log_msg("smd: lsc = %d\n", line_style_count));
+ IF_VERBOSE_PARSE(
+ log_parse("smd: lsc = %d", line_style_count)
+ );
+
{for (int i = 0; i < line_style_count; i++) {
m_line_styles.push_back(morph_line_style(in));
}}
int edges1 = read_shape_record(in, m, true);
- IF_VERBOSE_PARSE(log_msg("morph: read %d edges for shape 1\n",
- edges1));
+
+ IF_VERBOSE_PARSE(
+ log_parse("morph: read %d edges for shape 1", edges1)
+ );
int pos2 = in->get_underlying_stream()->get_position();
assert(pos + offset == pos2);
int edges2 = read_shape_record(in, m, false);
- IF_VERBOSE_PARSE(log_msg("morph: read %d edges for shape 2\n",
- edges2));
+
+ IF_VERBOSE_PARSE(
+ log_parse("morph: read %d edges for shape 2", edges2)
+ );
assert(edges1 == edges2);
+
pos2 = in->get_underlying_stream()->get_position();
- IF_VERBOSE_PARSE(log_msg("smd: final pos %d\n", pos2));
+
+ IF_VERBOSE_PARSE(
+ log_parse("smd: final pos %d", pos2)
+ );
}
@@ -137,7 +151,16 @@
e.m_cy = y + in->read_sint(bits);
x = e.m_ax = e.m_cx + in->read_sint(bits);
y = e.m_ay = e.m_cy + in->read_sint(bits);
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("smd::re:
curved edge = %4g %4g - %4g %4g - %4g %4g\n", x, y, e.m_cx, e.m_cy, e.m_ax,
e.m_ay));
+ if (SHAPE_LOG)
+ {
+ IF_VERBOSE_PARSE(
+ log_parse("smd::re: curved edge ="
+ "%4g %4g - %4g %4g - %4g %4g",
+ x, y,
+ e.m_cx, e.m_cy,
+ e.m_ax, e.m_ay)
+ );
+ }
return;
}
@@ -160,7 +183,14 @@
e.m_cy = y + dy / 2;
x = e.m_ax = x + dx;
y = e.m_ay = y + dy;
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("smd::re: straight edge
= %4g %4g - %4g %4g\n", x - dx, y - dy, x, y));
+ if (SHAPE_LOG)
+ {
+ IF_VERBOSE_PARSE(
+ log_parse("smd::re: straight edge = "
+ "%4g %4g - %4g %4g",
+ x - dx, y - dy, x, y)
+ );
+ }
}
int shape_morph_def::read_shape_record(stream* in,
@@ -177,8 +207,9 @@
in->align();
int fill_bits = in->read_uint(4);
int line_bits = in->read_uint(4);
- IF_VERBOSE_PARSE(log_msg("smd: bits %d/%d\n",
- fill_bits, line_bits));
+ IF_VERBOSE_PARSE(
+ log_parse("smd: bits %d/%d", fill_bits, line_bits)
+ );
if (!start) {
for (int i = 0; i < m_paths.size(); i++) {
@@ -235,7 +266,15 @@
int num_move_bits = in->read_uint(5);
x = float(in->read_sint(num_move_bits));
y = float(in->read_sint(num_move_bits));
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("morph:
MOVETO %g,%g (%d)\n", x, y, num_move_bits));
+ if (SHAPE_LOG)
+ {
+ IF_VERBOSE_PARSE(
+ log_parse("morph: MOVETO %g,%g"
+ " (%d)",
+ x, y,
+ num_move_bits)
+ );
+ }
}
// If we're starting a new path, it starts at the
@@ -254,7 +293,13 @@
int style = in->read_uint(fill_bits);
if (style > 0) style += fill_base;
current_path.m_fill0 = style;
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("morph:
fill0 = %d\n", current_path.m_fill0));
+ if (SHAPE_LOG)
+ {
+ IF_VERBOSE_PARSE(
+ log_parse("morph: fill0 = %d",
+ current_path.m_fill0)
+ );
+ }
}
if ((flags & 0x04) && fill_bits) { // FILL1
@@ -262,7 +307,13 @@
int style = in->read_uint(fill_bits);
if (style > 0) style += fill_base;
current_path.m_fill1 = style;
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("morph:
fill1 = %d\n", current_path.m_fill1));
+ if (SHAPE_LOG)
+ {
+ IF_VERBOSE_PARSE(
+ log_parse("morph: fill1 = %d",
+ current_path.m_fill1)
+ );
+ }
}
if ((flags & 0x08) && line_bits) { // LINE
@@ -270,7 +321,13 @@
int style = in->read_uint(line_bits);
if (style > 0) style += line_base;
current_path.m_line = style;
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("scr:
line = %d\n", current_path.m_line));
+ if (SHAPE_LOG)
+ {
+ IF_VERBOSE_PARSE(
+ log_parse("scr: line = %d",
+ current_path.m_line)
+ );
+ }
}
if (flags & 0x10) { // NEWSTYLES
@@ -300,7 +357,16 @@
fill_bits = in->read_uint(4);
fill_bits = in->read_uint(4);
- if (SHAPE_LOG) IF_VERBOSE_PARSE(log_msg("morph:
read %d/%d new styles (bits now %d/%d)\n", m_fill_styles.size() - fill_base,
m_line_styles.size() - line_base, fill_bits, line_bits));
+ if (SHAPE_LOG)
+ { IF_VERBOSE_PARSE(
+ log_parse("morph: read %d/%d "
+ "new styles (bits now %d/%d)",
+ m_fill_styles.size() -
+ fill_base,
+ m_line_styles.size() -
+ line_base,
+ fill_bits, line_bits)
+ ); }
}
}
@@ -368,8 +434,10 @@
// GRADIENT
int num_gradients = in->read_u8();
- IF_VERBOSE_PARSE(log_msg("fsr: num_gradients: %d\n",
- num_gradients));
+ IF_VERBOSE_PARSE(
+ log_parse("fsr: num_gradients: %d",
+ num_gradients)
+ );
assert(num_gradients > 0 && num_gradients < 9);
m_gradients[0].resize(num_gradients);
m_gradients[1].resize(num_gradients);
@@ -386,7 +454,7 @@
case 0x40: { // tiled bitmap fill
case 0x41: // clipped bitmap fill
int char_id = in->read_u16();
- IF_VERBOSE_PARSE(log_msg("fsr: bitmap_char = %d\n",
+ IF_VERBOSE_PARSE(log_parse("fsr: bitmap_char = %d",
char_id));
m_bitmap_character = m->get_bitmap_character(char_id);
@@ -432,12 +500,12 @@
m_color[0].read_rgba(in);
m_color[1].read_rgba(in);
- if (dbglogfile.getParserDump()) {
+ IF_VERBOSE_PARSE (
log_parser("mls 1: width %d color ", m_width[0]);
m_color[0].print();
log_parse("mls 2: width %d color ", m_width[1]);
m_color[1].print();
- }
+ );
}
void morph_line_style::apply(float ratio) const
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/sprite_instance.h 25 Aug 2006 18:44:21 -0000 1.21
+++ server/sprite_instance.h 28 Aug 2006 11:14:20 -0000 1.22
@@ -49,7 +49,7 @@
#include "movie_definition.h" // for inlines
#include "dlist.h" // DisplayList
-#include "stream.h"
+//#include "stream.h"
#include "log.h"
#include "as_environment.h" // for composition