[Gnash-commit] gnash gui/fb.cpp gui/Player.cpp ChangeLog

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/17 09:25:59

Modified files:
        gui            : fb.cpp Player.cpp 
        .              : ChangeLog 

Log message:
                * gui/Player.cpp (run): exit with an error if gui initialization
                  failed.
                * gui/fb.cpp (init): return false if pixel format is not
                  supported.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1258&r2=1.1259

Patches:
Index: gui/fb.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/fb.cpp  16 Oct 2006 08:39:27 -0000      1.15
+++ gui/fb.cpp  17 Oct 2006 09:25:59 -0000      1.16
@@ -298,7 +298,8 @@
     agg_handler = create_render_handler_agg("BGR24");
       
   } else {
-    log_msg("ERROR: The pixel format of your framebuffer is not supported.");
+    log_error("The pixel format of your framebuffer is not supported.");
+    return false;
   }
 
   assert(agg_handler!=NULL);

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gui/Player.cpp      16 Oct 2006 16:14:07 -0000      1.19
+++ gui/Player.cpp      17 Oct 2006 09:25:59 -0000      1.20
@@ -294,7 +294,10 @@
        // Initialize gui (we need argc/argv for this)
        // note that this will also initialize the renderer
        // which is *required* during movie loading
-       _gui->init(argc, &argv);
+       if ( ! _gui->init(argc, &argv) )
+       {
+               return EXIT_FAILURE;
+       }
 
        // Set base url for this movie (needed before parsing)
        gnash::set_base_url(URL(_baseurl));

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1258
retrieving revision 1.1259
diff -u -b -r1.1258 -r1.1259
--- ChangeLog   17 Oct 2006 07:02:28 -0000      1.1258
+++ ChangeLog   17 Oct 2006 09:25:59 -0000      1.1259
@@ -1,3 +1,10 @@
+2006-10-17 Sandro Santilli <address@hidden>
+
+       * gui/Player.cpp (run): exit with an error if gui initialization
+         failed.
+       * gui/fb.cpp (init): return false if pixel format is not
+         supported.
+
 2006-10-17 Markus Gothe <address@hidden>
 
        * configure.ac: Added use of AC_LANG{PUSH,POP}(C++).