Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / images / io-main.h

diff --git a/images/io-main.h b/images/io-main.h
index c7cfffcc966dac2000869191752e634b2a4a92bc..477c5dd23413b006e8c88255a4c13057d80ce122 100644 (file)
--- a/images/io-main.h
+++ b/images/io-main.h
@@ -1,17 +1,25 @@
 #ifndef _IMAGES_IO_MAIN_H
 #define _IMAGES_IO_MAIN_H
 
+static inline int libjpeg_init(struct image_io *io UNUSED) { return 1; }
+static inline void libjpeg_cleanup(struct image_io *io UNUSED) {}
 int libjpeg_read_header(struct image_io *io);
 int libjpeg_read_data(struct image_io *io);
 int libjpeg_write(struct image_io *io);
 
+static inline int libpng_init(struct image_io *io UNUSED) { return 1; }
+static inline void libpng_cleanup(struct image_io *io UNUSED) {}
 int libpng_read_header(struct image_io *io);
 int libpng_read_data(struct image_io *io);
 int libpng_write(struct image_io *io);
 
+static inline int libungif_init(struct image_io *io UNUSED) { return 1; }
+static inline void libungif_cleanup(struct image_io *io UNUSED) {}
 int libungif_read_header(struct image_io *io);
 int libungif_read_data(struct image_io *io);
 
+int libmagick_init(struct image_io *io);
+void libmagick_cleanup(struct image_io *io);
 int libmagick_read_header(struct image_io *io);
 int libmagick_read_data(struct image_io *io);
 int libmagick_write(struct image_io *io);
@@ -19,7 +27,6 @@ int libmagick_write(struct image_io *io);
 struct image_io_read_data_internals {
   struct image *image;
   int need_transformations;
-  int need_destroy;
 };
 
 struct image *image_io_read_data_prepare(struct image_io_read_data_internals *rdi, struct image_io *io, uns cols, uns rows, uns flags);