CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/28 12:01:30
Modified files:
. : ChangeLog
server/swf : tag_loaders.cpp
Log message:
* server/swf/tag_loaders.cpp: remove all bug jpeg-related
calls to stream::get_underlying_stream.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4134&r2=1.4135
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.132&r2=1.133
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4134
retrieving revision 1.4135
diff -u -b -r1.4134 -r1.4135
--- ChangeLog 28 Aug 2007 11:32:44 -0000 1.4134
+++ ChangeLog 28 Aug 2007 12:01:29 -0000 1.4135
@@ -1,3 +1,8 @@
+2007-08-28 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * server/swf/tag_loaders.cpp: remove all bug jpeg-related
+ calls to stream::get_underlying_stream.
+
2007-08-28 Udo Giacomozzi <[EMAIL PROTECTED]>
* server/sprite_instance.cpp: comment unused parameter
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/swf/tag_loaders.cpp 27 Aug 2007 12:44:29 -0000 1.132
+++ server/swf/tag_loaders.cpp 28 Aug 2007 12:01:30 -0000 1.133
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.132 2007/08/27 12:44:29 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.133 2007/08/28 12:01:30 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -602,12 +602,11 @@
#ifdef HAVE_ZLIB_H
-void inflate_wrapper(tu_file* in, void* buffer, int buffer_bytes)
+void inflate_wrapper(stream& in, void* buffer, int buffer_bytes)
// Wrapper function -- uses Zlib to uncompress in_bytes worth
// of data from the input file into buffer_bytes worth of data
// into *buffer.
{
- assert(in);
assert(buffer);
assert(buffer_bytes > 0);
@@ -635,7 +634,8 @@
for (;;) {
// Fill a one-byte (!) buffer.
- buf[0] = in->read_byte();
+ // TODO: sub-optimal, read_u8 also calls align needlessly
+ buf[0] = in.read_u8();
d_stream.next_in = &buf[0];
d_stream.avail_in = 1;
@@ -697,7 +697,7 @@
int buffer_bytes = im->m_width * im->m_height;
uint8_t* buffer = new uint8_t[buffer_bytes];
- inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+ inflate_wrapper(*in, buffer, buffer_bytes);
for (int i = 0; i < buffer_bytes; i++)
{
@@ -765,7 +765,7 @@
int buffer_bytes = color_table_size * 3 + pitch * height;
boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
- inflate_wrapper(in->get_underlying_stream(), buffer.get(),
buffer_bytes);
+ inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
uint8_t* color_table = buffer.get();
@@ -793,7 +793,7 @@
int buffer_bytes = pitch * height;
boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
- inflate_wrapper(in->get_underlying_stream(), buffer.get(),
buffer_bytes);
+ inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
for (int j = 0; j < height; j++)
@@ -821,7 +821,7 @@
int buffer_bytes = pitch * height;
boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
- inflate_wrapper(in->get_underlying_stream(), buffer.get(),
buffer_bytes);
+ inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
// Need to re-arrange ARGB into RGB.
@@ -879,7 +879,7 @@
int buffer_bytes = color_table_size * 4 + pitch * height;
boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
- inflate_wrapper(in->get_underlying_stream(), buffer.get(),
buffer_bytes);
+ inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
uint8_t* color_table = buffer.get();
@@ -908,7 +908,7 @@
int buffer_bytes = pitch * height;
boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
- inflate_wrapper(in->get_underlying_stream(), buffer.get(),
buffer_bytes);
+ inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
for (int j = 0; j < height; j++)
@@ -932,7 +932,7 @@
{
// 32 bits / pixel, input is ARGB format
- inflate_wrapper(in->get_underlying_stream(), image->m_data,
width * height * 4);
+ inflate_wrapper(*in, image->m_data, width * height * 4);
assert(in->get_position() <= in->get_tag_end_position());
// Need to re-arrange ARGB into RGBA.
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
