Changeset 2261Tweet

Timestamp:

Mar 11, 2008, 3:56:32 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Split the image loaders into sdl.c, imlib.c and opencv.c. We'll do something far better, but later.

Location:

libpipi/trunk/pipi

Files:

• Makefile.am (modified) (2 diffs)
• codec (added)
• codec.c (added)
• codec/imlib.c (added)
• codec/opencv.c (added)
• codec/sdl.c (added)
• io.c (deleted)
• pipi_internals.h (modified) (2 diffs)

libpipi/trunk/pipi/Makefile.am

@@ -11 +11 @@
 include_HEADERS = pipi.h
 
+# Conditional sources
+codec_cflags =
+codec_libs =
+codec_sources =
+
+# The main library
 lib_LTLIBRARIES = libpipi.la
 libpipi_la_SOURCES = \
@@ -16 +22 @@
         pipi.h \
         pipi_internals.h \
-        io.c \
         pixels.c \
+        codec.c \
         resize.c \
+        $(codec_sources) \
         $(NULL)
-libpipi_la_CFLAGS = $(CFLAGS_EXTRA)
-libpipi_la_LDFLAGS = $(LDFLAGS_EXTRA) \
+libpipi_la_CFLAGS = $(codec_cflags)
+libpipi_la_LDFLAGS = $(codec_libs) \
         -no-undefined -version-number @LT_VERSION@
 
 if USE_SDL
-CFLAGS_EXTRA = `sdl-config --cflags`
-LDFLAGS_EXTRA = `sdl-config --libs` -lSDL_image
-else
-if USE_IMLIB2
-CFLAGS_EXTRA = @IMLIB2_CFLAGS@
-LDFLAGS_EXTRA = @IMLIB2_LIBS@
-else
-if USE_OPENCV
-CFLAGS_EXTRA = `opencv-config --cflags`
-LDFLAGS_EXTRA = `opencv-config --libs opencv highgui`
-endif
-endif
+codec_cflags += `sdl-config --cflags`
+codec_libs += `sdl-config --libs` -lSDL_image
+codec_sources += codec/sdl.c
 endif
 
+if USE_IMLIB2
+codec_cflags += @IMLIB2_CFLAGS@
+codec_libs += @IMLIB2_LIBS@
+codec_sources += codec/imlib.c
+endif
+
+if USE_OPENCV
+codec_cflags += `opencv-config --cflags`
+codec_libs += `opencv-config --libs opencv highgui`
+codec_sources += codec/opencv.c
+endif
+

libpipi/trunk/pipi/pipi_internals.h

@@ -14 +14 @@
 
 /*
- * pipi_internals.h: internal types
+ *  pipi_internals.h: internal types
  */
 
@@ -27 +27 @@
 };
 
+#ifdef USE_IMLIB2
+pipi_image_t *pipi_load_imlib2(const char *name);
+pipi_image_t *pipi_new_imlib2(int width, int height);
+void pipi_free_imlib2(pipi_image_t *img);
+void pipi_save_imlib2(pipi_image_t *img, const char *name);
+#endif
+
+#ifdef USE_OPENCV
+pipi_image_t *pipi_load_opencv(const char *name);
+pipi_image_t *pipi_new_opencv(int width, int height);
+void pipi_free_opencv(pipi_image_t *img);
+void pipi_save_opencv(pipi_image_t *img, const char *name);
+#endif
+
+#ifdef USE_SDL
+pipi_image_t *pipi_load_sdl(const char *name);
+pipi_image_t *pipi_new_sdl(int width, int height);
+void pipi_free_sdl(pipi_image_t *img);
+void pipi_save_sdl(pipi_image_t *img, const char *name);
+#endif
+
 #endif /* __PIPI_INTERNALS_H__ */