[gphoto-cvs] SF.net SVN: gphoto:[14469] trunk/libgphoto2/camlibs/tp6801

[<mar...@us...>]

Revision: 14469
          http://sourceforge.net/p/gphoto/code/14469
Author:   marcusmeissner
Date:     2013-06-28 21:07:04 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
HAVE_GD -> HAVE_LIBGD

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/tp6801/library.c
    trunk/libgphoto2/camlibs/tp6801/tp6801.c

Modified: trunk/libgphoto2/camlibs/tp6801/library.c
===================================================================
--- trunk/libgphoto2/camlibs/tp6801/library.c	2013-06-28 21:06:24 UTC (rev 14468)
+++ trunk/libgphoto2/camlibs/tp6801/library.c	2013-06-28 21:07:04 UTC (rev 14469)
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 #include <gd.h>
 #endif
 
@@ -161,7 +161,7 @@
 {
 	Camera *camera = data;
 	int idx, size;
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 	int ret;
 	gdImagePtr im;
 	void *gdpng;
@@ -183,7 +183,7 @@
 		return GP_OK;
 	}
 
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 	if (type != GP_FILE_TYPE_NORMAL)
 		return GP_ERROR_NOT_SUPPORTED;
 
@@ -221,7 +221,7 @@
 put_file_func (CameraFilesystem *fs, const char *folder, const char *name, 
 	CameraFileType type, CameraFile *file, void *data, GPContext *context)
 {
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 	Camera *camera = data;
 	char *filedata = NULL;
 	int ret, in_width, in_height, in_x, in_y;

Modified: trunk/libgphoto2/camlibs/tp6801/tp6801.c
===================================================================
--- trunk/libgphoto2/camlibs/tp6801/tp6801.c	2013-06-28 21:06:24 UTC (rev 14468)
+++ trunk/libgphoto2/camlibs/tp6801/tp6801.c	2013-06-28 21:07:04 UTC (rev 14469)
@@ -30,7 +30,7 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 #include <gd.h>
 #endif
 
@@ -373,7 +373,7 @@
 static int
 tp6801_decode_image(Camera *camera, char *_src, int **dest)
 {
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 	int x, y;
 	unsigned char *src = (unsigned char *)_src;
 
@@ -401,7 +401,7 @@
 static int
 tp6801_encode_image(Camera *camera, int **src, char *dest)
 {
-#ifdef HAVE_GD
+#ifdef HAVE_LIBGD
 	int x, y;
 
 	for (y = 0; y < camera->pl->height; y++) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.