[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: |
Thu, 29 May 2008 08:45:56 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/05/29 08:45:56
Modified files:
. : ChangeLog
server : font.cpp font.h
server/parser : movie_def_impl.cpp movie_def_impl.h
Log message:
* server/font.{cpp,h}: drop reference to "owning movie"
* server/parser/movie_def_impl.{cpp,h}: drop unused
get_owned_fonts.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6753&r2=1.6754
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.76&r2=1.77
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6753
retrieving revision 1.6754
diff -u -b -r1.6753 -r1.6754
--- ChangeLog 29 May 2008 06:21:31 -0000 1.6753
+++ ChangeLog 29 May 2008 08:45:55 -0000 1.6754
@@ -1,3 +1,9 @@
+2008-05-29 Sandro Santilli <address@hidden>
+
+ * server/font.{cpp,h}: drop reference to "owning movie"
+ * server/parser/movie_def_impl.{cpp,h}: drop unused
+ get_owned_fonts.
+
2008-05-29 Bastiaan Jacques <address@hidden>
* backend/render_handler{.h,_agg.cpp,_ogl.cpp,_cairo.cpp}: Replace the
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/font.cpp 18 May 2008 20:36:12 -0000 1.66
+++ server/font.cpp 29 May 2008 08:45:56 -0000 1.67
@@ -65,7 +65,6 @@
m_name(),
m_display_name(),
m_copyright_name(),
- m_owning_movie(NULL),
m_unicode_chars(false),
m_shift_jis_chars(false),
m_ansi_chars(true),
@@ -84,7 +83,6 @@
m_name(name),
m_display_name(),
m_copyright_name(),
- m_owning_movie(NULL),
m_unicode_chars(false),
m_shift_jis_chars(false),
m_ansi_chars(true),
@@ -131,10 +129,6 @@
void font::read(stream* in, SWF::tag_type tag, movie_definition* m)
{
- // No add_ref() here, to avoid cycle.
- // m_owning_movie is our owner, so it has a ref to us.
- m_owning_movie = m;
-
if (tag == SWF::DEFINEFONT)
{
readDefineFont(in, m);
Index: server/font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/font.h 21 Apr 2008 11:27:43 -0000 1.39
+++ server/font.h 29 May 2008 08:45:56 -0000 1.40
@@ -166,7 +166,7 @@
/// @param in is the SWF stream
/// @param tag is the tag type either DefineFont or DefineFont2
/// @param m is the movie_definition containing this definition
- /// (or "owning" this font)
+ /// (used to resolve dictionary simbols referred to by glyphs,
if any)
///
void read(stream* in, SWF::tag_type tag, movie_definition* m);
@@ -192,9 +192,6 @@
/// Get name of this font. Warning: can be NULL.
const std::string& get_name() const { return m_name; }
- /// Return the movie_definition "owning" this font
- movie_definition* get_owning_movie() const { return m_owning_movie; }
-
/// Return the glyph index for a given character code
//
/// @param code
@@ -291,8 +288,6 @@
std::string m_display_name;
std::string m_copyright_name;
- movie_definition* m_owning_movie;
-
bool m_has_layout;
bool m_unicode_chars;
bool m_shift_jis_chars;
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- server/parser/movie_def_impl.cpp 27 May 2008 13:27:25 -0000 1.109
+++ server/parser/movie_def_impl.cpp 29 May 2008 08:45:56 -0000 1.110
@@ -508,43 +508,6 @@
return ( framenum <= _frames_loaded );
}
-
-/* movie_def_impl */
-void movie_def_impl::get_owned_fonts(std::vector<font*>* fonts)
- // Fill up *fonts with fonts that we own.
-{
- assert(fonts);
- fonts->resize(0);
-
- std::vector<int> font_ids;
-
- for (FontMap::iterator it = m_fonts.begin(), itEnd=m_fonts.end();
- it != itEnd; ++it)
- {
- font* f = it->second.get();
- if (f->get_owning_movie() == this)
- {
- // Sort by character id, so the ordering is
- // consistent for cache read/write.
- int id = it->first;
-
- // Insert in correct place.
- unsigned int insert;
- for (insert = 0; insert < font_ids.size(); insert++)
- {
- if (font_ids[insert] > id)
- {
- // We want to insert here.
- break;
- }
- }
- fonts->insert(fonts->begin() + insert, f);
- font_ids.insert(font_ids.begin() + insert, id);
- }
- }
-}
-
-
movie_instance*
movie_def_impl::create_movie_instance(character* parent)
{
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- server/parser/movie_def_impl.h 27 May 2008 13:27:25 -0000 1.76
+++ server/parser/movie_def_impl.h 29 May 2008 08:45:56 -0000 1.77
@@ -504,9 +504,6 @@
virtual void load_next_frame_chunk();
- /// Fill up *fonts with fonts that we own.
- void get_owned_fonts(std::vector<font*>* fonts);
-
/// Create an instance of this movie.
//
/// TOCHECK:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/font.cpp server/font.h s...,
Sandro Santilli <=