[Gnash-commit] gnash ChangeLog server/font.cpp server/stream.c...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/22 10:51:49

Modified files:
        .              : ChangeLog 
        server         : font.cpp stream.cpp 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/font.cpp, server/stream.cpp, 
server/swf/tag_loaders.cpp:
                  Fixed signedness warnings after stream interface update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2671&r2=1.2672
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2671
retrieving revision 1.2672
diff -u -b -r1.2671 -r1.2672
--- ChangeLog   22 Mar 2007 10:33:11 -0000      1.2671
+++ ChangeLog   22 Mar 2007 10:51:48 -0000      1.2672
@@ -1,5 +1,10 @@
 2007-03-22 Sandro Santilli <address@hidden>
 
+       * server/font.cpp, server/stream.cpp, server/swf/tag_loaders.cpp:
+         Fixed signedness warnings after stream interface update.
+
+2007-03-22 Sandro Santilli <address@hidden>
+
        * server/stream.{cpp,h}: fix signedness of integers.
        * server/parser/button_character_def.cpp (read):
          Survive malformation of button2 events action tags.

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/font.cpp     21 Feb 2007 11:35:51 -0000      1.26
+++ server/font.cpp     22 Mar 2007 10:51:49 -0000      1.27
@@ -191,7 +191,7 @@
 
                uint16_t glyph_count = in->read_u16();
                
-               int     table_base = in->get_position();
+               unsigned long table_base = in->get_position();
 
                // Read the glyph offsets.  Offsets
                // are measured from the start of the
@@ -238,7 +238,7 @@
                        {for (int i = 0; i < glyph_count; i++)
                        {
                                // Seek to the start of the shape data.
-                               int     new_pos = table_base + offsets[i];
+                               unsigned long new_pos = table_base + offsets[i];
 
                                // It seems completely possible to
                                // have such seeks-back, see bug #16311
@@ -253,7 +253,7 @@
                                m_glyphs[i] = s;
                        }}
 
-                       int     current_position = in->get_position();
+                       unsigned long current_position = in->get_position();
                        if (font_code_offset + table_base != current_position)
                        {
                                // Bad offset!  Don't try to read any more.
@@ -264,7 +264,7 @@
                else
                {
                        // Skip the shape data.
-                       int     new_pos = table_base + font_code_offset;
+                       unsigned long new_pos = table_base + font_code_offset;
                        if (new_pos >= in->get_tag_end_position())
                        {
                                // No layout data!
@@ -378,7 +378,7 @@
        // codes.
        {
                IF_VERBOSE_PARSE (
-               log_parse("reading code table at offset %d", 
in->get_position());
+               log_parse("reading code table at offset %lu", 
in->get_position());
                );
 
                assert(m_code_table.empty());

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/stream.cpp   22 Mar 2007 10:33:11 -0000      1.14
+++ server/stream.cpp   22 Mar 2007 10:51:49 -0000      1.15
@@ -52,7 +52,7 @@
        
        unsigned short stream::read_uint(unsigned short bitcount)
        {
-               assert(bitcount <= 32 && bitcount >= 0);
+               assert(bitcount <= 32);
                        
                uint32_t        value = 0;
 
@@ -95,7 +95,7 @@
 
        int     stream::read_sint(unsigned short bitcount)
        {
-               assert(bitcount <= 32 && bitcount >= 0);
+               assert(bitcount <= 32);
 
                int32_t value = int32_t(read_uint(bitcount));
 
@@ -269,7 +269,7 @@
                _current_tag_length = tag_length;
 
                IF_VERBOSE_PARSE (
-                       log_parse("SWF[%u]: tag type = %d, tag length = %d",
+                       log_parse("SWF[%lu]: tag type = %d, tag length = %d",
                        get_position(), tag_type, tag_length);
                );
                        

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/swf/tag_loaders.cpp  27 Feb 2007 09:54:49 -0000      1.79
+++ server/swf/tag_loaders.cpp  22 Mar 2007 10:51:49 -0000      1.80
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.79 2007/02/27 09:54:49 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.80 2007/03/22 10:51:49 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -266,7 +266,7 @@
 
        IF_VERBOSE_PARSE
        (
-               log_parse("  define_bits_jpeg2_loader: charid = %d pos = 0x%x",
+               log_parse("  define_bits_jpeg2_loader: charid = %d pos = %lx",
                        character_id, in->get_position());
        );
 
@@ -360,7 +360,7 @@
 
        IF_VERBOSE_PARSE
        (
-               log_parse("  define_bits_jpeg3_loader: charid = %d pos = 0x%x",
+               log_parse("  define_bits_jpeg3_loader: charid = %d pos = %lx",
                        character_id, in->get_position());
        );