[Gnash-commit] gnash libamf/Makefile.am libbase/triangulate_im...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/03/30 19:12:53

Modified files:
        libamf         : Makefile.am 
        libbase        : triangulate_impl.h tu_file.cpp tu_file.h 
                         tu_file_SDL.cpp zlib_adapter.cpp 
        libgeometry    : geometry.h kd_tree_packed.cpp 
        utilities      : Makefile.am 
        server         : Makefile.am action.cpp dlist.cpp network.cpp 
                         shape.cpp sound_handler_mp3.cpp xml.cpp 
                         xmlnode.cpp 

Log message:
        (patches from Petter Reinholdtsen <address@hidden>)
        * libbase/triangulate_impl.h: Add const to some type casting.
        * libbase/tu_file.cpp: Remove const from *_tell_func API.
        * libbase/tu_file.h: Remove const from *_tell_func API.
        * libbase/tu_file_SDL.cpp: Remove const from *_tell_func API.
        * libbase/zlib_adapter.cpp: Remove const from *_tell_func API.
        * libgeometry/geometry.h: Swap static and const, they're in the
        wrong order.
        * libgeometry/kd_tree_packed.cpp: Use unsigned interger to compare
        to the result from size() for an STL container.
        * server/Makefile.am: Remove -Wall, it's set in configure.ac now.
        * server/action.cpp: Add const to definition of character
        pointer.
        * server/dlist.cpp: Add const when casting display_object_info.
        * server/network.cpp: Return false for now if
        Network::createClient is called with only the port number.
        * server/shape.cpp: Use const when casting nmesh)_set.
        * server/sound_handler_mp3.cpp: Use unsigned interger to compare
        to the result from size() for an STL container.
        * server/xml.cpp: Define the niodename before using it.
        * server/xmlnode.cpp: Return NULL if we can't return an object
        pointer.
        * utilities/Makefile.am: Add MP3_LIB to the linker list.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/triangulate_impl.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/tu_file.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/tu_file.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/tu_file_SDL.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/zlib_adapter.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/geometry.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/kd_tree_packed.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/dlist.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/network.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sound_handler_mp3.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnash/libamf/Makefile.am
diff -u gnash/libamf/Makefile.am:1.4 gnash/libamf/Makefile.am:1.5
--- gnash/libamf/Makefile.am:1.4        Thu Mar  9 19:29:05 2006
+++ gnash/libamf/Makefile.am    Thu Mar 30 19:12:51 2006
@@ -40,7 +40,7 @@
 AUTOMAKE_OPTIONS = 
 
 AM_CXXFLAGS =  $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
-AM_CPPFLAGS = -Wall
+AM_CPPFLAGS = 
 AM_LDFLAGS = \
        ../libbase/libgnashbase.la \
         $(OPENGL_LIBS)      \
