[Gnash-commit] gnash ChangeLog gui/gtk_glue_agg.cpp

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/08/02 07:54:33

Modified files:
        .              : ChangeLog 
        gui            : gtk_glue_agg.cpp 

Log message:
        gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change compile-time 
error to runtime error to be multi-GUI friendly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3912&r2=1.3913
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3912
retrieving revision 1.3913
diff -u -b -r1.3912 -r1.3913
--- ChangeLog   2 Aug 2007 06:03:42 -0000       1.3912
+++ ChangeLog   2 Aug 2007 07:54:33 -0000       1.3913
@@ -1,3 +1,8 @@
+2007-08-02 Udo Giacomozzi <address@hidden>
+
+       * gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change 
compile-time
+         error to runtime error to be multi-GUI friendly.
+
 2007-08-02 Sandro Santilli <address@hidden>
 
        * server/asobj/NetConnection.h: remove the unused _owner method.

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gui/gtk_glue_agg.cpp        1 Aug 2007 16:47:04 -0000       1.26
+++ gui/gtk_glue_agg.cpp        2 Aug 2007 07:54:33 -0000       1.27
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.26 2007/08/01 16:47:04 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.27 2007/08/02 07:54:33 udog Exp $ */
 
 
 /// \page gtk_shm_support GTK shared memory extension support
@@ -246,23 +246,31 @@
   
   _bpp = 24;
   strcpy(_pixelformat, "RGB24");
+  return true;
   
 #else
 
 #ifdef PIXELFORMAT_RGB565  // OLPC
 
+#warning A pixel format of RGB565; you must have a (hacked) GTK which supports 
\
+         this format (e.g., GTK on the OLPC).
+                  
   _bpp = 16;
   strcpy(_pixelformat, "RGB565");
+  return true;
   
 #else
 
-#error Missing a supported pixel format for GTK GUI. You probably want to 
configure --with-pixelformat=RGB24   
+#warning GTK GUI requires --with-pixelformat=RGB24 for AGG renderer
+ 
+  printf("Missing a supported pixel format for GTK GUI. You probably want to "
+    "configure --with-pixelformat=RGB24\n");
+  return false;   
 
 #endif  //ifdef PIXELFORMAT_RGB565   
  
 #endif  //ifdef PIXELFORMAT_RGB24
   
-  return true;
   
 }