[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp se...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp se... |
|
Date: |
Fri, 15 Jun 2007 18:47:00 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/06/15 18:47:00
Modified files:
. : ChangeLog
gui : Player.cpp gnash.cpp
server : as_environment.cpp as_function.cpp as_value.cpp
server/asobj : NetStream.cpp xml.cpp
server/parser : shape_character_def.cpp
server/vm : ActionExec.cpp
Log message:
Applied patch #5927.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3549&r2=1.3550
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.37&r2=1.38
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3549
retrieving revision 1.3550
diff -u -b -r1.3549 -r1.3550
--- ChangeLog 15 Jun 2007 18:26:25 -0000 1.3549
+++ ChangeLog 15 Jun 2007 18:46:58 -0000 1.3550
@@ -1,5 +1,13 @@
2007-06-14 Sandro Santilli <address@hidden>
+ * gui/Player.cpp, gui/gnash.cpp, server/as_environment.cpp,
+ server/as_function.cpp, server/as_value.cpp,
+ server/asobj/NetStream.cpp, server/asobj/xml.cpp,
+ server/parser/shape_character_def.cpp, server/vm/ActionExec.cpp:
+ Applied patch #5927.
+
+2007-06-14 Sandro Santilli <address@hidden>
+
* libbase/triangulate_impl.h (poly_env<>::init): don't use
backslash to break strings (unneeded). See bug #20138.
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gui/Player.cpp 15 Jun 2007 15:00:26 -0000 1.55
+++ gui/Player.cpp 15 Jun 2007 18:46:59 -0000 1.56
@@ -311,15 +311,15 @@
float movie_fps = _movie_def->get_frame_rate();
if (!width) {
- width = int(movie_width * scale);
+ width = size_t(movie_width * scale);
}
if (!height) {
- height = int(movie_height * scale);
+ height = size_t(movie_height * scale);
}
if ( ! width || ! height )
{
- log_error(_("Input movie has collapsed dimensions %d/%d. Giving up."),
width, height);
+ log_error(_("Input movie has collapsed dimensions " SIZET_FMT "/"
SIZET_FMT ". Giving up."), width, height);
return EXIT_FAILURE;
}
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- gui/gnash.cpp 14 Jun 2007 16:08:16 -0000 1.72
+++ gui/gnash.cpp 15 Jun 2007 18:46:59 -0000 1.73
@@ -123,12 +123,12 @@
" CTRL-[ or kp- Step back one frame\n"
" CTRL-] or kp+ Step forward one frame\n"
" CTRL-B Toggle background color\n"
-#if 0
+/*
" CTRL-A Toggle antialiasing (doesn't work)\n"
" CTRL-T Debug. Test the set_variable() function\n"
" CTRL-G Debug. Test the get_variable() function\n"
" CTRL-M Debug. Test the call_method() function\n"
-#endif
+*/
));
}
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/as_environment.cpp 15 Jun 2007 15:00:27 -0000 1.79
+++ server/as_environment.cpp 15 Jun 2007 18:46:59 -0000 1.80
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: as_environment.cpp,v 1.79 2007/06/15 15:00:27 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.80 2007/06/15 18:46:59 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -662,7 +662,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Member %s for object %p not found
(dotsyntax). Path was %s"),
- subpart.c_str(), env, path.c_str());
+ subpart.c_str(), (void *)env, path.c_str());
);
return NULL;
}
@@ -671,7 +671,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Element '%s' of variable '%s' not found
in object %p nor in _global (dotsyntax)"),
- subpart.c_str(), path.c_str(), env);
+ subpart.c_str(), path.c_str(), (void *)env);
);
return NULL;
}
@@ -682,7 +682,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Member %s of object %p doesn't cast to an Object
(%s) "
"evaluating target path %s (dotsyntax)"),
- subpart.c_str(), env, tmp.to_debug_string().c_str(),
path.c_str());
+ subpart.c_str(), (void *)env,
tmp.to_debug_string().c_str(), path.c_str());
);
return NULL;
}
@@ -779,7 +779,7 @@
if ( ! ch ) {
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("'..' element in path '%s' follows a
non-character object %p"),
- path.c_str(), env);
+ path.c_str(), (void *)env);
);
return NULL;
}
@@ -788,7 +788,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("'..' in path '%s' follows a character
with no parent (%s : %p) (root is %p)"),
- path.c_str(),
ch->get_text_value().c_str(), ch, VM::get().getRoot().get_root_movie());
+ path.c_str(),
ch->get_text_value().c_str(), (void *)ch, (void
*)VM::get().getRoot().get_root_movie());
);
// if we override env, getvariable.as fails [line 57]
//env = ch;
@@ -809,7 +809,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Member %s for object %p not
found (slashsyntax). Path was %s"),
- subpart.c_str(), env, path.c_str());
+ subpart.c_str(), (void *)env,
path.c_str());
);
return NULL;
}
@@ -818,7 +818,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Element '%s' of variable '%s'
not found in object %p nor in _global (slashsyntax)"),
- subpart.c_str(), path.c_str(), env);
+ subpart.c_str(), path.c_str(), (void
*)env);
);
return NULL;
}
@@ -829,7 +829,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Member %s of object %p doesn't cast to
an Object (%s) "
"evaluating target path %s (slashsyntax)"),
- subpart.c_str(), env,
tmp.to_debug_string().c_str(), path.c_str());
+ subpart.c_str(), (void *)env,
tmp.to_debug_string().c_str(), path.c_str());
);
return NULL;
}
Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/as_function.cpp 15 Jun 2007 15:00:27 -0000 1.33
+++ server/as_function.cpp 15 Jun 2007 18:46:59 -0000 1.34
@@ -143,7 +143,7 @@
{
log_debug(_("Exported interface of function %p "
"has been overwritten (from %p to %p)"),
- this, _properties.get(),
+ (void*)this, (void*)_properties.get(),
(void*)proto.to_object().get());
_properties = proto.to_object();
}
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/as_value.cpp 15 Jun 2007 15:00:28 -0000 1.53
+++ server/as_value.cpp 15 Jun 2007 18:46:59 -0000 1.54
@@ -822,10 +822,10 @@
sprintf(buf, "[bool:%s]", m_boolean_value ? "true" :
"false");
return buf;
case OBJECT:
- sprintf(buf, "[object:%p]", m_object_value);
+ sprintf(buf, "[object:%p]", (void *)m_object_value);
return buf;
case AS_FUNCTION:
- sprintf(buf, "[function:%p]", m_object_value);
+ sprintf(buf, "[function:%p]", (void *)m_object_value);
return buf;
case STRING:
return "[string:" + m_string_value + "]";
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/asobj/NetStream.cpp 3 Jun 2007 18:17:20 -0000 1.63
+++ server/asobj/NetStream.cpp 15 Jun 2007 18:46:59 -0000 1.64
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStream.cpp,v 1.63 2007/06/03 18:17:20 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.64 2007/06/15 18:46:59 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -159,7 +159,7 @@
static as_value netstream_seek(const fn_call& fn) {
boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
- double time = 0;
+ uint32_t time = 0;
if (fn.nargs > 0)
{
time = fn.arg(0).to_number(&fn.env());
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/asobj/xml.cpp 14 May 2007 16:24:44 -0000 1.42
+++ server/asobj/xml.cpp 15 Jun 2007 18:47:00 -0000 1.43
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: xml.cpp,v 1.42 2007/05/14 16:24:44 strk Exp $ */
+/* $Id: xml.cpp,v 1.43 2007/06/15 18:47:00 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -583,7 +583,7 @@
xml_obj = boost::dynamic_pointer_cast<XML>(obj);
if ( xml_obj )
{
- log_msg(_("\tCloned the XML object at %p"), xml_obj.get());
+ log_msg(_("\tCloned the XML object at %p"), (void
*)xml_obj.get());
return as_value(xml_obj->cloneNode(true).get());
}
}
Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/shape_character_def.cpp 24 May 2007 13:42:50 -0000
1.27
+++ server/parser/shape_character_def.cpp 15 Jun 2007 18:47:00 -0000
1.28
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: shape_character_def.cpp,v 1.27 2007/05/24 13:42:50 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.28 2007/06/15 18:47:00 strk Exp $ */
// Based on the public domain shape.cpp of Thatcher Ulrich <address@hidden>
2003
@@ -296,7 +296,7 @@
if ( style > m_fill_styles.size() ) // 1-based index
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("Invalid fill style %d in
fillStyle0Change record - %u defined. Set to 0."), style, m_fill_styles.size());
+ log_swferror(_("Invalid fill style %d in
fillStyle0Change record - " SIZET_FMT " defined. Set to 0."), style,
m_fill_styles.size());
);
style = 0;
}
@@ -339,7 +339,7 @@
if ( style > m_fill_styles.size() ) // 1-based index
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("Invalid fill style %d in
fillStyle1Change record - %u defined. Set to 0."), style, m_fill_styles.size());
+ log_swferror(_("Invalid fill style %d in
fillStyle1Change record - " SIZET_FMT " defined. Set to 0."), style,
m_fill_styles.size());
);
style = 0;
}
@@ -379,7 +379,7 @@
if ( style > m_line_styles.size() ) // 1-based index
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("Invalid fill style %d in
lineStyleChange record - %u defined. Set to 0."), style, m_line_styles.size());
+ log_swferror(_("Invalid fill style %d in
lineStyleChange record - " SIZET_FMT " defined. Set to 0."), style,
m_line_styles.size());
);
style = 0;
}
Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/vm/ActionExec.cpp 1 Jun 2007 10:21:01 -0000 1.37
+++ server/vm/ActionExec.cpp 15 Jun 2007 18:47:00 -0000 1.38
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ActionExec.cpp,v 1.37 2007/06/01 10:21:01 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.38 2007/06/15 18:47:00 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -251,7 +251,7 @@
if ( ++branchCount > maxBranchCount )
{
char buf[256];
- snprintf(buf, 255, _("Loop iterations count exceeded
limit of %u"),
+ snprintf(buf, 255, _("Loop iterations count exceeded
limit of " SIZET_FMT),
maxBranchCount);
throw ActionLimitException(buf);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp se...,
Sandro Santilli <=