[Gnash-commit] gnash ChangeLog configure.ac backend/render_han...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/07/27 14:54:43

Modified files:
        .              : ChangeLog configure.ac 
        backend        : render_handler_ogl.cpp 
        gui            : gtk_glue_cairo.cpp gtk_glue_cairo.h 
        libbase        : Makefile.am jpeg.cpp 
        macros         : cairo.m4 
        plugin         : plugin.cpp 
        server         : shm.cpp 
        server/asobj   : Date.cpp 

Log message:
        * configure.ac: Allow us to specify --enable-sound=none. Default to
          -pedantic -Wno-long-long for GCC.
        * backend/render_handler_ogl.cpp: Remove unneeded #includes.
        * gui/gtk_glue_cairo{.cpp, h}: Move an include to the .cpp file, where
          it's actually used.
        * libbase/jpeg.cpp: Don't let jpeglib.h redefine HAVE_STDLIB_H.
        * libbase/Makefile.am: Remove ogl{.cpp,h} from the build.
        * macros/cairo.m4: Add -lcairo to the Cairo LDFLAGS, if needed.
        * plugin/plugin.cpp: trivially fix warnings.
        * server/shm.cpp: Remove an unused variable.
        * server/asobj/Date.cpp: Make sure the recipient buffer size matches 
the size
          parameter passed to snprintf(), to prevent overflows.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.539&r2=1.540
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_cairo.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_cairo.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -b -r1.539 -r1.540
--- ChangeLog   27 Jul 2006 14:28:28 -0000      1.539
+++ ChangeLog   27 Jul 2006 14:54:42 -0000      1.540
@@ -1,3 +1,18 @@
+2006-07-27 Bastiaan Jacques <address@hidden>
+
+       * configure.ac: Allow us to specify --enable-sound=none. Default to
+       -pedantic -Wno-long-long for GCC.
+       * backend/render_handler_ogl.cpp: Remove unneeded #includes.
+       * gui/gtk_glue_cairo{.cpp, h}: Move an include to the .cpp file, where
+       it's actually used.
+       * libbase/jpeg.cpp: Don't let jpeglib.h redefine HAVE_STDLIB_H.
+       * libbase/Makefile.am: Remove ogl{.cpp,h} from the build.
+       * macros/cairo.m4: Add -lcairo to the Cairo LDFLAGS, if needed.
+       * plugin/plugin.cpp: trivially fix warnings.
+       * server/shm.cpp: Remove an unused variable.
+       * server/asobj/Date.cpp: Make sure the recipient buffer size matches 
the size
+       parameter passed to snprintf(), to prevent overflows.
+
 2006-07-27 Sandro Santilli <address@hidden>
 
        * macros/gstreamer.m4: fixed handling of --with-gst-lib,

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- configure.ac        26 Jul 2006 14:18:14 -0000      1.93
+++ configure.ac        27 Jul 2006 14:54:43 -0000      1.94
@@ -202,7 +202,7 @@
  [case "${enableval}" in
    GST|gst) sound_handler=gst ;;
    sdl|SDL) sound_handler=sdl  ;;
-   *)      AC_MSG_ERROR([invalid sound handler ${enableval} given]) ;;
+   *) sound_handler=none ;;
   esac],
  [sound_handler=sdl]
 )
@@ -409,11 +409,15 @@
 if test "$GCC" = "yes"; then
   CXXFLAGS="$CXXFLAGS \
     -ansi \
+    -pedantic \
+    -Wno-long-long \
     -Wall \
     "
 
   CFLAGS="$CFLAGS \
     -ansi \
+    -pedantic \
+    -Wno-long-long \
     -Wall \
     "
 

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- backend/render_handler_ogl.cpp      16 May 2006 18:29:55 -0000      1.13
+++ backend/render_handler_ogl.cpp      27 Jul 2006 14:54:43 -0000      1.14
@@ -9,10 +9,8 @@
 #include "gnash.h"
 #include "types.h"
 #include "image.h"
-#include "ogl.h"
 #include "utility.h"
-
-#include "log.h"
+#include "tu_opengl_includes.h"
 
 #include <cstring>
 

