aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2006-06-21 05:12:43 +0000
committerreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2006-06-21 05:12:43 +0000
commite2c231e75f7d43b712bd881351f09aa4abb0b5c8 (patch)
treed203eaedbde94f56d06abc1a741b37f26662bf30
parentf7f6f13368c7751dd75aefd4878e0e184df3ead4 (diff)
downloadlcd4linux-e2c231e75f7d43b712bd881351f09aa4abb0b5c8.tar.gz
[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
Diffstat (limited to '')
-rw-r--r--drv_Image.c15
-rw-r--r--widget_image.c10
2 files changed, 22 insertions, 3 deletions
diff --git a/drv_Image.c b/drv_Image.c
index 0ee912b..d74f043 100644
--- 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 d4ee1f4..b9d37e7 100644
--- 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