Index: gnash/libbase/triangulate_impl.h
diff -u gnash/libbase/triangulate_impl.h:1.7 
gnash/libbase/triangulate_impl.h:1.8
--- gnash/libbase/triangulate_impl.h:1.7        Sat Feb 25 03:54:03 2006
+++ gnash/libbase/triangulate_impl.h    Thu Mar 30 19:12:53 2006
@@ -612,8 +612,8 @@
 template<class coord_t>
 int    compare_polys_by_leftmost_vert(const void* a, const void* b)
 {
-       const poly<coord_t>*    poly_a = * (const poly<coord_t>**) a;
-       const poly<coord_t>*    poly_b = * (const poly<coord_t>**) b;
+       const poly<coord_t>*    poly_a = * (const poly<coord_t>* const *) a;
+       const poly<coord_t>*    poly_b = * (const poly<coord_t>* const *) b;
 
        // Vert indices are sorted, so we just compare the indices,
        // not the actual vert coords.
@@ -705,7 +705,7 @@
        {
                const poly_vert<coord_t>*       pvi = &sorted_verts[vi];
 
-               assert(compare_vertices<coord_t>((void*) pvi, (void*) pv1) <= 
0);
+               assert(compare_vertices<coord_t>((const void*) pvi, (const 
void*) pv1) <= 0);
 
                if (pvi->m_poly_owner == this)
                {
Index: gnash/libbase/tu_file.cpp
diff -u gnash/libbase/tu_file.cpp:1.4 gnash/libbase/tu_file.cpp:1.5
--- gnash/libbase/tu_file.cpp:1.4       Sun Mar 12 00:35:15 2006
+++ gnash/libbase/tu_file.cpp   Thu Mar 30 19:12:53 2006
@@ -67,7 +67,7 @@
 }
 
 static int
-std_tell_func(const void *appdata)
+std_tell_func(void *appdata)
 // Return the file position, or -1 on failure.
 {
     assert(appdata);
@@ -244,7 +244,7 @@
 }
 
 static int
-mem_tell_func(const void* appdata)
+mem_tell_func(void* appdata)
 // Return the file position, or -1 on failure.
 {
     assert(appdata);
Index: gnash/libbase/tu_file.h
diff -u gnash/libbase/tu_file.h:1.3 gnash/libbase/tu_file.h:1.4
--- gnash/libbase/tu_file.h:1.3 Sat Mar 11 19:24:27 2006
+++ gnash/libbase/tu_file.h     Thu Mar 30 19:12:53 2006
@@ -41,7 +41,7 @@
     typedef int (* write_func)(const void* src, int bytes, void* appdata);
     typedef int (* seek_func)(int pos, void* appdata);
     typedef int (* seek_to_end_func)(void* appdata);
-    typedef int (* tell_func)(const void* appdata);
+    typedef int (* tell_func)(void* appdata);
     typedef bool (* get_eof_func)(void* appdata);
     typedef int (* close_func)(void* appdata);
     
@@ -176,15 +176,15 @@
     
     void       close();
     
-    void *     m_data;
-    read_func  m_read;
-    write_func         m_write;
-    seek_func  m_seek;
+    void *             m_data;
+    read_func          m_read;
+    write_func         m_write;
+    seek_func          m_seek;
     seek_to_end_func   m_seek_to_end;
-    tell_func  m_tell;
+    tell_func          m_tell;
     get_eof_func       m_get_eof;
-    close_func         m_close;
-    int        m_error;
+    close_func         m_close;
+    int                m_error;
 };
 
 
Index: gnash/libbase/tu_file_SDL.cpp
diff -u gnash/libbase/tu_file_SDL.cpp:1.2 gnash/libbase/tu_file_SDL.cpp:1.3
--- gnash/libbase/tu_file_SDL.cpp:1.2   Sun Feb 26 15:49:30 2006
+++ gnash/libbase/tu_file_SDL.cpp       Thu Mar 30 19:12:53 2006
@@ -55,7 +55,7 @@
        return SDL_RWseek((SDL_RWops*) appdata, 0, SEEK_END);
 }
 
-static int sdl_tell_func(const void *appdata)
+static int sdl_tell_func(void *appdata)
 {
        assert(appdata);
        return SDL_RWtell((SDL_RWops*) appdata);
Index: gnash/libbase/zlib_adapter.cpp
diff -u gnash/libbase/zlib_adapter.cpp:1.2 gnash/libbase/zlib_adapter.cpp:1.3
--- gnash/libbase/zlib_adapter.cpp:1.2  Sun Feb 26 15:49:30 2006
+++ gnash/libbase/zlib_adapter.cpp      Thu Mar 30 19:12:53 2006
@@ -262,7 +262,7 @@
                return inf->m_logical_stream_pos;
        }
 
-       int     inflate_tell(const void* appdata)
+       int     inflate_tell(void* appdata)
        {
                inflater_impl*  inf = (inflater_impl*) appdata;
 
Index: gnash/libgeometry/geometry.h
diff -u gnash/libgeometry/geometry.h:1.3 gnash/libgeometry/geometry.h:1.4
--- gnash/libgeometry/geometry.h:1.3    Wed Feb  1 23:58:32 2006
+++ gnash/libgeometry/geometry.h        Thu Mar 30 19:12:53 2006
@@ -69,7 +69,7 @@
        bool    checknan() const;       // Returns true if any component is nan.
 
        // Some handy vector constants.
-       const static vec3       zero, x_axis, y_axis, z_axis, flt_max, 
minus_flt_max;
+       static const vec3       zero, x_axis, y_axis, z_axis, flt_max, 
minus_flt_max;
 };
 
 
Index: gnash/libgeometry/kd_tree_packed.cpp
diff -u gnash/libgeometry/kd_tree_packed.cpp:1.3 
gnash/libgeometry/kd_tree_packed.cpp:1.4
--- gnash/libgeometry/kd_tree_packed.cpp:1.3    Fri Feb 24 00:06:21 2006
+++ gnash/libgeometry/kd_tree_packed.cpp        Thu Mar 30 19:12:53 2006
@@ -190,7 +190,7 @@
        {
                if (has_pos_child())
                {
-                       int offset = (m_flags[1]) + (m_flags[2] << 8) + 
(m_flags[3] << 16);
+                       unsigned int offset = (m_flags[1]) + (m_flags[2] << 8) 
+ (m_flags[3] << 16);
                        assert(offset >= sizeof(kd_node));      // sanity check
 
                        return (kd_node*) (((uint8*) this) + offset);
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.24 gnash/server/Makefile.am:1.25
--- gnash/server/Makefile.am:1.24       Sat Mar 11 19:24:27 2006
+++ gnash/server/Makefile.am    Thu Mar 30 19:12:53 2006
@@ -39,7 +39,7 @@
 
 AUTOMAKE_OPTIONS = 
 
-AM_CPPFLAGS = -Wall
+AM_CPPFLAGS = 
 
 # noinst_LTLIBRARIES = libserver.la libasobjs.la
 lib_LTLIBRARIES = libgnashserver.la libgnashasobjs.la
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.57 gnash/server/action.cpp:1.58
--- gnash/server/action.cpp:1.57        Wed Mar 29 05:42:41 2006
+++ gnash/server/action.cpp     Thu Mar 30 19:12:53 2006
@@ -168,7 +168,7 @@
       
                        save_extern_movie(extern_movie);
       
-                       character* tar = (character*)target;
+                       const character* tar = (const character*)target;
                        const char* name = tar->get_name().c_str();
                        Uint16 depth = tar->get_depth();
                        bool use_cxform = false;
Index: gnash/server/dlist.cpp
diff -u gnash/server/dlist.cpp:1.7 gnash/server/dlist.cpp:1.8
--- gnash/server/dlist.cpp:1.7  Wed Mar 29 05:42:41 2006
+++ gnash/server/dlist.cpp      Thu Mar 30 19:12:53 2006
@@ -14,8 +14,8 @@
 namespace gnash {
        /*static*/ int  display_object_info::compare(const void* _a, const 
void* _b)
        {
-               display_object_info*    a = (display_object_info*) _a;
-               display_object_info*    b = (display_object_info*) _b;
+               const display_object_info*      a = (const 
display_object_info*) _a;
+               const display_object_info*      b = (const 
display_object_info*) _b;
 
                if (a->m_character->get_depth() < b->m_character->get_depth())
                {
Index: gnash/server/network.cpp
diff -u gnash/server/network.cpp:1.5 gnash/server/network.cpp:1.6
--- gnash/server/network.cpp:1.5        Thu Mar  9 19:29:06 2006
+++ gnash/server/network.cpp    Thu Mar 30 19:12:53 2006
@@ -305,7 +305,9 @@
 bool
 Network::createClient(short port)
 {
+    return false;
 }
+
 bool
 Network::createClient(const char *hostname)
 {
Index: gnash/server/shape.cpp
diff -u gnash/server/shape.cpp:1.11 gnash/server/shape.cpp:1.12
--- gnash/server/shape.cpp:1.11 Wed Mar 29 05:42:41 2006
+++ gnash/server/shape.cpp      Thu Mar 30 19:12:53 2006
@@ -1232,8 +1232,8 @@
 
 static int     sort_by_decreasing_error(const void* A, const void* B)
 {
-    const mesh_set*    a = *(const mesh_set**) A;
-    const mesh_set*    b = *(const mesh_set**) B;
+    const mesh_set*    a = *(const mesh_set* const *) A;
+    const mesh_set*    b = *(const mesh_set* const *) B;
 
     if (a->get_error_tolerance() < b->get_error_tolerance()) {
        return 1;
Index: gnash/server/sound_handler_mp3.cpp
diff -u gnash/server/sound_handler_mp3.cpp:1.5 
gnash/server/sound_handler_mp3.cpp:1.6
--- gnash/server/sound_handler_mp3.cpp:1.5      Sat Feb 25 11:20:31 2006
+++ gnash/server/sound_handler_mp3.cpp  Thu Mar 30 19:12:53 2006
@@ -194,13 +194,13 @@
                *adjusted_data = (Sint16*) p;
                *adjusted_size = total * sizeof(Sint16);
                // stuff all that crap together
-               {for (int i=0; i<out.size(); ++i)
+               {for (unsigned int i=0; i<out.size(); ++i)
                        p = out[i]->collate(p,stereo);
                }
        }
 
 cleanup:
-       {for (int i=0; i<out.size(); ++i) delete out[i]; }
+       {for (unsigned int i=0; i<out.size(); ++i) delete out[i]; }
        mad_synth_finish(&synth);
        mad_frame_finish(&frame);
        mad_stream_finish(&stream);
Index: gnash/server/xml.cpp
diff -u gnash/server/xml.cpp:1.16 gnash/server/xml.cpp:1.17
--- gnash/server/xml.cpp:1.16   Sat Mar 11 19:24:27 2006
+++ gnash/server/xml.cpp        Thu Mar 30 19:12:53 2006
@@ -844,7 +844,7 @@
 {
     int           child;
     unsigned int  i;
-    const char    *nodename;
+    const char    *nodename = xml->nodeName();
     int           length;
     string       str;
     
Index: gnash/server/xmlnode.cpp
diff -u gnash/server/xmlnode.cpp:1.7 gnash/server/xmlnode.cpp:1.8
--- gnash/server/xmlnode.cpp:1.7        Thu Mar  9 19:29:07 2006
+++ gnash/server/xmlnode.cpp    Thu Mar 30 19:12:53 2006
@@ -284,6 +284,8 @@
     if (_objects.size() > 0) {
        return _objects[x-1];
     }
+
+    return NULL;
 }
 
 as_object *
@@ -293,6 +295,7 @@
     if (x < (int) _objects.size()) {
        return _objects[x];
     }
+    return NULL;
 }
 
 void
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.15 gnash/utilities/Makefile.am:1.16
--- gnash/utilities/Makefile.am:1.15    Thu Mar 30 01:52:00 2006
+++ gnash/utilities/Makefile.am Thu Mar 30 19:12:53 2006
@@ -40,7 +40,8 @@
         $(LIBXML_LIBS)         \
         $(OPENGL_LIBS)         \
        $(GLEXT_LIBS)           \
-       $(GTK2_LIBS)
+       $(GTK2_LIBS)            \
+       $(MP3_LIBS)
 
 INCLUDES = -I.. \
         -I$(top_srcdir)                \