[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/font.cpp server/font.h s...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/font.cpp server/font.h s... |
|
Date: |
Wed, 21 Feb 2007 11:35:51 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/02/21 11:35:51
Modified files:
. : ChangeLog
server : font.cpp font.h impl.cpp
server/swf : tag_loaders.cpp tag_loaders.h
Log message:
* server/font.{cpp,h}, server/impl.cpp,
server/swf/tag_loaders.{cpp,h}:
Add support for DEFINEFONT3 tag (not much done,
as Alexis report it to be equal to DEFINEFONT2
in definition - needs support of DEFINEALIGNZONES
tag to be fully supported.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2419&r2=1.2420
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.14&r2=1.15
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2419
retrieving revision 1.2420
diff -u -b -r1.2419 -r1.2420
--- ChangeLog 21 Feb 2007 10:58:56 -0000 1.2419
+++ ChangeLog 21 Feb 2007 11:35:51 -0000 1.2420
@@ -1,5 +1,14 @@
2007-02-21 Sandro Santilli <address@hidden>
+ * server/font.{cpp,h}, server/impl.cpp,
+ server/swf/tag_loaders.{cpp,h}:
+ Add support for DEFINEFONT3 tag (not much done,
+ as Alexis report it to be equal to DEFINEFONT2
+ in definition - needs support of DEFINEALIGNZONES
+ tag to be fully supported.
+
+2007-02-21 Sandro Santilli <address@hidden>
+
* testsuite/misc-ming.all/: Makefile.am, gotoFrame2Test.as:
Stubbed Udo's test as Ming source and build rule and test runner.
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/font.cpp 13 Dec 2006 10:30:49 -0000 1.25
+++ server/font.cpp 21 Feb 2007 11:35:51 -0000 1.26
@@ -112,8 +112,8 @@
}
else
{
- assert (tag == SWF::DEFINEFONT2);
- readDefineFont2(in, m);
+ assert (tag == SWF::DEFINEFONT2 || tag ==
SWF::DEFINEFONT3);
+ readDefineFont2_or_3(in, m);
}
}
@@ -167,11 +167,11 @@
}
}
- // Read a DefineFont2 tag
- void font::readDefineFont2(stream* in, movie_definition* m)
+ // Read a DefineFont2 or DefineFont3 tag
+ void font::readDefineFont2_or_3(stream* in, movie_definition* m)
{
IF_VERBOSE_PARSE (
- log_parse("reading DefineFont2");
+ log_parse("reading DefineFont2 or DefineFont3");
);
bool has_layout = (in->read_uint(1) != 0);
Index: server/font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/font.h 15 Jan 2007 20:28:48 -0000 1.19
+++ server/font.h 21 Feb 2007 11:35:51 -0000 1.20
@@ -99,8 +99,8 @@
}
/// \brief
- /// A 'font' definition as read from SWF::DefineFont or
- /// SWF::DefineFont2 tags.
+ /// A 'font' definition as read from SWF::DefineFont,
+ /// SWF::DefineFont2 or SWF::DefineFont3 tags.
/// Includes definitions from SWF::DefineFontInfo tags
///
class font : public resource
@@ -186,8 +186,8 @@
private:
void read_code_table(stream* in);
- /// Read a DefineFont2 tag
- void readDefineFont2(stream* in, movie_definition* m);
+ /// Read a DefineFont2 or DefineFont3 tag
+ void readDefineFont2_or_3(stream* in, movie_definition* m);
// Read a DefineFont tag
void readDefineFont(stream* in, movie_definition* m);
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/impl.cpp 14 Feb 2007 22:48:55 -0000 1.94
+++ server/impl.cpp 21 Feb 2007 11:35:51 -0000 1.95
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: impl.cpp,v 1.94 2007/02/14 22:48:55 strk Exp $ */
+/* $Id: impl.cpp,v 1.95 2007/02/21 11:35:51 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -189,7 +189,7 @@
register_tag_loader(SWF::SOUNDSTREAMHEAD2, sound_stream_head_loader);
// 45
register_tag_loader(SWF::DEFINEMORPHSHAPE, define_shape_morph_loader);
register_tag_loader(SWF::FRAMETAG, fixme_loader); // 47
- register_tag_loader(SWF::DEFINEFONT2, define_font_loader);
+ register_tag_loader(SWF::DEFINEFONT2, define_font_loader); // 48
register_tag_loader(SWF::GENCOMMAND, fixme_loader); // 49
register_tag_loader(SWF::DEFINECOMMANDOBJ, fixme_loader); // 50
register_tag_loader(SWF::CHARACTERSET, fixme_loader); // 51
@@ -219,7 +219,7 @@
register_tag_loader(SWF::IMPORTASSETS2, fixme_loader); // 71
register_tag_loader(SWF::DEFINEALIGNZONES, fixme_loader); // 73
register_tag_loader(SWF::CSMTEXTSETTINGS, fixme_loader); // 74
- register_tag_loader(SWF::DEFINEFONT3, fixme_loader); // 75
+ register_tag_loader(SWF::DEFINEFONT3, define_font_loader); // 75
register_tag_loader(SWF::METADATA, metadata_loader); // 77
register_tag_loader(SWF::DEFINESCALINGGRID, fixme_loader); // 78
register_tag_loader(SWF::DEFINESHAPE4, fixme_loader); // 83
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/swf/tag_loaders.cpp 14 Feb 2007 22:48:55 -0000 1.75
+++ server/swf/tag_loaders.cpp 21 Feb 2007 11:35:51 -0000 1.76
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: tag_loaders.cpp,v 1.75 2007/02/14 22:48:55 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.76 2007/02/21 11:35:51 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -707,7 +707,7 @@
void define_font_loader(stream* in, tag_type tag, movie_definition* m)
// Load a DefineFont or DefineFont2 tag.
{
- assert(tag == SWF::DEFINEFONT || tag == SWF::DEFINEFONT2); // 10 || 48
+ assert(tag == SWF::DEFINEFONT || tag == SWF::DEFINEFONT2 || tag ==
SWF::DEFINEFONT3 ); // 10 || 48 || 75
uint16_t font_id = in->read_u16();
Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/swf/tag_loaders.h 14 Feb 2007 22:48:55 -0000 1.14
+++ server/swf/tag_loaders.h 21 Feb 2007 11:35:51 -0000 1.15
@@ -18,7 +18,7 @@
//
//
-/* $Id: tag_loaders.h,v 1.14 2007/02/14 22:48:55 strk Exp $ */
+/* $Id: tag_loaders.h,v 1.15 2007/02/21 11:35:51 strk Exp $ */
#ifndef GNASH_SWF_TAG_LOADERS_H
#define GNASH_SWF_TAG_LOADERS_H
@@ -71,6 +71,10 @@
void define_shape_morph_loader(stream*, tag_type, movie_definition*);
+/// SWF Tags DefineFont (10), DefineFont2 (48) and DefineFont3 (75)
+//
+/// Load a font and adds it the the movie definition.
+///
void define_font_loader(stream*, tag_type, movie_definition*);
/// SWF Tag DefineFontInfo (13 or 62)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/font.cpp server/font.h s...,
Sandro Santilli <=