CONFIG_LIB* -> CONFIG_IMAGES_LIB*

diff --git a/images/Makefile b/images/Makefile
index 412d959cb0353b42eeb71ce4f2461b995311bac1..a53938bcbcac7def6bf85d0988b53f4d0d7e674a 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -8,22 +8,22 @@ LIBIMAGES_MODS=image scale io-main
 LIBIMAGES=$(o)/images/libimages.$(LS)
 LIBIMAGES_LIBS=
 
-ifdef CONFIG_LIBJPEG
+ifdef CONFIG_IMAGES_LIBJPEG
 LIBIMAGES_MODS+=io-libjpeg
 LIBIMAGES_LIBS+=-ljpeg
 endif
 
-ifdef CONFIG_LIBPNG
+ifdef CONFIG_IMAGES_LIBPNG
 LIBIMAGES_MODS+=io-libpng
 LIBIMAGES_LIBS+=-lpng
 endif
 
-ifdef CONFIG_LIBUNGIF
+ifdef CONFIG_IMAGES_LIBUNGIF
 LIBIMAGES_MODS+=io-libungif
 LIBIMAGES_LIBS+=-lungif
 endif
 
-ifdef CONFIG_LIBMAGICK
+ifdef CONFIG_IMAGES_LIBMAGICK
 LIBIMAGES_MODS+=io-libmagick
 MAGICK_LIBS:=$(shell GraphicsMagick-config --libs)
 LIBIMAGES_LIBS+=$(MAGICK_LIBS)

diff --git a/images/images.h b/images/images.h
index 31c25dc89344c5b8b6c86b85afff903aad701356..4b864c5449c8970589a39db0d77823d4249adfc8 100644 (file)
--- a/images/images.h
+++ b/images/images.h
@@ -151,24 +151,24 @@ enum image_format image_file_name_to_format(byte *file_name);
 
 /* internals */
 
-#ifdef CONFIG_LIBJPEG
+#ifdef CONFIG_IMAGES_LIBJPEG
 int libjpeg_read_header(struct image_io *io);
 int libjpeg_read_data(struct image_io *io);
 int libjpeg_write(struct image_io *io);
 #endif
 
-#ifdef CONFIG_LIBPNG
+#ifdef CONFIG_IMAGES_LIBPNG
 int libpng_read_header(struct image_io *io);
 int libpng_read_data(struct image_io *io);
 int libpng_write(struct image_io *io);
 #endif
 
-#ifdef CONFIG_LIBUNGIF
+#ifdef CONFIG_IMAGES_LIBUNGIF
 int libungif_read_header(struct image_io *io);
 int libungif_read_data(struct image_io *io);
 #endif
 
-#ifdef CONFIG_LIBMAGICK
+#ifdef CONFIG_IMAGES_LIBMAGICK
 int libmagick_read_header(struct image_io *io);
 int libmagick_read_data(struct image_io *io);
 int libmagick_write(struct image_io *io);

diff --git a/images/io-main.c b/images/io-main.c
index ef18e6606b2457865c2a1986f46a6e46cb737f6c..ef4bd7054516f7a0f4d618b8cecf59d759474fe2 100644 (file)
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -72,25 +72,25 @@ image_io_read_header(struct image_io *io)
   image_io_image_destroy(io);
   switch (io->format) {
     case IMAGE_FORMAT_JPEG:
-#if defined(CONFIG_LIBJPEG)
+#if defined(CONFIG_IMAGES_LIBJPEG)
       return libjpeg_read_header(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       return libmagick_read_header(io);
 #endif
       break;
 
     case IMAGE_FORMAT_PNG:
-#if defined(CONFIG_LIBPNG)
+#if defined(CONFIG_IMAGES_LIBPNG)
       return libpng_read_header(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       return libmagick_read_header(io);
 #endif
       break;
 
     case IMAGE_FORMAT_GIF:
-#if defined(CONFIG_LIBUNGIF)
+#if defined(CONFIG_IMAGES_LIBUNGIF)
       return libungif_read_header(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       return libmagick_read_header(io);
 #endif
       break;
@@ -115,9 +115,9 @@ image_io_read_data(struct image_io *io, int ref)
   int result;
   switch (io->format) {
     case IMAGE_FORMAT_JPEG:
-#if defined(CONFIG_LIBJPEG)
+#if defined(CONFIG_IMAGES_LIBJPEG)
       result = libjpeg_read_data(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       result = libmagick_read_data(io);
 #else
       ASSERT(0);
@@ -125,9 +125,9 @@ image_io_read_data(struct image_io *io, int ref)
       break;
 
     case IMAGE_FORMAT_PNG:
-#if defined(CONFIG_LIBPNG)
+#if defined(CONFIG_IMAGES_LIBPNG)
       result = libpng_read_data(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       result = libmagick_read_data(io);
 #else
       ASSERT(0);
@@ -135,9 +135,9 @@ image_io_read_data(struct image_io *io, int ref)
       break;
 
     case IMAGE_FORMAT_GIF:
-#if defined(CONFIG_LIBMAGICK)
+#if defined(CONFIG_IMAGES_LIBUNGIF)
       result = libungif_read_data(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       result = libmagick_read_data(io);
 #else
       ASSERT(0);
@@ -172,23 +172,23 @@ image_io_write(struct image_io *io)
   image_io_read_cancel(io);
   switch (io->format) {
     case IMAGE_FORMAT_JPEG:
-#if defined(CONFIG_LIBJPEG)
+#if defined(CONFIG_IMAGES_LIBJPEG)
       return libjpeg_write(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       return libmagick_write(io);
 #endif
       break;
 
     case IMAGE_FORMAT_PNG:
-#if defined(CONFIG_LIBPNG)
+#if defined(CONFIG_IMAGES_LIBPNG)
       return libpng_write(io);
-#elif defined(CONFIG_LIBMAGICK)
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
       return libmagick_write(io);
 #endif
       break;
 
     case IMAGE_FORMAT_GIF:
-#if defined(CONFIG_LIBMAGICK)
+#if defined(CONFIG_IMAGES_LIBMAGICK)
       return libmagick_write(io);
 #endif
       break;