[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. c0aa2f6632cd75872e9d
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. c0aa2f6632cd75872e9dda119aee20c5d7af4c44 |
|
Date: |
Thu, 16 Dec 2010 11:26:49 +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 c0aa2f6632cd75872e9dda119aee20c5d7af4c44 (commit)
via 9c1d7cdd037da98faf3401cb8691fb28899c86bc (commit)
via 4b58624a7441329ed5270c84e6dd3d08d869147b (commit)
via a5347b059d3b24668449026411c032f048ffbb1a (commit)
via a103fe3d85b37067d88093647eaed3c718a879ad (commit)
via 87800330302d9f1c9c09292945b8c009135ffac7 (commit)
via 488aee38e881e566a628999cc9139e645677002e (commit)
via eebb3757bd54ff9086e26e5bdd8ef4d4777f1e53 (commit)
via 785f0c2b897e8916ec2879307d318e63a9e74f10 (commit)
via b466c8b3ca629ca9cb122be5f274d55d9fe8dfe5 (commit)
via 3295cc7cc04b8191caa46933812832e61bd2f9c2 (commit)
via dcefa7c06dd4c5feb005e1464746c5c78eca0def (commit)
via adf2ca3fe5c7d1cf445c5c9d67e79c39723a8c19 (commit)
from 3eb8224f526719266b26fd32b4c23b8fb8c33936 (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=c0aa2f6632cd75872e9dda119aee20c5d7af4c44
commit c0aa2f6632cd75872e9dda119aee20c5d7af4c44
Merge: 9c1d7cd 3eb8224
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 12:26:18 2010 +0100
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=9c1d7cdd037da98faf3401cb8691fb28899c86bc
commit 9c1d7cdd037da98faf3401cb8691fb28899c86bc
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:42:05 2010 +0100
Minor cleanups.
diff --git a/libcore/asobj/Array_as.cpp b/libcore/asobj/Array_as.cpp
index e539723..62c36d1 100644
--- a/libcore/asobj/Array_as.cpp
+++ b/libcore/asobj/Array_as.cpp
@@ -868,13 +868,12 @@ registerArrayNative(as_object& global)
void
array_class_init(as_object& where, const ObjectURI& uri)
{
-
// This is going to be the global Array "class"/"function"
- VM& vm = getVM(where);
Global_as& gl = getGlobal(where);
as_object* proto = createObject(gl);
+ VM& vm = getVM(where);
as_object* cl = vm.getNative(252, 0);
cl->init_member(NSV::PROP_PROTOTYPE, proto);
diff --git a/libcore/asobj/XMLNode_as.h b/libcore/asobj/XMLNode_as.h
index c00ea13..29eb1c5 100644
--- a/libcore/asobj/XMLNode_as.h
+++ b/libcore/asobj/XMLNode_as.h
@@ -104,7 +104,7 @@ public:
/// @return false if no match found.
bool getPrefixForNamespace(const std::string& ns, std::string& prefix);
- void setNamespaceURI(const std::string value) {
+ void setNamespaceURI(const std::string& value) {
_namespaceURI = value;
}
diff --git a/libcore/swf/DefineButtonTag.cpp b/libcore/swf/DefineButtonTag.cpp
index 3db779e..505c428 100644
--- a/libcore/swf/DefineButtonTag.cpp
+++ b/libcore/swf/DefineButtonTag.cpp
@@ -118,11 +118,9 @@ DefineButtonTag::readDefineButtonTag(SWFStream& in,
movie_definition& m)
unsigned long endTagPos = in.get_tag_end_position();
// Read button DisplayObject records.
- for (;;)
- {
+ for (;;) {
ButtonRecord r;
- if (r.read(in, SWF::DEFINEBUTTON, m, endTagPos) == false)
- {
+ if (r.read(in, SWF::DEFINEBUTTON, m, endTagPos) == false) {
// Null record; marks the end of button records.
break;
}
http://git.savannah.gnu.org/cgit//commit/?id=4b58624a7441329ed5270c84e6dd3d08d869147b
commit 4b58624a7441329ed5270c84e6dd3d08d869147b
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:34:51 2010 +0100
Drop unused assignment.
diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index 0ea57ed..0676dfd 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -1115,9 +1115,6 @@ TextField::format_text()
int last_space_glyph = -1;
size_t last_line_start_record = 0;
- float leading = getLeading();
- leading += fontLeading * scale; // not sure this is correct...
-
_line_starts.push_back(0);
// String iterators are very sensitive to
http://git.savannah.gnu.org/cgit//commit/?id=a5347b059d3b24668449026411c032f048ffbb1a
commit a5347b059d3b24668449026411c032f048ffbb1a
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:33:40 2010 +0100
Clean up includes.
diff --git a/libcore/Geometry.cpp b/libcore/Geometry.cpp
index 27ef1f7..b1fc4bd 100644
--- a/libcore/Geometry.cpp
+++ b/libcore/Geometry.cpp
@@ -16,8 +16,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include <cmath>
#include "Geometry.h"
+
+#include <cmath>
+
#include "log.h"
#include "LineStyle.h"
http://git.savannah.gnu.org/cgit//commit/?id=a103fe3d85b37067d88093647eaed3c718a879ad
commit a103fe3d85b37067d88093647eaed3c718a879ad
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:33:34 2010 +0100
Const correct.
diff --git a/libcore/swf/TextRecord.h b/libcore/swf/TextRecord.h
index debb46d..730a21a 100644
--- a/libcore/swf/TextRecord.h
+++ b/libcore/swf/TextRecord.h
@@ -115,7 +115,7 @@ public:
_htmlURL = url;
}
- std::string getURL() {
+ const std::string& getURL() const {
return _htmlURL;
}
@@ -123,7 +123,7 @@ public:
_htmlTarget = target;
}
- std::string getTarget() {
+ const std::string& getTarget() const {
return _htmlTarget;
}
http://git.savannah.gnu.org/cgit//commit/?id=87800330302d9f1c9c09292945b8c009135ffac7
commit 87800330302d9f1c9c09292945b8c009135ffac7
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:31:40 2010 +0100
Drop unused bool.
diff --git a/libcore/Geometry.cpp b/libcore/Geometry.cpp
index 3b63db7..27ef1f7 100644
--- a/libcore/Geometry.cpp
+++ b/libcore/Geometry.cpp
@@ -271,15 +271,11 @@ pointTest(const std::vector<Path>& paths,
continue;
}
- bool touched = false;
-
// check first crossing
if (cross1 <= x)
{
if (pth.m_fill0 > 0) counter += dir1;
if (pth.m_fill1 > 0) counter -= dir1;
-
- touched = true;
}
// check optional second crossing (only possible with curves)
@@ -287,8 +283,6 @@ pointTest(const std::vector<Path>& paths,
{
if (pth.m_fill0 > 0) counter += dir2;
if (pth.m_fill1 > 0) counter -= dir2;
-
- touched = true;
}
}// for edge
http://git.savannah.gnu.org/cgit//commit/?id=488aee38e881e566a628999cc9139e645677002e
commit 488aee38e881e566a628999cc9139e645677002e
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:26:54 2010 +0100
Remove useless assignments.
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 6572bf0..5df7e3c 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -1701,34 +1701,28 @@ GtkGui::showPropertiesDialog()
gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(treeview), TRUE);
- gint coloffset;
- GtkCellRenderer* renderer;
- GtkTreeViewColumn* column;
-
// Add columns:
// 'Variable' column:
- renderer = gtk_cell_renderer_text_new();
- coloffset = gtk_tree_view_insert_column_with_attributes(
+ GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
+ gtk_tree_view_insert_column_with_attributes(
GTK_TREE_VIEW(treeview),
-1, _("Variable"),
renderer, "text",
STRING1_COLUMN,
NULL);
- column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), coloffset -
1);
// 'Value' column:
// Set to be 'editable' so that the data can be selected and
// copied; it can't actually be edited, though.
renderer = gtk_cell_renderer_text_new ();
g_object_set (renderer, "xalign", 0.0, "editable", TRUE, NULL);
- coloffset = gtk_tree_view_insert_column_with_attributes(
+ gtk_tree_view_insert_column_with_attributes(
GTK_TREE_VIEW(treeview),
-1, _("Value"),
renderer, "text",
STRING2_COLUMN,
NULL);
- column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), coloffset - 1);
//Add tree to scrollwindow.
gtk_container_add(GTK_CONTAINER(scrollwindow1), treeview);
diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index bda1270..42a5e97 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -152,12 +152,9 @@ gnash_canvas_configure_event(GtkWidget *widget,
GdkEventConfigure *event)
static void
gnash_canvas_realize(GtkWidget *widget)
{
- GnashCanvas *canvas = GNASH_CANVAS(widget);
- GdkWindowAttr attributes;
- gint attributes_mask;
-
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ GdkWindowAttr attributes;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
@@ -168,13 +165,15 @@ gnash_canvas_realize(GtkWidget *widget)
attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ gint attributes_mask =
+ GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
gdk_window_set_user_data (widget->window, widget);
#if defined(RENDERER_CAIRO) || defined(RENDERER_AGG)
+ GnashCanvas *canvas = GNASH_CANVAS(widget);
// cairo needs the _drawingArea.window to prepare it ..
// TODO: find a way to make 'glue' use independent from actual
// renderer in use
http://git.savannah.gnu.org/cgit//commit/?id=eebb3757bd54ff9086e26e5bdd8ef4d4777f1e53
commit eebb3757bd54ff9086e26e5bdd8ef4d4777f1e53
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:20:55 2010 +0100
Drop unused variable.
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 5b7316e..9e9c1e7 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -382,11 +382,6 @@ FBGui::initialize_renderer()
bool
FBGui::run()
{
- // GNASH_REPORT_FUNCTION;
-
-#ifdef USE_TSLIB
- int ts_loop_count;
-#endif
VirtualClock& timer = getClock();
@@ -401,10 +396,6 @@ FBGui::run()
// up early because of some Linux signal sent to our process (and thus
// "advance" faster than the "heartbeat" interval)? - Udo
-#ifdef USE_TSLIB
- ts_loop_count++; //increase loopcount
-#endif
-
// check input devices
checkForData();
http://git.savannah.gnu.org/cgit//commit/?id=785f0c2b897e8916ec2879307d318e63a9e74f10
commit 785f0c2b897e8916ec2879307d318e63a9e74f10
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:20:15 2010 +0100
Drop useless conditional.
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index c5b4ef6..6572bf0 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -1203,7 +1203,7 @@ PreferencesDialog::handlePrefs(GtkWidget* dialog, gint
response, gpointer data)
gtk_widget_destroy(dialog);
}
- if (prefs) delete prefs;
+ delete prefs;
}
void
http://git.savannah.gnu.org/cgit//commit/?id=b466c8b3ca629ca9cb122be5f274d55d9fe8dfe5
commit b466c8b3ca629ca9cb122be5f274d55d9fe8dfe5
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:19:39 2010 +0100
Move variable assignment to scope it's used in.
diff --git a/libcore/DisplayObject.cpp b/libcore/DisplayObject.cpp
index 9f3f31e..4dc0161 100644
--- a/libcore/DisplayObject.cpp
+++ b/libcore/DisplayObject.cpp
@@ -938,9 +938,9 @@ getDisplayObjectProperty(DisplayObject& obj, const
ObjectURI& uri,
const std::string& propname = uri.toString(st);
// Check _level0.._level9
- movie_root& mr = getRoot(*getObject(&obj));
unsigned int levelno;
if (isLevelTarget(getSWFVersion(*o), propname, levelno)) {
+ movie_root& mr = getRoot(*getObject(&obj));
MovieClip* mo = mr.getLevel(levelno);
if (mo) {
val = getObject(mo);
http://git.savannah.gnu.org/cgit//commit/?id=3295cc7cc04b8191caa46933812832e61bd2f9c2
commit 3295cc7cc04b8191caa46933812832e61bd2f9c2
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:19:17 2010 +0100
Const correct.
diff --git a/gui/fb/InputDevice.cpp b/gui/fb/InputDevice.cpp
index 5eac206..60444b8 100644
--- a/gui/fb/InputDevice.cpp
+++ b/gui/fb/InputDevice.cpp
@@ -132,7 +132,7 @@ InputDevice::readData(size_t size)
}
void
-InputDevice::dump()
+InputDevice::dump() const
{
// Debug strings to make output more readable
const char *debug[] = {
diff --git a/gui/fb/InputDevice.h b/gui/fb/InputDevice.h
index 32522f0..62dbf07 100644
--- a/gui/fb/InputDevice.h
+++ b/gui/fb/InputDevice.h
@@ -76,12 +76,12 @@ public:
static std::vector<boost::shared_ptr<InputDevice> > scanForDevices(Gui
*gui);
- InputDevice::devicetype_e getType() { return _type; };
+ InputDevice::devicetype_e getType() const { return _type; };
// Read data into the Device input buffer.
boost::shared_array<boost::uint8_t> readData(size_t size);
- void dump();
+ void dump() const;
protected:
devicetype_e _type;
http://git.savannah.gnu.org/cgit//commit/?id=dcefa7c06dd4c5feb005e1464746c5c78eca0def
commit dcefa7c06dd4c5feb005e1464746c5c78eca0def
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:18:45 2010 +0100
Operator= must return a reference to *this!
diff --git a/libcore/as_value.h b/libcore/as_value.h
index 60093b9..9c7bd1a 100644
--- a/libcore/as_value.h
+++ b/libcore/as_value.h
@@ -186,10 +186,11 @@ public:
}
/// Assign to an as_value.
- DSOEXPORT void operator=(const as_value& v)
+ DSOEXPORT as_value& operator=(const as_value& v)
{
_type = v._type;
_value = v._value;
+ return *this;
}
friend std::ostream& operator<<(std::ostream& o, const as_value&);
http://git.savannah.gnu.org/cgit//commit/?id=adf2ca3fe5c7d1cf445c5c9d67e79c39723a8c19
commit adf2ca3fe5c7d1cf445c5c9d67e79c39723a8c19
Author: Benjamin Wolsey <address@hidden>
Date: Thu Dec 16 11:18:33 2010 +0100
Const correct.
diff --git a/gui/Player.h b/gui/Player.h
index bd9e943..131a143 100644
--- a/gui/Player.h
+++ b/gui/Player.h
@@ -95,16 +95,16 @@ public:
#endif // def GNASH_FPS_DEBUG
void setWidth(size_t w) { _width = w; }
- size_t getWidth() { return _width; }
+ size_t getWidth() const { return _width; }
void setHeight(size_t h) { _height = h; }
- size_t getHeight() { return _height; }
+ size_t getHeight() const { return _height; }
void setXPosition(int xPos) { _xPosition = xPos; }
- size_t getXPosition() { return _xPosition; }
+ size_t getXPosition() const { return _xPosition; }
void setYPosition(int yPos) { _yPosition = yPos; }
- size_t getYPosition() { return _yPosition; }
+ size_t getYPosition() const { return _yPosition; }
void setWindowId(unsigned long x) { _windowID = x; }
-----------------------------------------------------------------------
Summary of changes:
gui/Player.h | 8 ++++----
gui/fb/InputDevice.cpp | 2 +-
gui/fb/InputDevice.h | 4 ++--
gui/fb/fb.cpp | 9 ---------
gui/gtk/gtk.cpp | 14 ++++----------
gui/gtk/gtk_canvas.cpp | 9 ++++-----
libcore/DisplayObject.cpp | 2 +-
libcore/Geometry.cpp | 10 +++-------
libcore/TextField.cpp | 3 ---
libcore/as_value.h | 3 ++-
libcore/asobj/Array_as.cpp | 3 +--
libcore/asobj/XMLNode_as.h | 2 +-
libcore/swf/DefineButtonTag.cpp | 6 ++----
libcore/swf/TextRecord.h | 4 ++--
14 files changed, 27 insertions(+), 52 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. c0aa2f6632cd75872e9dda119aee20c5d7af4c44,
Benjamin Wolsey <=