[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1520-ga562fb3 |
|
Date: |
Sat, 10 Nov 2012 23:37:45 +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 a562fb3a0fa7e6020bc77a0aa45bfd2997033163 (commit)
via 49193e6df4e17a7650ef8dbf5b7c710f06c453d6 (commit)
via c2675d5244c0e073627c23f1cceb71a435df71ae (commit)
via 66bf53991385bd34576a36fc104b19a2001b6f61 (commit)
via cd51f98064160849c4134cb1abffe9a1567b1287 (commit)
from 1db6444f8092e0daadc04bd392cd372d4e0a011e (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=a562fb3a0fa7e6020bc77a0aa45bfd2997033163
commit a562fb3a0fa7e6020bc77a0aa45bfd2997033163
Author: Bastiaan Jacques <address@hidden>
Date: Sun Nov 11 00:30:26 2012 +0100
Fix warning: converting âfalseâ to pointer type âgnash::Renderer*â.
Also remove some unnecessary casting.
diff --git a/gui/fb/fb_glue_agg.cpp b/gui/fb/fb_glue_agg.cpp
index 9eaa8f2..6fb60fd 100644
--- a/gui/fb/fb_glue_agg.cpp
+++ b/gui/fb/fb_glue_agg.cpp
@@ -180,7 +180,7 @@ FBAggGlue::createRenderHandler()
agg_handler = create_Renderer_agg(pixelformat);
} else {
log_error(_("The pixel format of your framebuffer could not be
detected."));
- return false;
+ return 0;
}
assert(agg_handler != NULL);
@@ -196,12 +196,12 @@ FBAggGlue::createRenderHandler()
}
// This attaches the memory from the device to the AGG renderer
- agg_handler->init_buffer((unsigned char *)mem, rawfb->getFBMemSize(),
+ agg_handler->init_buffer(mem, rawfb->getFBMemSize(),
width, height, rawfb->getStride());
_renderer.reset(agg_handler);
- return (Renderer *)agg_handler;
+ return agg_handler;
}
void
http://git.savannah.gnu.org/cgit//commit/?id=49193e6df4e17a7650ef8dbf5b7c710f06c453d6
commit 49193e6df4e17a7650ef8dbf5b7c710f06c453d6
Author: Bastiaan Jacques <address@hidden>
Date: Sat Nov 10 23:59:28 2012 +0100
Fix for warning: cast from type 'const NPUTF8* {aka const char*}' to type
'void*' casts away qualifiers.
Use proper C++ style casting to make our wishes known to the compiler.
diff --git a/plugin/npapi/mozilla-sdk/npn_gate.cpp
b/plugin/npapi/mozilla-sdk/npn_gate.cpp
index 7731aae..ef41572 100644
--- a/plugin/npapi/mozilla-sdk/npn_gate.cpp
+++ b/plugin/npapi/mozilla-sdk/npn_gate.cpp
@@ -364,7 +364,9 @@ NPN_ReleaseVariantValue(NPVariant *variant)
NPNFuncs.releasevariantvalue(variant);
} else {
if (variant->type == NPVariantType_String) {
-
NPN_MemFree((void*)gnash::GetNPStringChars(NPVARIANT_TO_STRING(*variant)));
+ NPString& strVar = NPVARIANT_TO_STRING(*variant);
+ NPUTF8* buffer =
const_cast<NPUTF8*>(gnash::GetNPStringChars(strVar));
+ NPN_MemFree(buffer);
} else if (variant->type == NPVariantType_Object) {
NPN_ReleaseObject(NPVARIANT_TO_OBJECT(*variant));
}
http://git.savannah.gnu.org/cgit//commit/?id=c2675d5244c0e073627c23f1cceb71a435df71ae
commit c2675d5244c0e073627c23f1cceb71a435df71ae
Author: Bastiaan Jacques <address@hidden>
Date: Sat Nov 10 23:51:01 2012 +0100
Fix warning: cast from type 'const gnash::nsPluginInstance* const' to type
'gpointer {aka void*}' casts away qualifiers.
Make setupIOChannel non-const so that g_io_add_watch can receive a
non-const pointer even though in practice that pointer is not used
to modify 'this'.
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index b893c67..0a270f4 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -1327,14 +1327,14 @@ wait_for_gdb()
}
void
-nsPluginInstance::setupIOChannel(int fd, GIOFunc handler, GIOCondition
signals) const
+nsPluginInstance::setupIOChannel(int fd, GIOFunc handler, GIOCondition signals)
{
GIOChannel* ichan = g_io_channel_unix_new(fd);
g_io_channel_set_close_on_unref(ichan, true);
gnash::log_debug("New IO Channel for fd #%d",
g_io_channel_unix_get_fd(ichan));
- g_io_add_watch(ichan, signals, handler, (gpointer)this);
+ g_io_add_watch(ichan, signals, handler, this);
g_io_channel_unref(ichan);
}
diff --git a/plugin/npapi/plugin.h b/plugin/npapi/plugin.h
index 4f3acf9..a715c2e 100644
--- a/plugin/npapi/plugin.h
+++ b/plugin/npapi/plugin.h
@@ -107,7 +107,7 @@ private:
/// @param handler the function to invoke
/// @param signals the signals for which to invoke the handler
/// See GIOChannel documentation for more information on the parameters.
- void setupIOChannel(int fd, GIOFunc handler, GIOCondition signals) const;
+ void setupIOChannel(int fd, GIOFunc handler, GIOCondition signals);
/// Process requests from the player.
http://git.savannah.gnu.org/cgit//commit/?id=66bf53991385bd34576a36fc104b19a2001b6f61
commit 66bf53991385bd34576a36fc104b19a2001b6f61
Author: Bastiaan Jacques <address@hidden>
Date: Sat Nov 10 23:39:56 2012 +0100
Permit compilation in C++11 mode.
GCC in C++11 mode understands quotes followed immediately by
an expression to be an invocation of operator", so this is adding
some spaces to prevent that behaviour.
diff --git a/libbase/rc.cpp b/libbase/rc.cpp
index ef79d6e..41990a9 100644
--- a/libbase/rc.cpp
+++ b/libbase/rc.cpp
@@ -83,7 +83,7 @@ RcInitFile::RcInitFile()
DEFAULT_FLASH_REV_NUMBER ",0"),
// An empty string leaves detection to VM.cpp:
_flashSystemOS(""),
- _flashSystemManufacturer("Gnash "DEFAULT_FLASH_SYSTEM_OS),
+ _flashSystemManufacturer("Gnash " DEFAULT_FLASH_SYSTEM_OS),
_actionDump(false),
_parserDump(false),
_verboseASCodingErrors(false),
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index b50a139..b893c67 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -50,17 +50,17 @@
// The name must be this value to get flash movies that check the
// plugin version to load.
#define PLUGIN_NAME "Shockwave Flash"
-#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
+#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED ":swf:" PLUGIN_NAME
// Some javascript plugin detectors use the description
// to decide the flash version to display. They expect the
// form (major version).(minor version) r(revision).
// e.g. "8.0 r99."
-#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
- DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
+#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION "." \
+ DEFAULT_FLASH_MINOR_VERSION " r" DEFAULT_FLASH_REV_NUMBER "."
#define PLUGIN_DESCRIPTION \
- "Shockwave Flash "FLASH_VERSION"<br>Gnash "VERSION", the GNU SWF Player. \
+ "Shockwave Flash " FLASH_VERSION "<br>Gnash " VERSION ", the GNU SWF Player.
\
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 \
<a href=\"http://www.fsf.org\";>Free \
Software Foundation</a>, Inc. <br> \
@@ -71,7 +71,7 @@
href=\"http://www.gnu.org/software/gnash/\";> \
http://www.gnu.org/software/gnash</a>. \
<br>\
- Compatible Shockwave Flash "FLASH_VERSION
+ Compatible Shockwave Flash " FLASH_VERSION
#include "plugin.h"
#include "GnashSystemIOHeaders.h"
http://git.savannah.gnu.org/cgit//commit/?id=cd51f98064160849c4134cb1abffe9a1567b1287
commit cd51f98064160849c4134cb1abffe9a1567b1287
Author: Bastiaan Jacques <address@hidden>
Date: Sat Nov 10 23:38:58 2012 +0100
Permit compilation in C++11 mode.
GCC in C++11 mode is unhappy with the implicit invocation of shared_ptr's
constructor from std::pair, so invoke it directly.
diff --git a/libmedia/FLVParser.cpp b/libmedia/FLVParser.cpp
index 7333dd9..8210e34 100644
--- a/libmedia/FLVParser.cpp
+++ b/libmedia/FLVParser.cpp
@@ -447,7 +447,7 @@ FLVParser::parseNextTag(bool index_only)
}
boost::mutex::scoped_lock lock(_metaTagsMutex);
- _metaTags.insert(std::make_pair(flvtag.timestamp,
metaTag.release()));
+ _metaTags.insert(std::make_pair(flvtag.timestamp,
MetaTags::mapped_type(metaTag)));
}
else
{
-----------------------------------------------------------------------
Summary of changes:
gui/fb/fb_glue_agg.cpp | 6 +++---
libbase/rc.cpp | 2 +-
libmedia/FLVParser.cpp | 2 +-
plugin/npapi/mozilla-sdk/npn_gate.cpp | 4 +++-
plugin/npapi/plugin.cpp | 14 +++++++-------
plugin/npapi/plugin.h | 2 +-
6 files changed, 16 insertions(+), 14 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1520-ga562fb3,
Bastiaan Jacques <=