[Gnash-commit] gnash ChangeLog gui/gtk_glue_gtkglext.cpp gui/g...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/08/09 11:47:30

Modified files:
        .              : ChangeLog 
        gui            : gtk_glue_gtkglext.cpp gui.cpp 

Log message:
                * gui/gtk_glue_gtkglext.cpp: Fix typo. Properly dereference the
                argument to getopt().
                * gui/gui.cpp: Remove an unused variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.609&r2=1.610
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -b -r1.609 -r1.610
--- ChangeLog   9 Aug 2006 01:59:06 -0000       1.609
+++ ChangeLog   9 Aug 2006 11:47:29 -0000       1.610
@@ -1,3 +1,9 @@
+2006-08-09 Bastiaan Jacques <address@hidden>
+
+       * gui/gtk_glue_gtkglext.cpp: Fix typo. Properly dereference the
+       argument to getopt().
+       * gui/gui.cpp: Remove an unused variable.
+
 2006-08-08  Rob Savoye  <address@hidden>
 
        * macros/atk.m4, curl.m4, glib.m4, gtk2.m4, jpeg.m4, libXML.m4,
@@ -13,7 +19,7 @@
        * server/asobj/Math.h: Renamed to Gmath.h to avoid a name
        collision on Darwin.
 
-2006-08-08 Vitaly Alexeev <address@hidden>
+2006-08-08 Vitaly Alexeev <address@hidden>
 
        * gui\gnash.cpp: ported to win32
        * gui\NullGui.cpp:  ported to win32

Index: gui/gtk_glue_gtkglext.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gui/gtk_glue_gtkglext.cpp   11 Jul 2006 14:48:07 -0000      1.5
+++ gui/gtk_glue_gtkglext.cpp   9 Aug 2006 11:47:30 -0000       1.6
@@ -48,7 +48,7 @@
 
 GtkGlExtGlue::GtkGlExtGlue()
 #ifdef FIX_I810_LOD_BIAS
-  : tex_lod_bias(-1.2f)
+  : _tex_lod_bias(-1.2f)
 #endif
 {
 //    GNASH_REPORT_FUNCTION;
@@ -70,11 +70,11 @@
 }
 
 bool
-GtkGlExtGlue::init(int argc, char **argv[])
+GtkGlExtGlue::init(int argc, char** argv[])
 {
 //    GNASH_REPORT_FUNCTION;
 #ifdef FIX_I810_LOD_BIAS
-    int c = getopt (argc, argv, "m:");
+    int c = getopt (argc, *argv, "m:");
     if (c == 'm') {
       _tex_lod_bias = (float) atof(optarg);
     }

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gui/gui.cpp 7 Aug 2006 18:35:23 -0000       1.12
+++ gui/gui.cpp 9 Aug 2006 11:47:30 -0000       1.13
@@ -59,9 +59,6 @@
     _height(0),
     _scale(1.0f),
     _depth(16)
-#if defined(FIX_I810_LOD_BIAS)
-   ,_tex_lod_bias(-1.2f)
-#endif
 {
 //    GNASH_REPORT_FUNCTION;
 }
@@ -73,9 +70,6 @@
     _height(0),
     _scale(scale),
     _depth(depth)
-#if defined(FIX_I810_LOD_BIAS)
-   ,_tex_lod_bias(-1.2f)
-#endif
 {
 }