[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/server/swf tag_loaders.cpp
From: |
Martin Guy |
Subject: |
[Gnash-commit] gnash/server/swf tag_loaders.cpp |
Date: |
Wed, 18 Apr 2007 16:19:56 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Martin Guy <martinwguy> 07/04/18 16:19:56
Modified files:
server/swf : tag_loaders.cpp
Log message:
server/swf/tag_loaders.cpp: Reformat bizarre indentation caused by
someone
editing with hard tabs set to 4.
server/asobj/Date.cpp: Fix signed/unsigned compiler warning.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.89&r2=1.90
Patches:
Index: tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- tag_loaders.cpp 18 Apr 2007 14:07:33 -0000 1.89
+++ tag_loaders.cpp 18 Apr 2007 16:19:56 -0000 1.90
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.89 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: tag_loaders.cpp,v 1.90 2007/04/18 16:19:56 martinwguy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -266,7 +266,6 @@
m->add_bitmap_character_def(character_id, ch);
}
}
-
}
@@ -313,7 +312,6 @@
m->add_bitmap_character_def(character_id, ch);
}
}
-
}
@@ -423,7 +421,6 @@
m->add_bitmap_character_def(character_id, ch);
#endif
}
-
}
@@ -442,11 +439,7 @@
(
log_parse(_(" defbitslossless2: tag = %d, id = %d, "
"fmt = %d, w = %d, h = %d"),
- tag,
- character_id,
- bitmap_format,
- width,
- height);
+ tag, character_id, bitmap_format, width, height);
);
//bitmap_info* bi = NULL;
@@ -733,7 +726,9 @@
void define_font_loader(stream* in, tag_type tag, movie_definition* m)
// Load a DefineFont or DefineFont2 tag.
{
- assert(tag == SWF::DEFINEFONT || tag == SWF::DEFINEFONT2 || tag ==
SWF::DEFINEFONT3 ); // 10 || 48 || 75
+ assert(tag == SWF::DEFINEFONT
+ || tag == SWF::DEFINEFONT2
+ || tag == SWF::DEFINEFONT3 ); // 10 || 48 || 75
uint16_t font_id = in->read_u16();
@@ -954,6 +949,7 @@
{
uint16_t id = in->read_u16();
char* symbol_name = in->read_string();
+
IF_VERBOSE_PARSE (
log_parse(_(" export: id = %d, name = %s"), id, symbol_name);
);
@@ -1143,8 +1139,7 @@
IF_VERBOSE_PARSE
(
log_parse(_("tag %d: do_action_loader"), tag);
- log_parse(_("-- actions in frame " SIZET_FMT),
- m->get_loading_frame());
+ log_parse(_("-- actions in frame " SIZET_FMT), m->get_loading_frame());
);
assert(in);
@@ -1162,15 +1157,13 @@
{
assert(tag == SWF::INITACTION); // 59
-
int sprite_character_id = in->read_u16();
UNUSED(sprite_character_id);
IF_VERBOSE_PARSE
(
log_parse(_(" tag %d: do_init_action_loader"), tag);
- log_parse(_(" -- init actions for sprite %d"),
- sprite_character_id);
+ log_parse(_(" -- init actions for sprite %d"), sprite_character_id);
);
do_action* da = new do_action;
@@ -1229,8 +1222,7 @@
// Uncompress the ADPCM before handing data to host.
data_bytes = sample_count * (stereo ? 4 : 2);
data = new unsigned char[data_bytes];
- sound_handler::adpcm_expand(data, in, sample_count,
- stereo);
+ sound_handler::adpcm_expand(data, in, sample_count, stereo);
format = sound_handler::FORMAT_NATIVE16;
}
else
@@ -1248,13 +1240,13 @@
if (format == sound_handler::FORMAT_UNCOMPRESSED
&& sample_16bit)
{
- #ifndef _TU_LITTLE_ENDIAN_
+#ifndef _TU_LITTLE_ENDIAN_
// Swap sample bytes to get big-endian format.
for (int i = 0; i < data_bytes - 1; i += 2)
{
swap(&data[i], &data[i+1]);
}
- #endif // not _TU_LITTLE_ENDIAN_
+#endif // not _TU_LITTLE_ENDIAN_
format = sound_handler::FORMAT_NATIVE16;
}
@@ -1318,7 +1310,6 @@
);
}
}
-
}
// Load a SoundStreamHead(2) tag.
@@ -1383,8 +1374,8 @@
format,
s_sample_rate_table[sample_rate],
stereo);
- m->set_loading_sound_stream_id(handler_id);
+ m->set_loading_sound_stream_id(handler_id);
}
@@ -1438,9 +1429,7 @@
{
data[i] = in->read_u8();
}
-
} else {
-
for (int i = 0; i < data_bytes; i++)
{
data[i] = in->read_u8();
@@ -1450,13 +1439,13 @@
// @@ I'm assuming this is a good idea? Most sound handlers
will prefer native endianness?
/*if (format == sound_handler::FORMAT_UNCOMPRESSED &&
sample_16bit)
{
- #ifndef _TU_LITTLE_ENDIAN_
+#ifndef _TU_LITTLE_ENDIAN_
// Swap sample bytes to get big-endian format.
for (int i = 0; i < data_bytes - 1; i += 2)
{
swap(&data[i], &data[i+1]);
}
- #endif // not _TU_LITTLE_ENDIAN_
+#endif // not _TU_LITTLE_ENDIAN_
format = sound_handler::FORMAT_NATIVE16;
}*/
@@ -1473,7 +1462,6 @@
ssst->read(m, handle_id, start);
// @@ who's going to delete the start_stream_sound_tag ??
-
}
void
@@ -1502,7 +1490,6 @@
assert(ch != NULL);
ch->read(in, tag, m);
-
}
void
@@ -1542,7 +1529,6 @@
}
// TODO: attach info to movie_definition
-
}
void
@@ -1581,7 +1567,6 @@
log_msg(_("SERIALNUMBER: %s"), serial.c_str());
// attach to movie_definition ?
-
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/server/swf tag_loaders.cpp,
Martin Guy <=