Index: gui/gtk_glue_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_cairo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/gtk_glue_cairo.cpp      11 Jul 2006 14:48:07 -0000      1.3
+++ gui/gtk_glue_cairo.cpp      27 Jul 2006 14:54:43 -0000      1.4
@@ -37,6 +37,11 @@
 
 #include "gtk_glue_cairo.h"
 
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 8
+# include "gtk_cairo_create.h"
+#endif
+
+
 namespace gnash
 {
 

Index: gui/gtk_glue_cairo.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_cairo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/gtk_glue_cairo.h        11 Jul 2006 14:48:07 -0000      1.3
+++ gui/gtk_glue_cairo.h        27 Jul 2006 14:54:43 -0000      1.4
@@ -41,9 +41,6 @@
 #include <gdk/gdkx.h>
 
 # include <cairo.h>
-# if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 8
-#  include "gtk_cairo_create.h"
-# endif
 
 namespace gnash
 {

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libbase/Makefile.am 26 Jul 2006 17:12:56 -0000      1.31
+++ libbase/Makefile.am 27 Jul 2006 14:54:43 -0000      1.32
@@ -67,12 +67,6 @@
 DMALLOC_FILE = dlmalloc.c
 endif
 
-if USE_RENDERER_OPENGL
-OPENGL_SOURCES = ogl.cpp
-else
-EXTRA_DIST += ogl.cpp
-endif
-
 if HAS_SDL
 SDL_FILE = tu_file_SDL.cpp
 else
@@ -88,7 +82,6 @@
        jpeg.cpp \
        log.cpp \
        membuf.cpp \
-       $(OPENGL_SOURCES) \
        postscript.cpp \
        rc.cpp \
        triangulate_float.cpp \
@@ -120,7 +113,6 @@
        image.h \
        jpeg.h \
        membuf.h \
-       ogl.h \
        log.h \
        postscript.h \
        rc.h \

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/jpeg.cpp    25 Apr 2006 14:43:38 -0000      1.6
+++ libbase/jpeg.cpp    27 Jul 2006 14:54:43 -0000      1.7
@@ -15,6 +15,7 @@
 #if TU_CONFIG_LINK_TO_JPEGLIB
 
 extern "C" {
+#undef HAVE_STDLIB_H
 #include <jpeglib.h>
 }
 

Index: macros/cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/cairo.m4     10 May 2006 09:00:48 -0000      1.5
+++ macros/cairo.m4     27 Jul 2006 14:54:43 -0000      1.6
@@ -100,7 +100,7 @@
         for i in $libslist; do
          if test -f $i/libcairo.a -o -f $i/libcairo.so; then
            if test x"$i" != x"/usr/lib"; then
-             ac_cv_path_cairo_lib="-L$i"
+             ac_cv_path_cairo_lib="-L$i -lcairo"
               AC_MSG_RESULT(${ac_cv_path_cairo_lib})
              break
             else

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- plugin/plugin.cpp   27 Jul 2006 00:15:22 -0000      1.35
+++ plugin/plugin.cpp   27 Jul 2006 14:54:43 -0000      1.36
@@ -361,7 +361,7 @@
               " Height = %d, WindowID = %p, this = %p",
                __FUNCTION__,
               aWindow->x, aWindow->y, aWindow->width, aWindow->height,
-              aWindow->window, this);
+              aWindow->window, static_cast<void*>(this));
     }
 
     // Only for developers. Make the plugin block here so we can
@@ -505,7 +505,7 @@
 {
 //    log_trace("%s: enter for instance %p", __PRETTY_FUNCTION__, this);    
     int len = strlen(stream->url)+1;
-    char tmp[len];
+    char* tmp = new char[len];
     memset(tmp, 0, len);
     string url = stream->url;
     string fname, opts;
@@ -598,6 +598,8 @@
     _swf_file = fname;
     processing = true;
 
+    delete [] tmp;
+
     return NPERR_NO_ERROR;
 }
 

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/shm.cpp      27 Jul 2006 01:47:11 -0000      1.12
+++ server/shm.cpp      27 Jul 2006 14:54:43 -0000      1.13
@@ -140,7 +140,6 @@
 #else
 # ifdef HAVE_SHMGET
     const int shmflg = 0660 | IPC_CREAT | IPC_EXCL;
-    shmid_ds shmInfo;
     _shmkey = 1234567;         // FIXME:
     filespec = "1234567";
     _shmfd = shmget(_shmkey, _size, shmflg);

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/Date.cpp       22 Jul 2006 23:47:56 -0000      1.1
+++ server/asobj/Date.cpp       27 Jul 2006 14:54:43 -0000      1.2
@@ -709,7 +709,7 @@
 void date_tostring(const fn_call& fn) {
        // TODO: I have no idea what the real flash player does, but at least 
this
        // gives something functional for now. Tried to mimic the "date" command
-       char buffer[32];
+       char buffer[128];
        char* monthname[12] =
                
{"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
        char* dayweekname[7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};