[gphoto-cvs] SF.net SVN: gphoto:[12871] trunk/libgphoto2/camlibs/ax203/ax203.c

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

Revision: 12871
          http://gphoto.svn.sourceforge.net/gphoto/?rev=12871&view=rev
Author:   marcusmeissner
Date:     2010-03-29 18:34:37 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
HAVE_GD wrapping more

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ax203/ax203.c

Modified: trunk/libgphoto2/camlibs/ax203/ax203.c
===================================================================
--- trunk/libgphoto2/camlibs/ax203/ax203.c	2010-03-29 18:32:46 UTC (rev 12870)
+++ trunk/libgphoto2/camlibs/ax203/ax203.c	2010-03-29 18:34:37 UTC (rev 12871)
@@ -729,6 +729,7 @@
 ax203_decode_image(Camera *camera, char *src, int src_size, int **dest)
 {
 	switch (camera->pl->compression_version) {
+#ifdef HAVE_GD
 	case AX203_COMPRESSION_YUV:
 		ax203_decode_yuv (src, dest, camera->pl->width,
 				  camera->pl->height);
@@ -737,6 +738,14 @@
 		ax203_decode_yuv_delta (src, dest, camera->pl->width,
 					camera->pl->height);
 		return GP_OK;
+#else
+	case AX203_COMPRESSION_YUV:
+	case AX203_COMPRESSION_YUV_DELTA:
+		gp_log (GP_LOG_ERROR, "ax203",
+			"Compression: %d not supported without libgd",
+			camera->pl->compression_version);
+		return GP_ERROR_NOT_SUPPORTED;
+#endif
 	case AX203_COMPRESSION_UNKNOWN:
 		gp_log (GP_LOG_ERROR, "ax203",
 			"Compression: %d not supported yet",
@@ -754,6 +763,7 @@
 	int size;
 
 	switch (camera->pl->compression_version) {
+#ifdef HAVE_GD
 	case AX203_COMPRESSION_YUV:
 		size = camera->pl->width * camera->pl->height;
 		if (dest_size < size)
@@ -768,6 +778,14 @@
 		ax203_encode_yuv_delta (src, dest, camera->pl->width,
 					camera->pl->height);
 		return size;
+#else
+	case AX203_COMPRESSION_YUV:
+	case AX203_COMPRESSION_YUV_DELTA:
+		gp_log (GP_LOG_ERROR, "ax203",
+			"Compression: %d not supported without libgd",
+			camera->pl->compression_version);
+		return GP_ERROR_NOT_SUPPORTED;
+#endif
 	case AX203_COMPRESSION_UNKNOWN:
 		gp_log (GP_LOG_ERROR, "ax203",
 			"Compression: %d not supported yet",


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