[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-2088-g3ff2c45 |
|
Date: |
Thu, 29 May 2014 20:18:25 +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 3ff2c456d51280d3d7953b2bf8c57976cfafb660 (commit)
via 3a7186b73a16b48fd35a4828b8cf179d46aff4c5 (commit)
via 3e18b18fea692f52e8c35265e1283501f6ad049d (commit)
from 7357db7d703dc81302ad3c748bfd5c377089c10c (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=3ff2c456d51280d3d7953b2bf8c57976cfafb660
commit 3ff2c456d51280d3d7953b2bf8c57976cfafb660
Author: Bastiaan Jacques <address@hidden>
Date: Thu May 29 21:23:15 2014 +0200
A bit more C++11 initializer syntax.
diff --git a/gui/qt/Qt4Gui.cpp b/gui/qt/Qt4Gui.cpp
index 74bb48e..8c94882 100644
--- a/gui/qt/Qt4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -23,7 +23,6 @@
#endif
#include <map>
-#include <boost/assign/list_inserter.hpp>
#include <QMainWindow>
#include <QX11Info>
@@ -699,38 +698,38 @@ Qt4Gui::setupKeyMap()
// be harmful to do it more.
assert (_keyMap.empty());
- boost::assign::insert(_keyMap)
- (Qt::Key_Backspace, gnash::key::BACKSPACE)
- (Qt::Key_Tab, gnash::key::TAB)
- (Qt::Key_Clear, gnash::key::CLEAR)
- (Qt::Key_Return, gnash::key::ENTER)
- (Qt::Key_Enter, gnash::key::ENTER)
- (Qt::Key_Shift, gnash::key::SHIFT)
- (Qt::Key_Control, gnash::key::CONTROL)
- (Qt::Key_Alt, gnash::key::ALT)
- (Qt::Key_CapsLock, gnash::key::CAPSLOCK)
- (Qt::Key_Escape, gnash::key::ESCAPE)
- (Qt::Key_Space, gnash::key::SPACE)
- (Qt::Key_PageDown, gnash::key::PGDN)
- (Qt::Key_PageUp, gnash::key::PGUP)
- (Qt::Key_Home, gnash::key::HOME)
- (Qt::Key_End, gnash::key::END)
- (Qt::Key_Left, gnash::key::LEFT)
- (Qt::Key_Up, gnash::key::UP)
- (Qt::Key_Right, gnash::key::RIGHT)
- (Qt::Key_Down, gnash::key::DOWN)
- (Qt::Key_Insert, gnash::key::INSERT)
- (Qt::Key_Delete, gnash::key::DELETEKEY)
- (Qt::Key_Help, gnash::key::HELP)
- (Qt::Key_NumLock, gnash::key::NUM_LOCK)
- (Qt::Key_Semicolon, gnash::key::SEMICOLON)
- (Qt::Key_Equal, gnash::key::EQUALS)
- (Qt::Key_Minus, gnash::key::MINUS)
- (Qt::Key_Slash, gnash::key::SLASH)
- (Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET)
- (Qt::Key_Backslash, gnash::key::BACKSLASH)
- (Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET)
- (Qt::Key_QuoteDbl, gnash::key::DOUBLE_QUOTE);
+ _keyMap = {
+ {Qt::Key_Backspace, gnash::key::BACKSPACE},
+ {Qt::Key_Tab, gnash::key::TAB},
+ {Qt::Key_Clear, gnash::key::CLEAR},
+ {Qt::Key_Return, gnash::key::ENTER},
+ {Qt::Key_Enter, gnash::key::ENTER},
+ {Qt::Key_Shift, gnash::key::SHIFT},
+ {Qt::Key_Control, gnash::key::CONTROL},
+ {Qt::Key_Alt, gnash::key::ALT},
+ {Qt::Key_CapsLock, gnash::key::CAPSLOCK},
+ {Qt::Key_Escape, gnash::key::ESCAPE},
+ {Qt::Key_Space, gnash::key::SPACE},
+ {Qt::Key_PageDown, gnash::key::PGDN},
+ {Qt::Key_PageUp, gnash::key::PGUP},
+ {Qt::Key_Home, gnash::key::HOME},
+ {Qt::Key_End, gnash::key::END},
+ {Qt::Key_Left, gnash::key::LEFT},
+ {Qt::Key_Up, gnash::key::UP},
+ {Qt::Key_Right, gnash::key::RIGHT},
+ {Qt::Key_Down, gnash::key::DOWN},
+ {Qt::Key_Insert, gnash::key::INSERT},
+ {Qt::Key_Delete, gnash::key::DELETEKEY},
+ {Qt::Key_Help, gnash::key::HELP},
+ {Qt::Key_NumLock, gnash::key::NUM_LOCK},
+ {Qt::Key_Semicolon, gnash::key::SEMICOLON},
+ {Qt::Key_Equal, gnash::key::EQUALS},
+ {Qt::Key_Minus, gnash::key::MINUS},
+ {Qt::Key_Slash, gnash::key::SLASH},
+ {Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET},
+ {Qt::Key_Backslash, gnash::key::BACKSLASH},
+ {Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET},
+ {Qt::Key_QuoteDbl, gnash::key::DOUBLE_QUOTE} };
}
void
diff --git a/libcore/swf/DefaultTagLoaders.cpp
b/libcore/swf/DefaultTagLoaders.cpp
index e3e3395..a8953ee 100644
--- a/libcore/swf/DefaultTagLoaders.cpp
+++ b/libcore/swf/DefaultTagLoaders.cpp
@@ -22,7 +22,6 @@
#include "DefaultTagLoaders.h"
-#include <boost/assign.hpp>
#include <set>
#include "SWF.h"
http://git.savannah.gnu.org/cgit//commit/?id=3a7186b73a16b48fd35a4828b8cf179d46aff4c5
commit 3a7186b73a16b48fd35a4828b8cf179d46aff4c5
Author: Bastiaan Jacques <address@hidden>
Date: Thu May 29 21:19:40 2014 +0200
Simplify a bit more.
diff --git a/libcore/swf/DefaultTagLoaders.cpp
b/libcore/swf/DefaultTagLoaders.cpp
index 71fd14e..e3e3395 100644
--- a/libcore/swf/DefaultTagLoaders.cpp
+++ b/libcore/swf/DefaultTagLoaders.cpp
@@ -114,132 +114,132 @@ addDefaultLoaders(TagLoadersTable& table)
// by Adobe.
const std::vector<TagPair> tags = {
// 01: nothing to do for an end tag.
- TagPair(SWF::END,ignore),
+ {SWF::END,ignore},
// 02
- TagPair(SWF::DEFINESHAPE,DefineShapeTag::loader),
+ {SWF::DEFINESHAPE,DefineShapeTag::loader},
// 03
- TagPair(SWF::FREECHARACTER,unexpected),
- TagPair(SWF::PLACEOBJECT,PlaceObject2Tag::loader),
- TagPair(SWF::REMOVEOBJECT,RemoveObjectTag::loader),// 05
- TagPair(SWF::DEFINEBITS,DefineBitsTag::loader),
- TagPair(SWF::DEFINEBUTTON,DefineButtonTag::loader),
- TagPair(SWF::JPEGTABLES,jpeg_tables_loader),
- TagPair(SWF::SETBACKGROUNDCOLOR,SetBackgroundColorTag::loader),
- TagPair(SWF::DEFINEFONT,DefineFontTag::loader),
- TagPair(SWF::DEFINETEXT,DefineTextTag::loader),
- TagPair(SWF::DOACTION,DoActionTag::loader),
- TagPair(SWF::DEFINEFONTINFO,DefineFontInfoTag::loader),
- TagPair(SWF::DEFINESOUND,define_sound_loader),
- TagPair(SWF::STARTSOUND,StartSoundTag::loader),
- TagPair(SWF::STOPSOUND,unexpected),// 16
+ {SWF::FREECHARACTER,unexpected},
+ {SWF::PLACEOBJECT,PlaceObject2Tag::loader},
+ {SWF::REMOVEOBJECT,RemoveObjectTag::loader},// 05
+ {SWF::DEFINEBITS,DefineBitsTag::loader},
+ {SWF::DEFINEBUTTON,DefineButtonTag::loader},
+ {SWF::JPEGTABLES,jpeg_tables_loader},
+ {SWF::SETBACKGROUNDCOLOR,SetBackgroundColorTag::loader},
+ {SWF::DEFINEFONT,DefineFontTag::loader},
+ {SWF::DEFINETEXT,DefineTextTag::loader},
+ {SWF::DOACTION,DoActionTag::loader},
+ {SWF::DEFINEFONTINFO,DefineFontInfoTag::loader},
+ {SWF::DEFINESOUND,define_sound_loader},
+ {SWF::STARTSOUND,StartSoundTag::loader},
+ {SWF::STOPSOUND,unexpected},// 16
// 17
- TagPair(SWF::DEFINEBUTTONSOUND,DefineButtonSoundTag::loader),
+ {SWF::DEFINEBUTTONSOUND,DefineButtonSoundTag::loader},
// 18
- TagPair(SWF::SOUNDSTREAMHEAD,SoundStreamHeadTag::loader),
+ {SWF::SOUNDSTREAMHEAD,SoundStreamHeadTag::loader},
// 19
- TagPair(SWF::SOUNDSTREAMBLOCK,StreamSoundBlockTag::loader),
- TagPair(SWF::DEFINELOSSLESS,DefineBitsTag::loader),
- TagPair(SWF::DEFINEBITSJPEG2,DefineBitsTag::loader),
- TagPair(SWF::DEFINESHAPE2,DefineShapeTag::loader),
- TagPair(SWF::DEFINEBUTTONCXFORM,DefineButtonCxformTag::loader),// 23
- TagPair(SWF::PROTECT,ignore),
- TagPair(SWF::PATHSAREPOSTSCRIPT,unexpected),// 25
- TagPair(SWF::PLACEOBJECT2,PlaceObject2Tag::loader),
+ {SWF::SOUNDSTREAMBLOCK,StreamSoundBlockTag::loader},
+ {SWF::DEFINELOSSLESS,DefineBitsTag::loader},
+ {SWF::DEFINEBITSJPEG2,DefineBitsTag::loader},
+ {SWF::DEFINESHAPE2,DefineShapeTag::loader},
+ {SWF::DEFINEBUTTONCXFORM,DefineButtonCxformTag::loader},// 23
+ {SWF::PROTECT,ignore},
+ {SWF::PATHSAREPOSTSCRIPT,unexpected},// 25
+ {SWF::PLACEOBJECT2,PlaceObject2Tag::loader},
// 28
- TagPair(SWF::REMOVEOBJECT2,RemoveObjectTag::loader),
- TagPair(SWF::SYNCFRAME,unexpected),// 29
- TagPair(SWF::FREEALL,unexpected),// 31
- TagPair(SWF::DEFINESHAPE3,DefineShapeTag::loader),
- TagPair(SWF::DEFINETEXT2,DefineText2Tag::loader),
+ {SWF::REMOVEOBJECT2,RemoveObjectTag::loader},
+ {SWF::SYNCFRAME,unexpected},// 29
+ {SWF::FREEALL,unexpected},// 31
+ {SWF::DEFINESHAPE3,DefineShapeTag::loader},
+ {SWF::DEFINETEXT2,DefineText2Tag::loader},
// 37
- TagPair(SWF::DEFINEBUTTON2,DefineButton2Tag::loader),
- TagPair(SWF::DEFINEBITSJPEG3,DefineBitsTag::loader),
- TagPair(SWF::DEFINELOSSLESS2,DefineBitsTag::loader),
- TagPair(SWF::DEFINEEDITTEXT,DefineEditTextTag::loader),
- TagPair(SWF::DEFINEVIDEO,unexpected),// 38
- TagPair(SWF::DEFINESPRITE,sprite_loader),
- TagPair(SWF::NAMECHARACTER,unexpected),// 40
- TagPair(SWF::SERIALNUMBER,serialnumber_loader),// 41
- TagPair(SWF::DEFINETEXTFORMAT,unexpected),// 42
- TagPair(SWF::FRAMELABEL,frame_label_loader),// 43
- TagPair(SWF::DEFINEBEHAVIOR,unexpected),// 44
+ {SWF::DEFINEBUTTON2,DefineButton2Tag::loader},
+ {SWF::DEFINEBITSJPEG3,DefineBitsTag::loader},
+ {SWF::DEFINELOSSLESS2,DefineBitsTag::loader},
+ {SWF::DEFINEEDITTEXT,DefineEditTextTag::loader},
+ {SWF::DEFINEVIDEO,unexpected},// 38
+ {SWF::DEFINESPRITE,sprite_loader},
+ {SWF::NAMECHARACTER,unexpected},// 40
+ {SWF::SERIALNUMBER,serialnumber_loader},// 41
+ {SWF::DEFINETEXTFORMAT,unexpected},// 42
+ {SWF::FRAMELABEL,frame_label_loader},// 43
+ {SWF::DEFINEBEHAVIOR,unexpected},// 44
// 45
- TagPair(SWF::SOUNDSTREAMHEAD2,SoundStreamHeadTag::loader),
+ {SWF::SOUNDSTREAMHEAD2,SoundStreamHeadTag::loader},
// 46
- TagPair(SWF::DEFINEMORPHSHAPE,DefineMorphShapeTag::loader),
+ {SWF::DEFINEMORPHSHAPE,DefineMorphShapeTag::loader},
// 47
- TagPair(SWF::FRAMETAG,unexpected),
+ {SWF::FRAMETAG,unexpected},
// 48
- TagPair(SWF::DEFINEFONT2,DefineFontTag::loader),
- TagPair(SWF::GENCOMMAND,unexpected),// 49
- TagPair(SWF::DEFINECOMMANDOBJ,unexpected),// 50
- TagPair(SWF::CHARACTERSET,unexpected),// 51
- TagPair(SWF::FONTREF,unexpected),// 52
- TagPair(SWF::DEFINEFUNCTION,unexpected),// 53
- TagPair(SWF::PLACEFUNCTION,unexpected),// 54
- TagPair(SWF::GENTAGOBJECT,unexpected),// 55
- TagPair(SWF::EXPORTASSETS,ExportAssetsTag::loader),// 56
- TagPair(SWF::IMPORTASSETS,ImportAssetsTag::loader),// 57
- TagPair(SWF::ENABLEDEBUGGER,ignore), // 58
+ {SWF::DEFINEFONT2,DefineFontTag::loader},
+ {SWF::GENCOMMAND,unexpected},// 49
+ {SWF::DEFINECOMMANDOBJ,unexpected},// 50
+ {SWF::CHARACTERSET,unexpected},// 51
+ {SWF::FONTREF,unexpected},// 52
+ {SWF::DEFINEFUNCTION,unexpected},// 53
+ {SWF::PLACEFUNCTION,unexpected},// 54
+ {SWF::GENTAGOBJECT,unexpected},// 55
+ {SWF::EXPORTASSETS,ExportAssetsTag::loader},// 56
+ {SWF::IMPORTASSETS,ImportAssetsTag::loader},// 57
+ {SWF::ENABLEDEBUGGER,ignore}, // 58
// 59
- TagPair(SWF::INITACTION,DoInitActionTag::loader),
+ {SWF::INITACTION,DoInitActionTag::loader},
// 60
- TagPair(SWF::DEFINEVIDEOSTREAM,DefineVideoStreamTag::loader),
+ {SWF::DEFINEVIDEOSTREAM,DefineVideoStreamTag::loader},
// 61
- TagPair(SWF::VIDEOFRAME,VideoFrameTag::loader),
+ {SWF::VIDEOFRAME,VideoFrameTag::loader},
// 62
- TagPair(SWF::DEFINEFONTINFO2,DefineFontInfoTag::loader),
+ {SWF::DEFINEFONTINFO2,DefineFontInfoTag::loader},
// 63
- TagPair(SWF::DEBUGID,ignore),
+ {SWF::DEBUGID,ignore},
// 64
- TagPair(SWF::ENABLEDEBUGGER2,ignore),
- TagPair(SWF::SCRIPTLIMITS,ScriptLimitsTag::loader),//65
- TagPair(SWF::SETTABINDEX,SetTabIndexTag::loader),//66
+ {SWF::ENABLEDEBUGGER2,ignore},
+ {SWF::SCRIPTLIMITS,ScriptLimitsTag::loader},//65
+ {SWF::SETTABINDEX,SetTabIndexTag::loader},//66
// TODO: Alexis reference says these are 83,84. The 67,68 comes from
// Tamarin. Figure out which one is correct (possibly both are).
// 67
- TagPair(SWF::DEFINESHAPE4_,DefineShapeTag::loader),
+ {SWF::DEFINESHAPE4_,DefineShapeTag::loader},
// 68
- TagPair(SWF::DEFINEMORPHSHAPE2_,DefineMorphShapeTag::loader),
+ {SWF::DEFINEMORPHSHAPE2_,DefineMorphShapeTag::loader},
// 69
- TagPair(SWF::FILEATTRIBUTES,file_attributes_loader),
+ {SWF::FILEATTRIBUTES,file_attributes_loader},
// 70
- TagPair(SWF::PLACEOBJECT3,PlaceObject2Tag::loader),
+ {SWF::PLACEOBJECT3,PlaceObject2Tag::loader},
// 71
- TagPair(SWF::IMPORTASSETS2,ImportAssetsTag::loader),
+ {SWF::IMPORTASSETS2,ImportAssetsTag::loader},
// 73
- TagPair(SWF::DEFINEALIGNZONES,DefineFontAlignZonesTag::loader),
+ {SWF::DEFINEALIGNZONES,DefineFontAlignZonesTag::loader},
// 74
- TagPair(SWF::CSMTEXTSETTINGS,CSMTextSettingsTag::loader),
+ {SWF::CSMTEXTSETTINGS,CSMTextSettingsTag::loader},
// 75
- TagPair(SWF::DEFINEFONT3,DefineFontTag::loader),
+ {SWF::DEFINEFONT3,DefineFontTag::loader},
// 77
- TagPair(SWF::METADATA,metadata_loader),
+ {SWF::METADATA,metadata_loader},
// 78
- TagPair(SWF::DEFINESCALINGGRID,DefineScalingGridTag::loader),
+ {SWF::DEFINESCALINGGRID,DefineScalingGridTag::loader},
// 83
- TagPair(SWF::DEFINESHAPE4,DefineShapeTag::loader),
+ {SWF::DEFINESHAPE4,DefineShapeTag::loader},
// 84
- TagPair(SWF::DEFINEMORPHSHAPE2,DefineMorphShapeTag::loader),
+ {SWF::DEFINEMORPHSHAPE2,DefineMorphShapeTag::loader},
// 88
- TagPair(SWF::DEFINEFONTNAME,DefineFontNameTag::loader),
+ {SWF::DEFINEFONTNAME,DefineFontNameTag::loader},
// 89
- TagPair(SWF::STARTSOUND2,StartSound2Tag::loader),
+ {SWF::STARTSOUND2,StartSound2Tag::loader},
// 90
- TagPair(SWF::DEFINEBITSJPEG4,DefineBitsTag::loader),
+ {SWF::DEFINEBITSJPEG4,DefineBitsTag::loader},
// 777
- TagPair(SWF::REFLEX,reflex_loader)
+ {SWF::REFLEX,reflex_loader}
#ifdef ENABLE_AVM2
// The following tags are AVM2 only.
// 72 -- AS3 codeblock.
- ,TagPair(SWF::DOABC,DoABCTag::loader),
+ ,{SWF::DOABC,DoABCTag::loader},
// 76
- TagPair(SWF::SYMBOLCLASS,SymbolClassTag::loader),
+ {SWF::SYMBOLCLASS,SymbolClassTag::loader},
// 82
- TagPair(SWF::DOABCDEFINE,DoABCTag::loader),
+ {SWF::DOABCDEFINE,DoABCTag::loader},
// 86
- TagPair(SWF::DEFINESCENEANDFRAMELABELDATA,
- DefineSceneAndFrameLabelDataTag::loader)
+ {SWF::DEFINESCENEANDFRAMELABELDATA,
+ DefineSceneAndFrameLabelDataTag::loader}
#endif
};
http://git.savannah.gnu.org/cgit//commit/?id=3e18b18fea692f52e8c35265e1283501f6ad049d
commit 3e18b18fea692f52e8c35265e1283501f6ad049d
Author: Bastiaan Jacques <address@hidden>
Date: Thu May 29 20:45:37 2014 +0200
Use C++11 initializer syntax instead of Boost Assign.
diff --git a/gui/gui.cpp b/gui/gui.cpp
index a822754..13691a3 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -26,7 +26,6 @@
#include <vector>
#include <algorithm>
-#include <boost/assign/list_of.hpp>
#include "MovieClip.h"
#include "Renderer.h"
@@ -61,7 +60,7 @@
#ifndef DISABLE_REGION_UPDATES_DEBUGGING
// a runtime check would make the { x; } block conditionally executed
-#define IF_DEBUG_REGION_UPDATES(x) { if (_showUpdatedRegions) { x } }
+#define IF_DEBUG_REGION_UPDATES(...) do { if (_showUpdatedRegions) {
__VA_ARGS__; } } while(0);
#else
#define IF_DEBUG_REGION_UPDATES(x)
#endif
@@ -806,18 +805,19 @@ Gui::display(movie_root* m)
float ymin = bounds.getMinY();
float ymax = bounds.getMaxY();
- const std::vector<point> box = boost::assign::list_of
- (point(xmin, ymin))
- (point(xmax, ymin))
- (point(xmax, ymax))
- (point(xmin, ymax));
+ const std::vector<point> box = {
+ point(xmin, ymin),
+ point(xmax, ymin),
+ point(xmax, ymax),
+ point(xmin, ymax)
+ };
_renderer->draw_poly(box, rgba(0,0,0,0), rgba(255,0,0,255),
SWFMatrix(), false);
}
}
- );
+ );
// show frame on screen
renderBuffer();
diff --git a/libbase/NetworkAdapter.cpp b/libbase/NetworkAdapter.cpp
index c71ef31..9da32a6 100644
--- a/libbase/NetworkAdapter.cpp
+++ b/libbase/NetworkAdapter.cpp
@@ -90,8 +90,7 @@ extern "C" {
#include <cstdlib> // std::getenv
#include <mutex>
-#include <boost/version.hpp>
-#include <boost/assign/list_of.hpp>
+#include <boost/format.hpp>
//#define GNASH_CURL_VERBOSE 1
@@ -1381,38 +1380,39 @@ NetworkAdapter::makeStream(const std::string& url,
const std::string& postdata,
const NetworkAdapter::ReservedNames&
NetworkAdapter::reservedNames()
{
- static const ReservedNames names = boost::assign::list_of
- ("Accept-Ranges")
- ("Age")
- ("Allow")
- ("Allowed")
- ("Connection")
- ("Content-Length")
- ("Content-Location")
- ("Content-Range")
- ("ETag")
- ("GET")
- ("Host")
- ("HEAD")
- ("Last-Modified")
- ("Locations")
- ("Max-Forwards")
- ("POST")
- ("Proxy-Authenticate")
- ("Proxy-Authorization")
- ("Public")
- ("Range")
- ("Retry-After")
- ("Server")
- ("TE")
- ("Trailer")
- ("Transfer-Encoding")
- ("Upgrade")
- ("URI")
- ("Vary")
- ("Via")
- ("Warning")
- ("WWW-Authenticate");
+ static const ReservedNames names = {
+ "Accept-Ranges",
+ "Age",
+ "Allow",
+ "Allowed",
+ "Connection",
+ "Content-Length",
+ "Content-Location",
+ "Content-Range",
+ "ETag",
+ "GET",
+ "Host",
+ "HEAD",
+ "Last-Modified",
+ "Locations",
+ "Max-Forwards",
+ "POST",
+ "Proxy-Authenticate",
+ "Proxy-Authorization",
+ "Public",
+ "Range",
+ "Retry-After",
+ "Server",
+ "TE",
+ "Trailer",
+ "Transfer-Encoding",
+ "Upgrade",
+ "URI",
+ "Vary",
+ "Via",
+ "Warning",
+ "WWW-Authenticate"
+ };
return names;
}
diff --git a/libbase/SWFCtype.cpp b/libbase/SWFCtype.cpp
index d4722e1..0783f00 100644
--- a/libbase/SWFCtype.cpp
+++ b/libbase/SWFCtype.cpp
@@ -21,7 +21,6 @@
#include "SWFCtype.h"
#include <locale>
-#include <boost/assign/list_of.hpp>
#include <map>
#include <cstdint>
@@ -177,90 +176,91 @@ namespace {
const CharMap&
upperMap()
{
- static const CharMap upper = boost::assign::map_list_of
- (181, 924)
- (255, 376)
- (305, 73)
- (383, 83)
- (392, 391)
- (396, 395)
- (402, 401)
- (405, 502)
- (409, 408)
- (424, 423)
- (429, 428)
- (432, 431)
- (441, 440)
- (445, 444)
- (447, 503)
- (453, 452)
- (454, 452)
- (456, 455)
- (457, 455)
- (459, 458)
- (460, 458)
- (477, 398)
- (498, 497)
- (499, 497)
- (501, 500)
- (595, 385)
- (596, 390)
- (598, 393)
- (599, 394)
- (601, 399)
- (603, 400)
- (608, 403)
- (611, 404)
- (616, 407)
- (617, 406)
- (623, 412)
- (626, 413)
- (629, 415)
- (640, 422)
- (643, 425)
- (648, 430)
- (650, 433)
- (651, 434)
- (658, 439)
- (837, 921)
- (940, 902)
- (962, 931)
- (972, 908)
- (973, 910)
- (974, 911)
- (976, 914)
- (977, 920)
- (981, 934)
- (982, 928)
- (1008, 922)
- (1009, 929)
- (1010, 931)
- (1013, 917)
- (1224, 1223)
- (1228, 1227)
- (1273, 1272)
- (7835, 7776)
- (8048, 8122)
- (8049, 8123)
- (8054, 8154)
- (8055, 8155)
- (8056, 8184)
- (8057, 8185)
- (8058, 8170)
- (8059, 8171)
- (8060, 8186)
- (8061, 8187)
- (8112, 8120)
- (8113, 8121)
- (8115, 8124)
- (8126, 921)
- (8131, 8140)
- (8144, 8152)
- (8145, 8153)
- (8160, 8168)
- (8161, 8169)
- (8165, 8172)
- (8179, 8188);
+ static const CharMap upper = {
+ {181, 924},
+ {255, 376},
+ {305, 73},
+ {383, 83},
+ {392, 391},
+ {396, 395},
+ {402, 401},
+ {405, 502},
+ {409, 408},
+ {424, 423},
+ {429, 428},
+ {432, 431},
+ {441, 440},
+ {445, 444},
+ {447, 503},
+ {453, 452},
+ {454, 452},
+ {456, 455},
+ {457, 455},
+ {459, 458},
+ {460, 458},
+ {477, 398},
+ {498, 497},
+ {499, 497},
+ {501, 500},
+ {595, 385},
+ {596, 390},
+ {598, 393},
+ {599, 394},
+ {601, 399},
+ {603, 400},
+ {608, 403},
+ {611, 404},
+ {616, 407},
+ {617, 406},
+ {623, 412},
+ {626, 413},
+ {629, 415},
+ {640, 422},
+ {643, 425},
+ {648, 430},
+ {650, 433},
+ {651, 434},
+ {658, 439},
+ {837, 921},
+ {940, 902},
+ {962, 931},
+ {972, 908},
+ {973, 910},
+ {974, 911},
+ {976, 914},
+ {977, 920},
+ {981, 934},
+ {982, 928},
+ {1008, 922},
+ {1009, 929},
+ {1010, 931},
+ {1013, 917},
+ {1224, 1223},
+ {1228, 1227},
+ {1273, 1272},
+ {7835, 7776},
+ {8048, 8122},
+ {8049, 8123},
+ {8054, 8154},
+ {8055, 8155},
+ {8056, 8184},
+ {8057, 8185},
+ {8058, 8170},
+ {8059, 8171},
+ {8060, 8186},
+ {8061, 8187},
+ {8112, 8120},
+ {8113, 8121},
+ {8115, 8124},
+ {8126, 921},
+ {8131, 8140},
+ {8144, 8152},
+ {8145, 8153},
+ {8160, 8168},
+ {8161, 8169},
+ {8165, 8172},
+ {8179, 8188}
+ };
return upper;
}
@@ -268,77 +268,78 @@ upperMap()
const CharMap&
lowerMap()
{
- static const CharMap lower = boost::assign::map_list_of
- (304, 105)
- (376, 255)
- (385, 595)
- (390, 596)
- (391, 392)
- (393, 598)
- (394, 599)
- (395, 396)
- (398, 477)
- (399, 601)
- (400, 603)
- (401, 402)
- (403, 608)
- (404, 611)
- (406, 617)
- (407, 616)
- (408, 409)
- (412, 623)
- (413, 626)
- (415, 629)
- (422, 640)
- (423, 424)
- (425, 643)
- (428, 429)
- (430, 648)
- (431, 432)
- (433, 650)
- (434, 651)
- (439, 658)
- (440, 441)
- (444, 445)
- (452, 454)
- (453, 454)
- (455, 457)
- (456, 457)
- (458, 460)
- (497, 499)
- (502, 405)
- (503, 447)
- (902, 940)
- (908, 972)
- (910, 973)
- (911, 974)
- (1012, 952)
- (1223, 1224)
- (1227, 1228)
- (1272, 1273)
- (8120, 8112)
- (8121, 8113)
- (8122, 8048)
- (8123, 8049)
- (8124, 8115)
- (8140, 8131)
- (8152, 8144)
- (8153, 8145)
- (8154, 8054)
- (8155, 8055)
- (8168, 8160)
- (8169, 8161)
- (8170, 8058)
- (8171, 8059)
- (8172, 8165)
- (8184, 8056)
- (8185, 8057)
- (8186, 8060)
- (8187, 8061)
- (8188, 8179)
- (8486, 969)
- (8490, 107)
- (8491, 229);
+ static const CharMap lower = {
+ {304, 105},
+ {376, 255},
+ {385, 595},
+ {390, 596},
+ {391, 392},
+ {393, 598},
+ {394, 599},
+ {395, 396},
+ {398, 477},
+ {399, 601},
+ {400, 603},
+ {401, 402},
+ {403, 608},
+ {404, 611},
+ {406, 617},
+ {407, 616},
+ {408, 409},
+ {412, 623},
+ {413, 626},
+ {415, 629},
+ {422, 640},
+ {423, 424},
+ {425, 643},
+ {428, 429},
+ {430, 648},
+ {431, 432},
+ {433, 650},
+ {434, 651},
+ {439, 658},
+ {440, 441},
+ {444, 445},
+ {452, 454},
+ {453, 454},
+ {455, 457},
+ {456, 457},
+ {458, 460},
+ {497, 499},
+ {502, 405},
+ {503, 447},
+ {902, 940},
+ {908, 972},
+ {910, 973},
+ {911, 974},
+ {1012, 952},
+ {1223, 1224},
+ {1227, 1228},
+ {1272, 1273},
+ {8120, 8112},
+ {8121, 8113},
+ {8122, 8048},
+ {8123, 8049},
+ {8124, 8115},
+ {8140, 8131},
+ {8152, 8144},
+ {8153, 8145},
+ {8154, 8054},
+ {8155, 8055},
+ {8168, 8160},
+ {8169, 8161},
+ {8170, 8058},
+ {8171, 8059},
+ {8172, 8165},
+ {8184, 8056},
+ {8185, 8057},
+ {8186, 8060},
+ {8187, 8061},
+ {8188, 8179},
+ {8486, 969},
+ {8490, 107},
+ {8491, 229}
+ };
return lower;
}
diff --git a/libcore/DisplayObject.cpp b/libcore/DisplayObject.cpp
index 3da7a4b..b97ad02 100644
--- a/libcore/DisplayObject.cpp
+++ b/libcore/DisplayObject.cpp
@@ -25,7 +25,6 @@
#include "DisplayObject.h"
#include <utility>
-#include <boost/assign/list_of.hpp>
#include <functional>
#include <boost/logic/tribool.hpp>
@@ -1580,22 +1579,23 @@ getBlendModeMap()
{
/// BLENDMODE_UNDEFINED has no matching string in AS. It is included
/// here for logging purposes.
- static const BlendModeMap bm = boost::assign::map_list_of
- (DisplayObject::BLENDMODE_UNDEFINED, "undefined")
- (DisplayObject::BLENDMODE_NORMAL, "normal")
- (DisplayObject::BLENDMODE_LAYER, "layer")
- (DisplayObject::BLENDMODE_MULTIPLY, "multiply")
- (DisplayObject::BLENDMODE_SCREEN, "screen")
- (DisplayObject::BLENDMODE_LIGHTEN, "lighten")
- (DisplayObject::BLENDMODE_DARKEN, "darken")
- (DisplayObject::BLENDMODE_DIFFERENCE, "difference")
- (DisplayObject::BLENDMODE_ADD, "add")
- (DisplayObject::BLENDMODE_SUBTRACT, "subtract")
- (DisplayObject::BLENDMODE_INVERT, "invert")
- (DisplayObject::BLENDMODE_ALPHA, "alpha")
- (DisplayObject::BLENDMODE_ERASE, "erase")
- (DisplayObject::BLENDMODE_OVERLAY, "overlay")
- (DisplayObject::BLENDMODE_HARDLIGHT, "hardlight");
+ static const BlendModeMap bm = {
+ {DisplayObject::BLENDMODE_UNDEFINED, "undefined"},
+ {DisplayObject::BLENDMODE_NORMAL, "normal"},
+ {DisplayObject::BLENDMODE_LAYER, "layer"},
+ {DisplayObject::BLENDMODE_MULTIPLY, "multiply"},
+ {DisplayObject::BLENDMODE_SCREEN, "screen"},
+ {DisplayObject::BLENDMODE_LIGHTEN, "lighten"},
+ {DisplayObject::BLENDMODE_DARKEN, "darken"},
+ {DisplayObject::BLENDMODE_DIFFERENCE, "difference"},
+ {DisplayObject::BLENDMODE_ADD, "add"},
+ {DisplayObject::BLENDMODE_SUBTRACT, "subtract"},
+ {DisplayObject::BLENDMODE_INVERT, "invert"},
+ {DisplayObject::BLENDMODE_ALPHA, "alpha"},
+ {DisplayObject::BLENDMODE_ERASE, "erase"},
+ {DisplayObject::BLENDMODE_OVERLAY, "overlay"},
+ {DisplayObject::BLENDMODE_HARDLIGHT, "hardlight"}
+ };
return bm;
}
diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index f4dab42..95a51fe 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -36,9 +36,7 @@
#include <cctype>
#include <utility>
#include <map>
-#include <boost/assign/list_of.hpp>
#include <functional>
-#include <boost/tuple/tuple.hpp>
#include "utf8.h"
#include "log.h"
@@ -265,9 +263,9 @@ TextField::show_cursor(Renderer& renderer, const SWFMatrix&
mat)
}
}
- const std::vector<point> line = boost::assign::list_of
- (point(x, y))
- (point(x, y + h));
+ const std::vector<point> line = {
+ point(x, y),
+ point(x, y + h)};
renderer.drawLine(line, rgba(0, 0, 0, 255), mat);
}
@@ -310,11 +308,11 @@ TextField::display(Renderer& renderer, const Transform&
base)
std::int32_t ymin = _bounds.get_y_min();
std::int32_t ymax = _bounds.get_y_max();
- const std::vector<point> coords = boost::assign::list_of
- (point(xmin, ymin))
- (point(xmax, ymin))
- (point(xmax, ymax))
- (point(xmin, ymax));
+ const std::vector<point> coords = {
+ point(xmin, ymin),
+ point(xmax, ymin),
+ point(xmax, ymax),
+ point(xmin, ymax)};
rgba borderColor = drawBorder ? getBorderColor() : rgba(0,0,0,0);
rgba backgroundColor = drawBackground ? getBackgroundColor() :
diff --git a/libcore/asobj/Global_as.cpp b/libcore/asobj/Global_as.cpp
index a60bd17..952e6b5 100644
--- a/libcore/asobj/Global_as.cpp
+++ b/libcore/asobj/Global_as.cpp
@@ -28,7 +28,6 @@
#include <limits>
#include <sstream>
#include <boost/lexical_cast.hpp>
-#include <boost/assign/list_of.hpp>
#include "as_object.h"
#include "builtin_function.h"
@@ -344,41 +343,41 @@ avm1Classes()
// Since we maintain separate lists for AVM1 and AVM2, these are all
// considered to be in the 'Global' namespace (AVM1 has no namespaces)
// An ObjectURI constructed without a namespace is in the global namespace.
- static const ClassHierarchy::NativeClasses s = boost::assign::list_of
-
- (N(system_class_init, NSV::CLASS_SYSTEM, 1))
- (N(stage_class_init, NSV::CLASS_STAGE, 1))
- (N(movieclip_class_init, NSV::CLASS_MOVIE_CLIP, 3))
- (N(textfield_class_init, NSV::CLASS_TEXT_FIELD, 3))
- (N(math_class_init, NSV::CLASS_MATH, 4))
- (N(boolean_class_init, NSV::CLASS_BOOLEAN, 5))
- (N(button_class_init, NSV::CLASS_BUTTON, 5))
- (N(color_class_init, NSV::CLASS_COLOR, 5))
- (N(selection_class_init, NSV::CLASS_SELECTION, 5))
- (N(sound_class_init, NSV::CLASS_SOUND, 5))
- (N(xmlsocket_class_init, NSV::CLASS_XMLSOCKET, 5))
- (N(date_class_init, NSV::CLASS_DATE, 5))
- (N(xmlnode_class_init, NSV::CLASS_XMLNODE, 5))
- (N(xml_class_init, NSV::CLASS_XML, 5))
- (N(mouse_class_init, NSV::CLASS_MOUSE, 5))
- (N(number_class_init, NSV::CLASS_NUMBER, 5))
- (N(textformat_class_init, NSV::CLASS_TEXT_FORMAT, 5))
- (N(key_class_init, NSV::CLASS_KEY, 5))
- (N(AsBroadcaster::init, NSV::CLASS_AS_BROADCASTER, 5))
- (N(textsnapshot_class_init, NSV::CLASS_TEXT_SNAPSHOT, 5))
- (N(video_class_init, NSV::CLASS_VIDEO, 6))
- (N(camera_class_init, NSV::CLASS_CAMERA, 5))
- (N(microphone_class_init, NSV::CLASS_MICROPHONE, 5))
- (N(sharedobject_class_init, NSV::CLASS_SHARED_OBJECT, 5))
- (N(loadvars_class_init, NSV::CLASS_LOAD_VARS, 5))
- (N(localconnection_class_init, NSV::CLASS_LOCALCONNECTION, 6))
- (N(netconnection_class_init, NSV::CLASS_NET_CONNECTION, 6))
- (N(netstream_class_init, NSV::CLASS_NET_STREAM, 6))
- (N(contextmenu_class_init, NSV::CLASS_CONTEXTMENU, 5))
- (N(contextmenuitem_class_init, NSV::CLASS_CONTEXTMENUITEM, 5))
- (N(moviecliploader_class_init, NSV::CLASS_MOVIE_CLIP_LOADER, 5))
- (N(Error_class_init, NSV::CLASS_ERROR, 5))
- (N(accessibility_class_init, NSV::CLASS_ACCESSIBILITY, 5));
+ static const ClassHierarchy::NativeClasses s = {
+ N(system_class_init, NSV::CLASS_SYSTEM, 1),
+ N(stage_class_init, NSV::CLASS_STAGE, 1),
+ N(movieclip_class_init, NSV::CLASS_MOVIE_CLIP, 3),
+ N(textfield_class_init, NSV::CLASS_TEXT_FIELD, 3),
+ N(math_class_init, NSV::CLASS_MATH, 4),
+ N(boolean_class_init, NSV::CLASS_BOOLEAN, 5),
+ N(button_class_init, NSV::CLASS_BUTTON, 5),
+ N(color_class_init, NSV::CLASS_COLOR, 5),
+ N(selection_class_init, NSV::CLASS_SELECTION, 5),
+ N(sound_class_init, NSV::CLASS_SOUND, 5),
+ N(xmlsocket_class_init, NSV::CLASS_XMLSOCKET, 5),
+ N(date_class_init, NSV::CLASS_DATE, 5),
+ N(xmlnode_class_init, NSV::CLASS_XMLNODE, 5),
+ N(xml_class_init, NSV::CLASS_XML, 5),
+ N(mouse_class_init, NSV::CLASS_MOUSE, 5),
+ N(number_class_init, NSV::CLASS_NUMBER, 5),
+ N(textformat_class_init, NSV::CLASS_TEXT_FORMAT, 5),
+ N(key_class_init, NSV::CLASS_KEY, 5),
+ N(AsBroadcaster::init, NSV::CLASS_AS_BROADCASTER, 5),
+ N(textsnapshot_class_init, NSV::CLASS_TEXT_SNAPSHOT, 5),
+ N(video_class_init, NSV::CLASS_VIDEO, 6),
+ N(camera_class_init, NSV::CLASS_CAMERA, 5),
+ N(microphone_class_init, NSV::CLASS_MICROPHONE, 5),
+ N(sharedobject_class_init, NSV::CLASS_SHARED_OBJECT, 5),
+ N(loadvars_class_init, NSV::CLASS_LOAD_VARS, 5),
+ N(localconnection_class_init, NSV::CLASS_LOCALCONNECTION, 6),
+ N(netconnection_class_init, NSV::CLASS_NET_CONNECTION, 6),
+ N(netstream_class_init, NSV::CLASS_NET_STREAM, 6),
+ N(contextmenu_class_init, NSV::CLASS_CONTEXTMENU, 5),
+ N(contextmenuitem_class_init, NSV::CLASS_CONTEXTMENUITEM, 5),
+ N(moviecliploader_class_init, NSV::CLASS_MOVIE_CLIP_LOADER, 5),
+ N(Error_class_init, NSV::CLASS_ERROR, 5),
+ N(accessibility_class_init, NSV::CLASS_ACCESSIBILITY, 5)
+ };
return s;
}
diff --git a/libcore/asobj/LocalConnection_as.cpp
b/libcore/asobj/LocalConnection_as.cpp
index 578475a..f2d4608 100644
--- a/libcore/asobj/LocalConnection_as.cpp
+++ b/libcore/asobj/LocalConnection_as.cpp
@@ -22,7 +22,6 @@
#include <cerrno>
#include <cstring>
#include <cstdint> // for boost::?int??_t
-#include <boost/assign/list_of.hpp>
#include <functional>
#include "GnashSystemIOHeaders.h"
@@ -659,13 +658,13 @@ validFunctionName(const std::string& func)
typedef std::vector<std::string> ReservedNames;
- static const ReservedNames reserved = boost::assign::list_of
- ("send")
- ("onStatus")
- ("close")
- ("connect")
- ("domain")
- ("allowDomain");
+ static const ReservedNames reserved = {
+ "send",
+ "onStatus",
+ "close",
+ "connect",
+ "domain",
+ "allowDomain"};
const ReservedNames::const_iterator it =
std::find_if(reserved.begin(), reserved.end(),
diff --git a/libcore/asobj/XML_as.cpp b/libcore/asobj/XML_as.cpp
index a60c3bd..1bc12d8 100644
--- a/libcore/asobj/XML_as.cpp
+++ b/libcore/asobj/XML_as.cpp
@@ -23,7 +23,6 @@
#include <sstream>
#include <vector>
#include <algorithm>
-#include <boost/assign/list_of.hpp>
#include <boost/algorithm/string/compare.hpp>
#include <boost/algorithm/string/replace.hpp>
@@ -940,12 +939,13 @@ setIdMap(as_object& xml, XMLNode_as& childNode, const
std::string& val)
const Entities&
getEntities()
{
- static const Entities entities = boost::assign::map_list_of
- ("&", "&")
- (""", "\"")
- ("<", "<")
- (">", ">")
- ("'", "'");
+ static const Entities entities = {
+ {"&", "&"},
+ {""", "\""},
+ {"<", "<"},
+ {">", ">"},
+ {"'", "'"}
+ };
return entities;
}
diff --git a/libcore/event_id.cpp b/libcore/event_id.cpp
index e2c6b0c..78f1757 100644
--- a/libcore/event_id.cpp
+++ b/libcore/event_id.cpp
@@ -29,7 +29,6 @@
#include <algorithm>
#include <boost/format.hpp>
#include <cassert>
-#include <boost/assign/list_of.hpp>
namespace gnash {
@@ -37,27 +36,28 @@ const std::string&
event_id::functionName() const
{
typedef std::map<EventCode, std::string> EventFunctionNameMap;
- static const EventFunctionNameMap e = boost::assign::map_list_of
- (INVALID, "INVALID")
- (PRESS, "onPress")
- (RELEASE, "onRelease")
- (RELEASE_OUTSIDE, "onReleaseOutside")
- (ROLL_OVER, "onRollOver")
- (ROLL_OUT, "onRollOut")
- (DRAG_OVER, "onDragOver")
- (DRAG_OUT, "onDragOut")
- (KEY_PRESS, "onKeyPress")
- (INITIALIZE, "onInitialize")
- (LOAD, "onLoad")
- (UNLOAD, "onUnload")
- (ENTER_FRAME, "onEnterFrame")
- (MOUSE_DOWN, "onMouseDown")
- (MOUSE_UP, "onMouseUp")
- (MOUSE_MOVE, "onMouseMove")
- (KEY_DOWN, "onKeyDown")
- (KEY_UP, "onKeyUp")
- (DATA, "onData")
- (CONSTRUCT, "onConstruct");
+ static const EventFunctionNameMap e = {
+ {INVALID, "INVALID"},
+ {PRESS, "onPress"},
+ {RELEASE, "onRelease"},
+ {RELEASE_OUTSIDE, "onReleaseOutside"},
+ {ROLL_OVER, "onRollOver"},
+ {ROLL_OUT, "onRollOut"},
+ {DRAG_OVER, "onDragOver"},
+ {DRAG_OUT, "onDragOut"},
+ {KEY_PRESS, "onKeyPress"},
+ {INITIALIZE, "onInitialize"},
+ {LOAD, "onLoad"},
+ {UNLOAD, "onUnload"},
+ {ENTER_FRAME, "onEnterFrame"},
+ {MOUSE_DOWN, "onMouseDown"},
+ {MOUSE_UP, "onMouseUp"},
+ {MOUSE_MOVE, "onMouseMove"},
+ {KEY_DOWN, "onKeyDown"},
+ {KEY_UP, "onKeyUp"},
+ {DATA, "onData"},
+ {CONSTRUCT, "onConstruct"}
+ };
EventFunctionNameMap::const_iterator it = e.find(_id);
assert(it != e.end());
@@ -73,26 +73,27 @@ event_id::functionURI() const
// it contains string_table-dependent
// mutable entries
//
- static const EventFunctionMap e = boost::assign::map_list_of
- (PRESS, NSV::PROP_ON_PRESS)
- (RELEASE, NSV::PROP_ON_RELEASE)
- (RELEASE_OUTSIDE, NSV::PROP_ON_RELEASE_OUTSIDE)
- (ROLL_OVER, NSV::PROP_ON_ROLL_OVER )
- (ROLL_OUT, NSV::PROP_ON_ROLL_OUT)
- (DRAG_OVER, NSV::PROP_ON_DRAG_OVER)
- (DRAG_OUT, NSV::PROP_ON_DRAG_OUT)
- (KEY_PRESS, NSV::PROP_ON_KEY_PRESS)
- (INITIALIZE, NSV::PROP_ON_INITIALIZE)
- (LOAD, NSV::PROP_ON_LOAD)
- (UNLOAD, NSV::PROP_ON_UNLOAD)
- (ENTER_FRAME, NSV::PROP_ON_ENTER_FRAME)
- (MOUSE_DOWN, NSV::PROP_ON_MOUSE_DOWN)
- (MOUSE_UP, NSV::PROP_ON_MOUSE_UP)
- (MOUSE_MOVE, NSV::PROP_ON_MOUSE_MOVE)
- (KEY_DOWN, NSV::PROP_ON_KEY_DOWN)
- (KEY_UP, NSV::PROP_ON_KEY_UP)
- (DATA, NSV::PROP_ON_DATA)
- (CONSTRUCT, NSV::PROP_ON_CONSTRUCT);
+ static const EventFunctionMap e = {
+ {PRESS, NSV::PROP_ON_PRESS},
+ {RELEASE, NSV::PROP_ON_RELEASE},
+ {RELEASE_OUTSIDE, NSV::PROP_ON_RELEASE_OUTSIDE},
+ {ROLL_OVER, NSV::PROP_ON_ROLL_OVER },
+ {ROLL_OUT, NSV::PROP_ON_ROLL_OUT},
+ {DRAG_OVER, NSV::PROP_ON_DRAG_OVER},
+ {DRAG_OUT, NSV::PROP_ON_DRAG_OUT},
+ {KEY_PRESS, NSV::PROP_ON_KEY_PRESS},
+ {INITIALIZE, NSV::PROP_ON_INITIALIZE},
+ {LOAD, NSV::PROP_ON_LOAD},
+ {UNLOAD, NSV::PROP_ON_UNLOAD},
+ {ENTER_FRAME, NSV::PROP_ON_ENTER_FRAME},
+ {MOUSE_DOWN, NSV::PROP_ON_MOUSE_DOWN},
+ {MOUSE_UP, NSV::PROP_ON_MOUSE_UP},
+ {MOUSE_MOVE, NSV::PROP_ON_MOUSE_MOVE},
+ {KEY_DOWN, NSV::PROP_ON_KEY_DOWN},
+ {KEY_UP, NSV::PROP_ON_KEY_UP},
+ {DATA, NSV::PROP_ON_DATA},
+ {CONSTRUCT, NSV::PROP_ON_CONSTRUCT}
+ };
EventFunctionMap::const_iterator it = e.find(_id);
assert(it != e.end());
diff --git a/libcore/swf/DefaultTagLoaders.cpp
b/libcore/swf/DefaultTagLoaders.cpp
index da5e6f6..71fd14e 100644
--- a/libcore/swf/DefaultTagLoaders.cpp
+++ b/libcore/swf/DefaultTagLoaders.cpp
@@ -112,136 +112,136 @@ addDefaultLoaders(TagLoadersTable& table)
// expected not to be used. They are generally documented
// by Alexis to exist (without any known structure), but not
// by Adobe.
- const std::vector<TagPair> tags = boost::assign::list_of
+ const std::vector<TagPair> tags = {
// 01: nothing to do for an end tag.
- (TagPair(SWF::END, ignore))
+ TagPair(SWF::END,ignore),
// 02
- (TagPair(SWF::DEFINESHAPE, DefineShapeTag::loader))
+ TagPair(SWF::DEFINESHAPE,DefineShapeTag::loader),
// 03
- (TagPair(SWF::FREECHARACTER, unexpected))
- (TagPair(SWF::PLACEOBJECT, PlaceObject2Tag::loader))
- (TagPair(SWF::REMOVEOBJECT, RemoveObjectTag::loader)) // 05
- (TagPair(SWF::DEFINEBITS, DefineBitsTag::loader))
- (TagPair(SWF::DEFINEBUTTON, DefineButtonTag::loader))
- (TagPair(SWF::JPEGTABLES, jpeg_tables_loader))
- (TagPair(SWF::SETBACKGROUNDCOLOR, SetBackgroundColorTag::loader))
- (TagPair(SWF::DEFINEFONT, DefineFontTag::loader))
- (TagPair(SWF::DEFINETEXT, DefineTextTag::loader))
- (TagPair(SWF::DOACTION, DoActionTag::loader))
- (TagPair(SWF::DEFINEFONTINFO, DefineFontInfoTag::loader))
- (TagPair(SWF::DEFINESOUND, define_sound_loader))
- (TagPair(SWF::STARTSOUND, StartSoundTag::loader))
- (TagPair(SWF::STOPSOUND, unexpected)) // 16
+ TagPair(SWF::FREECHARACTER,unexpected),
+ TagPair(SWF::PLACEOBJECT,PlaceObject2Tag::loader),
+ TagPair(SWF::REMOVEOBJECT,RemoveObjectTag::loader),// 05
+ TagPair(SWF::DEFINEBITS,DefineBitsTag::loader),
+ TagPair(SWF::DEFINEBUTTON,DefineButtonTag::loader),
+ TagPair(SWF::JPEGTABLES,jpeg_tables_loader),
+ TagPair(SWF::SETBACKGROUNDCOLOR,SetBackgroundColorTag::loader),
+ TagPair(SWF::DEFINEFONT,DefineFontTag::loader),
+ TagPair(SWF::DEFINETEXT,DefineTextTag::loader),
+ TagPair(SWF::DOACTION,DoActionTag::loader),
+ TagPair(SWF::DEFINEFONTINFO,DefineFontInfoTag::loader),
+ TagPair(SWF::DEFINESOUND,define_sound_loader),
+ TagPair(SWF::STARTSOUND,StartSoundTag::loader),
+ TagPair(SWF::STOPSOUND,unexpected),// 16
// 17
- (TagPair(SWF::DEFINEBUTTONSOUND, DefineButtonSoundTag::loader))
+ TagPair(SWF::DEFINEBUTTONSOUND,DefineButtonSoundTag::loader),
// 18
- (TagPair(SWF::SOUNDSTREAMHEAD, SoundStreamHeadTag::loader))
+ TagPair(SWF::SOUNDSTREAMHEAD,SoundStreamHeadTag::loader),
// 19
- (TagPair(SWF::SOUNDSTREAMBLOCK, StreamSoundBlockTag::loader))
- (TagPair(SWF::DEFINELOSSLESS, DefineBitsTag::loader))
- (TagPair(SWF::DEFINEBITSJPEG2, DefineBitsTag::loader))
- (TagPair(SWF::DEFINESHAPE2, DefineShapeTag::loader))
- (TagPair(SWF::DEFINEBUTTONCXFORM, DefineButtonCxformTag::loader)) // 23
- (TagPair(SWF::PROTECT, ignore))
- (TagPair(SWF::PATHSAREPOSTSCRIPT, unexpected)) // 25
- (TagPair(SWF::PLACEOBJECT2, PlaceObject2Tag::loader))
+ TagPair(SWF::SOUNDSTREAMBLOCK,StreamSoundBlockTag::loader),
+ TagPair(SWF::DEFINELOSSLESS,DefineBitsTag::loader),
+ TagPair(SWF::DEFINEBITSJPEG2,DefineBitsTag::loader),
+ TagPair(SWF::DEFINESHAPE2,DefineShapeTag::loader),
+ TagPair(SWF::DEFINEBUTTONCXFORM,DefineButtonCxformTag::loader),// 23
+ TagPair(SWF::PROTECT,ignore),
+ TagPair(SWF::PATHSAREPOSTSCRIPT,unexpected),// 25
+ TagPair(SWF::PLACEOBJECT2,PlaceObject2Tag::loader),
// 28
- (TagPair(SWF::REMOVEOBJECT2, RemoveObjectTag::loader))
- (TagPair(SWF::SYNCFRAME, unexpected)) // 29
- (TagPair(SWF::FREEALL, unexpected)) // 31
- (TagPair(SWF::DEFINESHAPE3, DefineShapeTag::loader))
- (TagPair(SWF::DEFINETEXT2, DefineText2Tag::loader))
+ TagPair(SWF::REMOVEOBJECT2,RemoveObjectTag::loader),
+ TagPair(SWF::SYNCFRAME,unexpected),// 29
+ TagPair(SWF::FREEALL,unexpected),// 31
+ TagPair(SWF::DEFINESHAPE3,DefineShapeTag::loader),
+ TagPair(SWF::DEFINETEXT2,DefineText2Tag::loader),
// 37
- (TagPair(SWF::DEFINEBUTTON2, DefineButton2Tag::loader))
- (TagPair(SWF::DEFINEBITSJPEG3, DefineBitsTag::loader))
- (TagPair(SWF::DEFINELOSSLESS2, DefineBitsTag::loader))
- (TagPair(SWF::DEFINEEDITTEXT, DefineEditTextTag::loader))
- (TagPair(SWF::DEFINEVIDEO, unexpected)) // 38
- (TagPair(SWF::DEFINESPRITE, sprite_loader))
- (TagPair(SWF::NAMECHARACTER, unexpected)) // 40
- (TagPair(SWF::SERIALNUMBER, serialnumber_loader)) // 41
- (TagPair(SWF::DEFINETEXTFORMAT, unexpected)) // 42
- (TagPair(SWF::FRAMELABEL, frame_label_loader)) // 43
- (TagPair(SWF::DEFINEBEHAVIOR, unexpected)) // 44
+ TagPair(SWF::DEFINEBUTTON2,DefineButton2Tag::loader),
+ TagPair(SWF::DEFINEBITSJPEG3,DefineBitsTag::loader),
+ TagPair(SWF::DEFINELOSSLESS2,DefineBitsTag::loader),
+ TagPair(SWF::DEFINEEDITTEXT,DefineEditTextTag::loader),
+ TagPair(SWF::DEFINEVIDEO,unexpected),// 38
+ TagPair(SWF::DEFINESPRITE,sprite_loader),
+ TagPair(SWF::NAMECHARACTER,unexpected),// 40
+ TagPair(SWF::SERIALNUMBER,serialnumber_loader),// 41
+ TagPair(SWF::DEFINETEXTFORMAT,unexpected),// 42
+ TagPair(SWF::FRAMELABEL,frame_label_loader),// 43
+ TagPair(SWF::DEFINEBEHAVIOR,unexpected),// 44
// 45
- (TagPair(SWF::SOUNDSTREAMHEAD2, SoundStreamHeadTag::loader))
+ TagPair(SWF::SOUNDSTREAMHEAD2,SoundStreamHeadTag::loader),
// 46
- (TagPair(SWF::DEFINEMORPHSHAPE, DefineMorphShapeTag::loader))
+ TagPair(SWF::DEFINEMORPHSHAPE,DefineMorphShapeTag::loader),
// 47
- (TagPair(SWF::FRAMETAG, unexpected))
+ TagPair(SWF::FRAMETAG,unexpected),
// 48
- (TagPair(SWF::DEFINEFONT2, DefineFontTag::loader))
- (TagPair(SWF::GENCOMMAND, unexpected)) // 49
- (TagPair(SWF::DEFINECOMMANDOBJ, unexpected)) // 50
- (TagPair(SWF::CHARACTERSET, unexpected)) // 51
- (TagPair(SWF::FONTREF, unexpected)) // 52
- (TagPair(SWF::DEFINEFUNCTION, unexpected)) // 53
- (TagPair(SWF::PLACEFUNCTION, unexpected)) // 54
- (TagPair(SWF::GENTAGOBJECT, unexpected)) // 55
- (TagPair(SWF::EXPORTASSETS, ExportAssetsTag::loader)) // 56
- (TagPair(SWF::IMPORTASSETS, ImportAssetsTag::loader)) // 57
- (TagPair(SWF::ENABLEDEBUGGER, ignore)) // 58
+ TagPair(SWF::DEFINEFONT2,DefineFontTag::loader),
+ TagPair(SWF::GENCOMMAND,unexpected),// 49
+ TagPair(SWF::DEFINECOMMANDOBJ,unexpected),// 50
+ TagPair(SWF::CHARACTERSET,unexpected),// 51
+ TagPair(SWF::FONTREF,unexpected),// 52
+ TagPair(SWF::DEFINEFUNCTION,unexpected),// 53
+ TagPair(SWF::PLACEFUNCTION,unexpected),// 54
+ TagPair(SWF::GENTAGOBJECT,unexpected),// 55
+ TagPair(SWF::EXPORTASSETS,ExportAssetsTag::loader),// 56
+ TagPair(SWF::IMPORTASSETS,ImportAssetsTag::loader),// 57
+ TagPair(SWF::ENABLEDEBUGGER,ignore), // 58
// 59
- (TagPair(SWF::INITACTION, DoInitActionTag::loader))
+ TagPair(SWF::INITACTION,DoInitActionTag::loader),
// 60
- (TagPair(SWF::DEFINEVIDEOSTREAM, DefineVideoStreamTag::loader))
+ TagPair(SWF::DEFINEVIDEOSTREAM,DefineVideoStreamTag::loader),
// 61
- (TagPair(SWF::VIDEOFRAME, VideoFrameTag::loader))
+ TagPair(SWF::VIDEOFRAME,VideoFrameTag::loader),
// 62
- (TagPair(SWF::DEFINEFONTINFO2, DefineFontInfoTag::loader))
+ TagPair(SWF::DEFINEFONTINFO2,DefineFontInfoTag::loader),
// 63
- (TagPair(SWF::DEBUGID, ignore))
+ TagPair(SWF::DEBUGID,ignore),
// 64
- (TagPair(SWF::ENABLEDEBUGGER2, ignore))
- (TagPair(SWF::SCRIPTLIMITS, ScriptLimitsTag::loader)) //65
- (TagPair(SWF::SETTABINDEX, SetTabIndexTag::loader)) //66
- // TODO: Alexis reference says these are 83, 84. The 67, 68 comes from
+ TagPair(SWF::ENABLEDEBUGGER2,ignore),
+ TagPair(SWF::SCRIPTLIMITS,ScriptLimitsTag::loader),//65
+ TagPair(SWF::SETTABINDEX,SetTabIndexTag::loader),//66
+ // TODO: Alexis reference says these are 83,84. The 67,68 comes from
// Tamarin. Figure out which one is correct (possibly both are).
// 67
- (TagPair(SWF::DEFINESHAPE4_, DefineShapeTag::loader))
+ TagPair(SWF::DEFINESHAPE4_,DefineShapeTag::loader),
// 68
- (TagPair(SWF::DEFINEMORPHSHAPE2_, DefineMorphShapeTag::loader))
+ TagPair(SWF::DEFINEMORPHSHAPE2_,DefineMorphShapeTag::loader),
// 69
- (TagPair(SWF::FILEATTRIBUTES, file_attributes_loader))
+ TagPair(SWF::FILEATTRIBUTES,file_attributes_loader),
// 70
- (TagPair(SWF::PLACEOBJECT3, PlaceObject2Tag::loader))
+ TagPair(SWF::PLACEOBJECT3,PlaceObject2Tag::loader),
// 71
- (TagPair(SWF::IMPORTASSETS2, ImportAssetsTag::loader))
+ TagPair(SWF::IMPORTASSETS2,ImportAssetsTag::loader),
// 73
- (TagPair(SWF::DEFINEALIGNZONES, DefineFontAlignZonesTag::loader))
+ TagPair(SWF::DEFINEALIGNZONES,DefineFontAlignZonesTag::loader),
// 74
- (TagPair(SWF::CSMTEXTSETTINGS, CSMTextSettingsTag::loader))
+ TagPair(SWF::CSMTEXTSETTINGS,CSMTextSettingsTag::loader),
// 75
- (TagPair(SWF::DEFINEFONT3, DefineFontTag::loader))
+ TagPair(SWF::DEFINEFONT3,DefineFontTag::loader),
// 77
- (TagPair(SWF::METADATA, metadata_loader))
+ TagPair(SWF::METADATA,metadata_loader),
// 78
- (TagPair(SWF::DEFINESCALINGGRID, DefineScalingGridTag::loader))
+ TagPair(SWF::DEFINESCALINGGRID,DefineScalingGridTag::loader),
// 83
- (TagPair(SWF::DEFINESHAPE4, DefineShapeTag::loader))
+ TagPair(SWF::DEFINESHAPE4,DefineShapeTag::loader),
// 84
- (TagPair(SWF::DEFINEMORPHSHAPE2, DefineMorphShapeTag::loader))
+ TagPair(SWF::DEFINEMORPHSHAPE2,DefineMorphShapeTag::loader),
// 88
- (TagPair(SWF::DEFINEFONTNAME, DefineFontNameTag::loader))
+ TagPair(SWF::DEFINEFONTNAME,DefineFontNameTag::loader),
// 89
- (TagPair(SWF::STARTSOUND2, StartSound2Tag::loader))
+ TagPair(SWF::STARTSOUND2,StartSound2Tag::loader),
// 90
- (TagPair(SWF::DEFINEBITSJPEG4, DefineBitsTag::loader))
+ TagPair(SWF::DEFINEBITSJPEG4,DefineBitsTag::loader),
// 777
- (TagPair(SWF::REFLEX, reflex_loader))
+ TagPair(SWF::REFLEX,reflex_loader)
#ifdef ENABLE_AVM2
// The following tags are AVM2 only.
// 72 -- AS3 codeblock.
- (TagPair(SWF::DOABC, DoABCTag::loader))
+ ,TagPair(SWF::DOABC,DoABCTag::loader),
// 76
- (TagPair(SWF::SYMBOLCLASS, SymbolClassTag::loader))
+ TagPair(SWF::SYMBOLCLASS,SymbolClassTag::loader),
// 82
- (TagPair(SWF::DOABCDEFINE, DoABCTag::loader))
+ TagPair(SWF::DOABCDEFINE,DoABCTag::loader),
// 86
- (TagPair(SWF::DEFINESCENEANDFRAMELABELDATA,
- DefineSceneAndFrameLabelDataTag::loader))
+ TagPair(SWF::DEFINESCENEANDFRAMELABELDATA,
+ DefineSceneAndFrameLabelDataTag::loader)
#endif
- ;
+ };
std::for_each(tags.begin(), tags.end(), AddLoader(table));
diff --git a/libcore/swf/TextRecord.cpp b/libcore/swf/TextRecord.cpp
index cf67b01..0999498 100644
--- a/libcore/swf/TextRecord.cpp
+++ b/libcore/swf/TextRecord.cpp
@@ -18,7 +18,6 @@
#include "TextRecord.h"
-#include <boost/assign/list_of.hpp>
#include <vector>
#include "TypesParser.h"
@@ -248,12 +247,13 @@ TextRecord::displayRecords(Renderer& renderer, const
Transform& xform,
// square is not hard-coded anymore but can be
// queried from the font class
//
- static const std::vector<point> emptyCharBox =
- boost::assign::list_of (point(32, 32))
- (point(480, 32))
- (point(480, -656))
- (point(32, -656))
- (point(32,32));
+ static const std::vector<point> emptyCharBox = {
+ point(32, 32),
+ point(480, 32),
+ point(480, -656),
+ point(32, -656),
+ point(32,32)
+ };
renderer.drawLine(emptyCharBox, textColor, m);
#endif
@@ -284,9 +284,10 @@ TextRecord::displayRecords(Renderer& renderer, const
Transform& xform,
// 1/4 the EM square offset far from baseline
std::int16_t posY = int(y+int((unitsPerEM/4)*scale));
- const std::vector<point> underline = boost::assign::list_of
- (point(startX, posY))
- (point(endX, posY));
+ const std::vector<point> underline = {
+ point(startX, posY),
+ point(endX, posY)
+ };
renderer.drawLine(underline, textColor, mat);
}
-----------------------------------------------------------------------
Summary of changes:
gui/gui.cpp | 16 +-
gui/qt/Qt4Gui.cpp | 65 ++++----
libbase/NetworkAdapter.cpp | 68 ++++----
libbase/SWFCtype.cpp | 313 +++++++++++++++++-----------------
libcore/DisplayObject.cpp | 34 ++--
libcore/TextField.cpp | 18 +-
libcore/asobj/Global_as.cpp | 71 ++++----
libcore/asobj/LocalConnection_as.cpp | 15 +-
libcore/asobj/XML_as.cpp | 14 +-
libcore/event_id.cpp | 85 +++++-----
libcore/swf/DefaultTagLoaders.cpp | 177 ++++++++++----------
libcore/swf/TextRecord.cpp | 21 ++-
12 files changed, 447 insertions(+), 450 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2088-g3ff2c45,
Bastiaan Jacques <=