[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/tools.cpp
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/tools.cpp |
|
Date: |
Thu, 15 May 2008 12:29:58 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/15 12:29:57
Modified files:
. : ChangeLog
Removed files:
server : tools.cpp
Log message:
* server/tools.cpp: drop unused file.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6606&r2=1.6607
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tools.cpp?cvsroot=gnash&r1=1.8&r2=0
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6606
retrieving revision 1.6607
diff -u -b -r1.6606 -r1.6607
--- ChangeLog 15 May 2008 08:42:56 -0000 1.6606
+++ ChangeLog 15 May 2008 12:29:50 -0000 1.6607
@@ -6,6 +6,10 @@
2008-05-15 Benjamin Wolsey <address@hidden>
+ * server/tools.cpp: drop unused file.
+
+2008-05-15 Benjamin Wolsey <address@hidden>
+
* server/asobj/GMath.h: drop all the undefs.
2008-05-15 Sandro Santilli <address@hidden>
Index: server/tools.cpp
===================================================================
RCS file: server/tools.cpp
diff -N server/tools.cpp
--- server/tools.cpp 19 Feb 2008 19:20:54 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,294 +0,0 @@
-// tools.cpp -- Thatcher Ulrich <address@hidden> 2004
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// Some optional helper code.
-
-
-#include "tu_file.h"
-#include "utility.h"
-#include "zlib_adapter.h"
-#include "gnash.h"
-#include "log.h"
-#include "stream.h"
-#include "types.h"
-
-
-namespace gnash {
-namespace tools {
- // This struct tracks an input stream. When you call
- // do_copy(), it writes all the data that has been read from
- // the input stream into the output stream. (Basically it
- // goes by the input file position, not by the *actual* read
- // calls.)
- //
- // The copying can be optionally cancelled.
- class copy_helper
- {
- public:
- tu_file* m_in;
- tu_file* m_out;
- int m_initial_in_pos;
- bool m_done_copy;
-
- copy_helper(tu_file* in, tu_file* out)
- :
- m_in(in),
- m_out(out),
- m_initial_in_pos(in->get_position()),
- m_done_copy(false)
- {
- assert(m_in && m_in->get_error() == TU_FILE_NO_ERROR);
- assert(m_out && m_out->get_error() == TU_FILE_NO_ERROR);
- }
-
-
- bool do_copy()
- // Copy the data. Return true on success, false on failure.
- {
- if (m_done_copy)
- {
- abort();
- log_error("gnash::tools::copy_helper() already
done copy\n");
- return false;
- }
-
- m_done_copy = true;
-
- int current_in_pos = m_in->get_position();
- int bytes_to_copy = current_in_pos -
m_initial_in_pos;
- if (bytes_to_copy > 0)
- {
- m_in->set_position(m_initial_in_pos);
- int bytes_copied = m_out->copy_bytes(m_in,
bytes_to_copy);
-
- if (bytes_copied != bytes_to_copy)
- {
- m_in->set_position(current_in_pos);
// fixup
- return false;
- }
- assert(m_in->get_position() == current_in_pos);
-
- return true;
- }
- else
- {
- log_error("gnash::tools::copy_helper asked to
copy %d bytes\n",
- bytes_to_copy);
- return false;
- }
- }
- };
-
-
- void write_placeholder_bitmap(tu_file* out, boost::uint16_t
character_id)
- // Write a minimal bitmap character tag into the given stream,
- // with the given character_id.
- {
- out->write_le16((20 << 6) | 0x3F); // tag header: tag type
= 20, size = from next u32
- int tag_size_pos = out->get_position();
- out->write_le32(0); // placeholder for tag size.
-
- out->write_le16(character_id);
- out->write_byte(4); // code for 16 bits/pixel
- out->write_le16(2); // width, min pitch = 4 bytes/row
- out->write_le16(1); // height
-
- // This is zlib-compressed data representing four 0 bytes.
- static const int COMP_SIZE = 12;
- unsigned char compressed_data[COMP_SIZE] =
- {
- 0x78,
- 0x9c,
- 0x63,
- 0x60,
- 0x60,
- 0x60,
- 0x00,
- 0x00,
- 0x00,
- 0x04,
- 0x00,
- 0x01,
- };
- out->write_bytes(compressed_data, COMP_SIZE);
-
- // Write the actual tag size in the slot at the beginning.
- int end_pos = out->get_position();
- int size = end_pos - tag_size_pos - 4;
- out->set_position(tag_size_pos);
- out->write_le32(size);
- out->set_position(end_pos);
- }
-
-}} // end namespace gnash::tools
-
-
-int gnash::tools::process_swf(tu_file* swf_out, tu_file* in, const
process_options& options)
-{
- assert(in && in->get_error() == TU_FILE_NO_ERROR);
- assert(swf_out && swf_out->get_error() == TU_FILE_NO_ERROR);
-
- // @@ Copied & adapted from movie_def_impl::read()
- // @@ TODO share this wrapper code somehow (also with parser)
-
- boost::uint32_t file_start_pos = in->get_position();
- boost::uint32_t header = in->read_le32();
- boost::uint32_t file_length = in->read_le32();
- boost::uint32_t file_end_pos = file_start_pos + file_length;
-
- int version = (header >> 24) & 255;
- if ((header & 0x0FFFFFF) != 0x00535746
- && (header & 0x0FFFFFF) != 0x00535743)
- {
- // ERROR
- log_error("gnash::movie_def_impl::read() -- file does not start
with a SWF header!\n");
- return 1;
- }
- bool compressed = (header & 255) == 'C';
-
- IF_VERBOSE_PARSE(log_parse("version = %d, file_length = %d\n", version,
file_length));
-
- tu_file* original_in = NULL;
- if (compressed)
- {
-#ifndef HAVE_ZLIB_H
- log_error("gnash can't read zipped SWF data;
TU_CONFIG_LINK_TO_ZLIB is 0!\n");
- return -1;
-#else
- IF_VERBOSE_PARSE(log_parse("file is compressed."));
- original_in = in;
-
- // Uncompress the input as we read it.
- in = zlib_adapter::make_inflater(original_in);
-
- // Subtract the size of the 8-byte header, since
- // it's not included in the compressed
- // stream length.
- file_end_pos = file_length - 8;
-#endif
- }
-
- stream str(in);
-
- if (options.m_zip_whole_file)
- {
- // @@ TODO not implemented yet.
- log_error("gnash::tools::process_swf():
options.m_zip_whole_file is not implemented! Output will not be zipped.\n");
- }
-
- //
- // Start the output file
- //
-
- int output_file_start_pos = swf_out->get_position();
- swf_out->write_le32(0x06535746); // Flash 6 header, uncompressed
-
- // File length (need to overwrite later with the actual value.
- int output_file_length_pos = swf_out->get_position();
- swf_out->write_le32(0);
-
- float frame_rate = 30.f;
- int frame_count = 0;
- {
- copy_helper cp(in, swf_out); // copies everything
that's read in this scope.
-
- rect dummy_frame_size;
- dummy_frame_size.read(&str);
- frame_rate = str.read_u16() / 256.0f;
- frame_count = str.read_u16();
-
- str.align();
-
- bool success = cp.do_copy();
- if (!success)
- {
- // Error!
- log_error("gnash::tools::process_swf() -- unable to
copy header data!\n");
- return 1;
- }
- }
-
-// m_playlist.resize(m_frame_count);
-
-// IF_VERBOSE_PARSE(m_frame_size.print());
- IF_VERBOSE_PARSE(log_parse("frame rate = %f, frames = %d\n",
frame_rate, frame_count));
-
- while ((boost::uint32_t) str.get_position() < file_end_pos)
- {
- copy_helper cp(in, swf_out);
-
- int tag_type = str.open_tag();
- if (options.m_remove_image_data
- && tag_type == 8)
- {
- // Don't need no stinkin jpeg tables.
- str.close_tag();
- }
- else if (options.m_remove_image_data
- && (tag_type == 6
- || tag_type == 20
- || tag_type == 21
- || tag_type == 35
- || tag_type == 36))
- {
- // Some type of bitmap character tag; replace it with a
minimal stand-in.
- boost::uint16_t cid = str.read_u16();
- str.close_tag();
-
- // Insert substitute tag.
- write_placeholder_bitmap(swf_out, cid);
- }
- else
- {
- // Leave this tag as-is.
- str.close_tag();
- str.align();
-
- // Copy into output.
- bool success = cp.do_copy();
- if (!success)
- {
- // Error!
- log_error("gnash::tools::process_swf() -- error
copying tag!\n");
- return 1;
- }
- }
-
- if (tag_type == 0)
- {
- if ((unsigned int) str.get_position() != file_end_pos)
- {
- // Safety break, so we don't read past the end
of the
- // movie.
- log_debug("warning: process_swf() hit
stream-end tag, but not at the "
- "end of the file yet; stopping for
safety\n");
- break;
- }
- }
- }
-
- if (original_in)
- {
- // Done with the zlib_adapter.
- delete in;
- }
-
- // Go back and write the file size.
- int current_pos = swf_out->get_position();
- swf_out->set_position(output_file_length_pos);
- swf_out->write_le32(current_pos - output_file_start_pos);
- swf_out->set_position(current_pos);
-
- return 0; // OK
-}
-
-
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
-// indent-tabs-mode: t
-// End:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/tools.cpp,
Benjamin Wolsey <=