summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-04-10 09:49:29 +0000
committerHans de Goede <hdegoede@redhat.com>2010-04-10 09:49:29 +0000
commitab6430e465b15f5d225e83f640f533632df8b45f (patch)
treef71ccbe5d08974894d7b84f7f6be0046fb484aa0
parent7539ac9327cc056b617c12e2fbe3693e16fc32b9 (diff)
downloadlibgphoto2-ab6430e465b15f5d225e83f640f533632df8b45f.tar.gz
ax203: Simnplify HAVE_GD handling (sync with trunk)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@12945 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/ax203/ax203_compress_jpeg.c2
-rw-r--r--camlibs/ax203/ax203_decode_yuv_delta.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/camlibs/ax203/ax203_compress_jpeg.c b/camlibs/ax203/ax203_compress_jpeg.c
index 2d5fcdc18..1d304b652 100644
--- a/camlibs/ax203/ax203_compress_jpeg.c
+++ b/camlibs/ax203/ax203_compress_jpeg.c
@@ -24,10 +24,12 @@
#include <string.h>
#ifdef HAVE_GD
#include <gd.h>
+#endif
#include "ax203.h"
#include "jpeg_memsrcdest.h"
+#ifdef HAVE_GD
static int
locate_tables_n_write(JOCTET *jpeg, int jpeg_size, JOCTET table_type,
uint8_t *outbuf, int *outc)
diff --git a/camlibs/ax203/ax203_decode_yuv_delta.c b/camlibs/ax203/ax203_decode_yuv_delta.c
index d1985eef1..e61bf9966 100644
--- a/camlibs/ax203/ax203_decode_yuv_delta.c
+++ b/camlibs/ax203/ax203_decode_yuv_delta.c
@@ -367,6 +367,8 @@ ax203_encode_yuv_delta(int **src, char *dest, int width, int height)
}
}
+#endif
+
#ifdef STANDALONE_MAIN
int
@@ -437,4 +439,3 @@ exit:
}
#endif
-#endif