[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/font.cpp server/stream.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/font.cpp server/stream.cpp |
Date: |
Mon, 09 Jun 2008 17:40:19 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/09 17:40:18
Modified files:
. : ChangeLog
server : font.cpp stream.cpp
Log message:
* server/font.cpp: more parse logging, log unimplemented when
a language code is specified.
* server/stream.cpp (read_string_with_length): fix regression
introduced in revision 1.52.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6869&r2=1.6870
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.55&r2=1.56
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6869
retrieving revision 1.6870
diff -u -b -r1.6869 -r1.6870
--- ChangeLog 9 Jun 2008 17:23:39 -0000 1.6869
+++ ChangeLog 9 Jun 2008 17:40:17 -0000 1.6870
@@ -1,5 +1,12 @@
2008-06-09 Sandro Santilli <address@hidden>
+ * server/font.cpp: more parse logging, log unimplemented when
+ a language code is specified.
+ * server/stream.cpp (read_string_with_length): fix regression
+ introduced in revision 1.52.
+
+2008-06-09 Sandro Santilli <address@hidden>
+
* libbase/IOChannel.{cpp,h}: docs cleanup, have write_bytes
throw IOException by default (unsupported op).
* libbase/curl_adapter.cpp: implement the Curl adapter by
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/font.cpp 9 Jun 2008 14:31:54 -0000 1.70
+++ server/font.cpp 9 Jun 2008 17:40:18 -0000 1.71
@@ -226,9 +226,15 @@
m_wide_codes = flags & (1 << 2);
m_is_italic = flags & (1 << 1);
m_is_bold = flags & (1 << 0);
- // don't know the usage, so we discard it.
- int discarded = in.read_u8();
- UNUSED(discarded);
+
+ // Next is language code, always 0 for SWF5 or previous
+ int languageCode = in.read_u8();
+ LOG_ONCE( if (languageCode) { log_unimpl("LanguageCode in
DefineFont (2 or 3)"); } );
+
+ in.read_string_with_length(m_name);
+
+ in.ensureBytes(2);
+ boost::uint16_t glyph_count = in.read_u16();
IF_VERBOSE_PARSE (
log_parse(" has_layout = %d", has_layout);
@@ -239,12 +245,10 @@
log_parse(" wide_codes = %d", m_wide_codes);
log_parse(" is_italic = %d", m_is_italic);
log_parse(" is_bold = %d", m_is_bold);
+ log_parse(" name = %s", m_name);
+ log_parse(" glyphs count = %d", glyph_count);
);
- in.read_string_with_length(m_name);
-
- in.ensureBytes(2);
- boost::uint16_t glyph_count = in.read_u16();
unsigned long table_base = in.get_position();
Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/stream.cpp 9 Jun 2008 14:31:54 -0000 1.55
+++ server/stream.cpp 9 Jun 2008 17:40:18 -0000 1.56
@@ -442,7 +442,7 @@
ensureBytes(len);
for (unsigned int i = 0; i < len; ++i)
{
- to.push_back(read_u8());
+ to[i] = read_u8();
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/font.cpp server/stream.cpp,
Sandro Santilli <=