[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/text.cpp server/text.h s...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/text.cpp server/text.h s... |
|
Date: |
Fri, 11 Apr 2008 15:48:23 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/04/11 15:48:22
Modified files:
. : ChangeLog
server : text.cpp text.h
server/parser : text_character_def.cpp
Log message:
* server/text.{cpp,h}: make has{x,y}offset flags and {x,y}offset
values private.
* server/parser/text_character_def.cpp: updated to avoid direct
access to text_style now-private members.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6258&r2=1.6259
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.h?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6258
retrieving revision 1.6259
diff -u -b -r1.6258 -r1.6259
--- ChangeLog 11 Apr 2008 15:33:44 -0000 1.6258
+++ ChangeLog 11 Apr 2008 15:48:20 -0000 1.6259
@@ -1,3 +1,10 @@
+2008-04-11 Sandro Santilli <address@hidden>
+
+ * server/text.{cpp,h}: make has{x,y}offset flags and {x,y}offset
+ values private.
+ * server/parser/text_character_def.cpp: updated to avoid direct
+ access to text_style now-private members.
+
2008-04-11 Benjamin Wolsey <address@hidden>
* configure.ac: allow disabling movie properties separately from
Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/text.cpp 11 Apr 2008 11:25:23 -0000 1.48
+++ server/text.cpp 11 Apr 2008 15:48:21 -0000 1.49
@@ -52,8 +52,8 @@
{
assert(id >= 0);
- m_font = root_def.get_font(id);
- if (m_font == NULL)
+ _font = root_def.get_font(id);
+ if (_font == NULL)
{
IF_VERBOSE_MALFORMED_SWF(
log_error(_("text style references unknown font (id =
%d)"),
Index: server/text.h
===================================================================
RCS file: /sources/gnash/gnash/server/text.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/text.h 11 Apr 2008 11:25:23 -0000 1.25
+++ server/text.h 11 Apr 2008 15:48:22 -0000 1.26
@@ -36,27 +36,25 @@
{
public:
rgba m_color;
- float m_x_offset;
- float m_y_offset;
float m_text_height;
- bool m_has_x_offset;
- bool m_has_y_offset;
-
text_style()
:
- m_x_offset(0),
- m_y_offset(0),
m_text_height(1.0f),
- m_has_x_offset(false),
- m_has_y_offset(false),
+ _hasXOffset(false),
+ _hasYOffset(false),
_underlined(false),
- m_font(NULL)
+ _xOffset(0.0f),
+ _yOffset(0.0f),
+ _font(NULL)
{
}
/// Should text be underlined ?
- bool isUnderlined() const { return _underlined; }
+ bool isUnderlined() const
+ {
+ return _underlined;
+ }
/// Specify whether text should be underlined or not
void setUnderlined(bool v) { _underlined=v; }
@@ -64,16 +62,22 @@
/// Set an X offset
void setXOffset(float o)
{
- // TODO: is this really needed ?
- m_has_x_offset=true;
- m_x_offset=o;
+ _hasXOffset=true;
+ _xOffset=o;
+ }
+
+ /// Drop X offset
+ void dropXOffset()
+ {
+ _hasXOffset=false;
+ _xOffset=0; // we shouldn't need this..
}
/// Shift X offset by given amount
void shiftXOffset(float xo)
{
- //assert(m_has_x_offset)
- m_x_offset+=xo;
+ //assert(_hasXOffset)
+ _xOffset+=xo;
}
/// Return true if text has an X offset
@@ -82,48 +86,52 @@
//
bool hasXOffset() const
{
- return m_has_x_offset;
+ return _hasXOffset;
}
/// Return the X offset
float getXOffset() const
{
- return m_x_offset;
+ return _xOffset;
}
/// Set an Y offset
void setYOffset(float o)
{
- m_has_y_offset=true;
- m_y_offset=o;
+ _hasYOffset = true;
+ _yOffset=o;
+ }
+
+ /// Drop X offset
+ void dropYOffset()
+ {
+ _hasYOffset = false;
+ _yOffset=0; // we shouldn't need this..
}
/// Shift Y offset by given amount
void shiftYOffset(float yo)
{
- //assert(m_has_y_offset)
- m_y_offset+=yo;
+ //assert(_hasYOffset)
+ _yOffset+=yo;
}
/// Return true if text has an Y offset
- //
- // TODO: is this really needed ?
- //
bool hasYOffset() const
{
- return m_has_y_offset;
+ return _hasYOffset;
}
/// Return the Y offset
float getYOffset() const
{
- return m_y_offset;
+ return _yOffset;
}
/// Set font by id and movie_definition
//
/// This method will perform a lookup from the movie_definition
- /// and appropriately set the m_font member.
+ /// and appropriately set the _font member.
///
/// @param id
/// The font id.
@@ -144,7 +152,7 @@
void setFont(const font* fnt)
{
assert(fnt);
- m_font = fnt;
+ _font = fnt;
}
/// Return the associated font (possibly NULL).
@@ -156,20 +164,21 @@
///
const font* getFont() const
{
- return m_font;
+ return _font;
}
private:
- // TODO: turn _underlined, has_x_offset and has_y_offset
- // into a single bitwise flag.
- // Also, check if the has_{x,y}_offset are needed
- // at all !
+ bool _hasXOffset;
+ bool _hasYOffset;
bool _underlined;
- const font* m_font;
+ float _xOffset;
+ float _yOffset;
+
+ const font* _font;
- /// Set m_font based on m_font_id.
+ /// Set font based on id
//
/// @param root_def
/// The movie_definition used for looking up font by id
Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/text_character_def.cpp 15 Feb 2008 10:05:26 -0000
1.10
+++ server/parser/text_character_def.cpp 11 Apr 2008 15:48:22 -0000
1.11
@@ -77,7 +77,8 @@
IF_VERBOSE_PARSE(
log_parse(_(" has_font: font id = %d (%p)"),
font_id, (const void*)style.getFont());
);
- }
+ } // else reuse previous record font
+
if (has_color)
{
if (tag_type == SWF::DEFINETEXT)
@@ -92,36 +93,34 @@
IF_VERBOSE_PARSE(
log_parse(_(" has_color"));
);
- }
+ } // else reuse previous record color
+
if (has_x_offset)
{
- style.m_has_x_offset = true;
-
in->ensureBytes(2);
- style.m_x_offset = in->read_s16();
+ style.setXOffset(in->read_s16());
IF_VERBOSE_PARSE(
- log_parse(_(" has_x_offset = %g"),
style.m_x_offset);
+ log_parse(_(" has_x_offset = %g"),
style.getXOffset());
);
}
else
{
- style.m_has_x_offset = false;
- style.m_x_offset = 0.0f;
+ // continue where previous record left
+ style.dropXOffset();
}
+
if (has_y_offset)
{
- style.m_has_y_offset = true;
-
in->ensureBytes(2);
- style.m_y_offset = in->read_s16();
+ style.setYOffset(in->read_s16());
IF_VERBOSE_PARSE(
- log_parse(_(" has_y_offset = %g"),
style.m_y_offset);
+ log_parse(_(" has_y_offset = %g"),
style.getYOffset());
);
}
else
{
- style.m_has_y_offset = false;
- style.m_y_offset = 0.0f;
+ // continue where previous record left
+ style.dropYOffset();
}
if (has_font)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/text.cpp server/text.h s...,
Sandro Santilli <=