[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/fill_style.cpp server/fo...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/fill_style.cpp server/fo... |
|
Date: |
Wed, 02 Jan 2008 14:13:59 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/02 14:13:59
Modified files:
. : ChangeLog
server : fill_style.cpp font.cpp impl.cpp
server/parser : movie_def_impl.cpp movie_def_impl.h
movie_definition.h
server/swf : tag_loaders.cpp
Log message:
Remove obsoleted get_create_bitmaps and get_create_font_shapes methods
of
movie_definition.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5287&r2=1.5288
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.174&r2=1.175
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5287
retrieving revision 1.5288
diff -u -b -r1.5287 -r1.5288
--- ChangeLog 2 Jan 2008 12:04:42 -0000 1.5287
+++ ChangeLog 2 Jan 2008 14:13:58 -0000 1.5288
@@ -1,5 +1,13 @@
2008-01-02 Sandro Santilli <address@hidden>
+ * server/fill_style.cpp, server/font.cpp,
+ server/impl.cpp, server/parser/movie_def_impl.{cpp,h},
+ server/parser/movie_definition.h, server/swf/tag_loaders.cpp:
+ Remove obsoleted get_create_bitmaps and get_create_font_shapes
+ methods of movie_definition.
+
+2008-01-02 Sandro Santilli <address@hidden>
+
* doc/C/usermanual/installation/custompath_configuration.xml:
Document new KDE switches.
Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/fill_style.cpp 12 Dec 2007 10:07:00 -0000 1.16
+++ server/fill_style.cpp 2 Jan 2008 14:13:58 -0000 1.17
@@ -202,18 +202,16 @@
pOther->m_color =
pOther->m_gradients[0].m_color;
}
- if (md->get_create_bitmaps() == DO_LOAD_BITMAPS) {
m_gradient_bitmap_info = create_gradient_bitmap();
if (is_morph)
{
pOther->m_gradient_bitmap_info =
- pOther->create_gradient_bitmap();
+ pOther->need_gradient_bitmap();
md->add_bitmap_info(pOther->m_gradient_bitmap_info.get());
}
// Make sure our movie_def_impl knows about this bitmap.
md->add_bitmap_info(m_gradient_bitmap_info.get());
}
- }
else if (m_type == SWF::FILL_TILED_BITMAP
|| m_type == SWF::FILL_CLIPPED_BITMAP
|| m_type == SWF::FILL_TILED_BITMAP_HARD
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/font.cpp 12 Dec 2007 10:07:00 -0000 1.53
+++ server/font.cpp 2 Jan 2008 14:13:58 -0000 1.54
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: font.cpp,v 1.53 2007/12/12 10:07:00 zoulunkai Exp $ */
+/* $Id: font.cpp,v 1.54 2008/01/02 14:13:58 strk Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -180,10 +180,8 @@
_embedGlyphTable.resize(count);
- if (m->get_create_font_shapes() == DO_LOAD_FONT_SHAPES)
- {
// Read the glyph shapes.
- {for (int i = 0; i < count; i++)
+ for (int i = 0; i < count; i++)
{
// Seek to the start of the shape data.
unsigned long new_pos = table_base + offsets[i];
@@ -198,7 +196,6 @@
s->read(in, SWF::DEFINEFONT, false, m);
_embedGlyphTable[i].glyph = s;
- }}
}
}
@@ -282,10 +279,8 @@
_embedGlyphTable.resize(glyph_count);
- if (m->get_create_font_shapes() == DO_LOAD_FONT_SHAPES)
- {
// Read the glyph shapes.
- {for (int i = 0; i < glyph_count; i++)
+ for (int i = 0; i < glyph_count; i++)
{
// Seek to the start of the shape data.
unsigned long new_pos = table_base + offsets[i];
@@ -304,7 +299,7 @@
s->read(in, SWF::DEFINEFONT2, false, m); // ..
or DEFINEFONT3 actually..
_embedGlyphTable[i].glyph = s;
- }}
+ }
unsigned long current_position = in->get_position();
if (font_code_offset + table_base != current_position)
@@ -315,19 +310,6 @@
);
return;
}
- }
- else
- {
- // Skip the shape data.
- unsigned long new_pos = table_base + font_code_offset;
- if (new_pos >= in->get_tag_end_position())
- {
- // No layout data!
- return;
- }
-
- in->set_position(new_pos);
- }
read_code_table(in);
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/impl.cpp 28 Dec 2007 19:35:14 -0000 1.133
+++ server/impl.cpp 2 Jan 2008 14:13:58 -0000 1.134
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: impl.cpp,v 1.133 2007/12/28 19:35:14 strk Exp $ */
+/* $Id: impl.cpp,v 1.134 2008/01/02 14:13:58 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -513,9 +513,7 @@
{
// Avoid leaks on error
- std::auto_ptr<movie_def_impl> m(
- new movie_def_impl(DO_LOAD_BITMAPS, DO_LOAD_FONT_SHAPES)
- );
+ std::auto_ptr<movie_def_impl> m ( new movie_def_impl() );
if ( ! m->readHeader(in, url) )
{
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/parser/movie_def_impl.cpp 14 Dec 2007 22:01:24 -0000 1.95
+++ server/parser/movie_def_impl.cpp 2 Jan 2008 14:13:59 -0000 1.96
@@ -192,13 +192,10 @@
// movie_def_impl
//
-movie_def_impl::movie_def_impl(create_bitmaps_flag cbf,
- create_font_shapes_flag cfs)
+movie_def_impl::movie_def_impl()
:
// FIXME: use a class-static TagLoadersTable for movie_def_impl
_tag_loaders(SWF::TagLoadersTable::getInstance()),
- m_create_bitmaps(cbf),
- m_create_font_shapes(cfs),
m_frame_rate(30.0f),
m_frame_count(0u),
m_version(0),
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/parser/movie_def_impl.h 14 Dec 2007 22:01:24 -0000 1.65
+++ server/parser/movie_def_impl.h 2 Jan 2008 14:13:59 -0000 1.66
@@ -240,9 +240,6 @@
typedef std::vector<boost::intrusive_ptr<bitmap_info> > BitmapVect;
BitmapVect m_bitmap_list;
- create_bitmaps_flag m_create_bitmaps;
- create_font_shapes_flag m_create_font_shapes;
-
rect m_frame_size;
float m_frame_rate;
size_t m_frame_count;
@@ -334,7 +331,7 @@
public:
- movie_def_impl(create_bitmaps_flag cbf, create_font_shapes_flag cfs);
+ movie_def_impl();
~movie_def_impl();
@@ -381,26 +378,6 @@
return m_file_length;
}
- /// Returns DO_CREATE_BITMAPS if we're supposed to
- /// initialize our bitmap infos, or DO_NOT_INIT_BITMAPS
- /// if we're supposed to create blank placeholder
- /// bitmaps (to be init'd later explicitly by the host
- /// program).
- virtual create_bitmaps_flag get_create_bitmaps() const
- {
- return m_create_bitmaps;
- }
-
- /// Returns DO_LOAD_FONT_SHAPES if we're supposed to
- /// initialize our font shape info, or
- /// DO_NOT_LOAD_FONT_SHAPES if we're supposed to not
- /// create any (vector) font glyph shapes, and instead
- /// rely on precached textured fonts glyphs.
- virtual create_font_shapes_flag get_create_font_shapes() const
- {
- return m_create_font_shapes;
- }
-
/// All bitmap_info's used by this movie should be
/// registered with this API.
virtual void add_bitmap_info(bitmap_info* bi)
Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/parser/movie_definition.h 14 Dec 2007 22:01:24 -0000 1.39
+++ server/parser/movie_definition.h 2 Jan 2008 14:13:59 -0000 1.40
@@ -495,20 +495,6 @@
// ...
- // This interface should be nice not to have in movie_definition
- // The default returns DO_LOAD_BITMAPS.
- virtual create_bitmaps_flag get_create_bitmaps() const
- {
- return DO_LOAD_BITMAPS;
- }
-
- // This interface should be nice not to have in movie_definition
- // The default returns DO_LOAD_FONT_SHAPES.
- virtual create_font_shapes_flag get_create_font_shapes() const
- {
- return DO_LOAD_FONT_SHAPES;
- }
-
/// \brief
/// Return the URL of the SWF stream this definition has been read
/// from.
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- server/swf/tag_loaders.cpp 14 Dec 2007 23:10:17 -0000 1.174
+++ server/swf/tag_loaders.cpp 2 Jan 2008 14:13:59 -0000 1.175
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.174 2007/12/14 23:10:17 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.175 2008/01/02 14:13:59 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -291,8 +291,6 @@
// Read the image data.
//
- if (m->get_create_bitmaps() != DO_LOAD_BITMAPS) return;
-
jpeg::input* j_in = m->get_jpeg_loader();
if ( ! j_in )
{
@@ -352,8 +350,6 @@
// Read the image data.
//
- if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
- {
std::auto_ptr<tu_file> ad( StreamAdapter::getFile(*in,
in->get_tag_end_position()) );
std::auto_ptr<image::rgb> im ( image::read_jpeg(ad.get()) );
@@ -368,7 +364,6 @@
boost::intrusive_ptr<bitmap_character_def> ch = new
bitmap_character_def(im);
m->add_bitmap_character_def(character_id, ch.get());
}
- }
}
@@ -473,9 +468,6 @@
boost::uint32_t jpeg_size = in->read_u32();
boost::uint32_t alpha_position = in->get_position() + jpeg_size;
- if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
- {
-
#ifndef HAVE_ZLIB_H
log_error(_("gnash is not linked to zlib -- can't load jpeg3 image
data"));
return;
@@ -515,7 +507,6 @@
m->add_bitmap_character_def(character_id, ch.get());
#endif
- }
}
@@ -542,8 +533,6 @@
// TODO: there's a lot of duplicated code in this function, we should
clean it up
//bitmap_info* bi = NULL;
- if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
- {
#ifndef HAVE_ZLIB_H
log_error(_("gnash is not linked to zlib -- can't load zipped image
data"));
return;
@@ -772,7 +761,6 @@
// add image to movie, under character id.
m->add_bitmap_character(character_id, ch);
#endif
- }
}
// This is like null_loader except it prints a message to nag us to fix it.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/fill_style.cpp server/fo...,
Sandro Santilli <=