[lcd4linux @ 2006-06-21 05:12:43 by reinelt]

added checks for libgd version 2 (thanks to Sam)

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@664 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_Image.c b/drv_Image.c
index 0ee912b6500365125e172476823f78ed751bb154..d74f0434bc23e65b335e1a921ffed0f2d88d60a1 100644 (file)
--- a/drv_Image.c
+++ b/drv_Image.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Image.c,v 1.17 2006/02/08 04:55:04 reinelt Exp $
+/* $Id: drv_Image.c,v 1.18 2006/06/21 05:12:43 reinelt Exp $
  *
  * new style Image (PPM/PNG) Driver for LCD4Linux 
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_Image.c,v $
+ * Revision 1.18  2006/06/21 05:12:43  reinelt
+ * added checks for libgd version 2 (thanks to Sam)
+ *
  * Revision 1.17  2006/02/08 04:55:04  reinelt
  * moved widget registration to drv_generic_graphic
  *
@@ -108,7 +111,9 @@
 #include <fcntl.h>
 #include <sys/time.h>
 
+
 #ifdef WITH_PNG
+
 #ifdef HAVE_GD_GD_H
 #include <gd/gd.h>
 #else
@@ -119,6 +124,12 @@
 #error "cannot compile PNG driver"
 #endif
 #endif
+
+#if GD2_VERS != 2
+#error "lcd4linux requires libgd version 2"
+#error "cannot compile PNG driver"
+#endif
+
 #endif
 
 
@@ -478,7 +489,7 @@ int drv_IMG_init(const char *section, const __attribute__ ((unused))
 {
     int ret;
 
-    info("%s: %s", Name, "$Revision: 1.17 $");
+    info("%s: %s", Name, "$Revision: 1.18 $");
 
     /* real worker functions */
     drv_generic_graphic_real_blit = drv_IMG_blit;

diff --git a/widget_image.c b/widget_image.c
index d4ee1f43732c5dea7fb9c0731ec53b9715266f79..b9d37e7489ad94fa4d526cdd51cb872a8a210f94 100644 (file)
--- a/widget_image.c
+++ b/widget_image.c
@@ -1,4 +1,4 @@
-/* $Id: widget_image.c,v 1.8 2006/06/20 08:50:59 reinelt Exp $
+/* $Id: widget_image.c,v 1.9 2006/06/21 05:12:43 reinelt Exp $
  *
  * image widget handling
  *
@@ -21,6 +21,9 @@
  *
  *
  * $Log: widget_image.c,v $
+ * Revision 1.9  2006/06/21 05:12:43  reinelt
+ * added checks for libgd version 2 (thanks to Sam)
+ *
  * Revision 1.8  2006/06/20 08:50:59  reinelt
  * widget_image linker error hopefully finally fixed
  *
@@ -84,6 +87,11 @@
 #endif
 #endif
 
+#if GD2_VERS != 2
+#error "lcd4linux requires libgd version 2"
+#error "cannot compile image widget"
+#endif
+
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif