Changeset 2228Tweet

Timestamp:

02/24/08 19:49:39 (5 years ago)

Author:

sam

Message:

• Import image loading features from PWNtcha. As they are more than 4-year old, they will certainly require some cleanup, eg. pkg-config transitions.

Location:

libpipi/trunk

Files:

• .gitignore (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• common.h (added)
• configure.ac (modified) (3 diffs)
• pipi/Makefile.am (modified) (1 diff)
• pipi/io.c (added)
• pipi/pipi.h (modified) (1 diff)
• pipi/pipi_internals.h (added)
• pipi/pixels.c (added)

libpipi/trunk/.gitignore

@@ -1 +1 @@
 aclocal.m4
+autom4te.cache
 configure
 config.h.in
@@ -9 +10 @@
 libtool
 pipi/pipi.pc
+genethumb/genethumb
 stamp-h1
 .auto

libpipi/trunk/Makefile.am

@@ -3 +3 @@
 SUBDIRS = pipi genethumb
 
-EXTRA_DIST = bootstrap
+EXTRA_DIST = bootstrap common.h
 AUTOMAKE_OPTIONS = dist-bzip2
 

libpipi/trunk/configure.ac

@@ -4 +4 @@
 AC_CONFIG_AUX_DIR(.auto)
 AM_INIT_AUTOMAKE([no-define tar-ustar])
-AM_MAINTAINER_MODE
+dnl AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
@@ -26 +26 @@
 AC_C_INLINE
 
-AC_ARG_ENABLE(imlib2,
-  [  --enable-imlib2         Imlib2 graphics support (autodetected)])
-
 AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h)
 
@@ -36 +33 @@
 CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
 
+# Use DevIL?
+#AC_CHECK_HEADERS(IL/il.h,
+# [ac_cv_my_have_il="yes"],
+# [ac_cv_my_have_il="no"])
+#CPPFLAGS="${save_CPPFLAGS}"
+#AM_CONDITIONAL(USE_IL, test "${ac_cv_my_have_il}" = "yes")
+
+# Use Windows?
+#AC_CHECK_HEADERS(olectl.h,
+# [ac_cv_my_have_ole="yes"],
+# [ac_cv_my_have_ole="no"])
+#CPPFLAGS="${save_CPPFLAGS}"
+#AM_CONDITIONAL(USE_OLE, test "${ac_cv_my_have_ole}" = "yes")
+
+# Use SDL?
+ac_cv_my_have_sdl="no"
+save_CPPFLAGS="${CPPFLAGS}"
+AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+if test "${SDL_CONFIG}" != "no"; then
+  CPPFLAGS="${CPPFLAGS} `sdl-config --cflags`"
+fi
+AC_CHECK_HEADERS(SDL_image.h,
+ [ac_cv_my_have_sdl="yes"],
+ [ac_cv_my_have_sdl="no"])
+CPPFLAGS="${save_CPPFLAGS}"
+AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
+
+# Use OpenCV?
+ac_cv_my_have_opencv="no"
+save_CPPFLAGS="${CPPFLAGS}"
+AC_PATH_PROG(OPENCV_CONFIG, opencv-config, no)
+if test "${OPENCV_CONFIG}" != "no"; then
+  CPPFLAGS="${CPPFLAGS} `opencv-config --cflags`"
+fi
+AC_CHECK_HEADERS(cv.h,
+ [ac_cv_my_have_opencv="yes"],
+ [ac_cv_my_have_opencv="no"])
+CPPFLAGS="${save_CPPFLAGS}"
+AM_CONDITIONAL(USE_OPENCV, test "${ac_cv_my_have_opencv}" = "yes")
+
 # Use Imlib2?
-if test "${enable_imlib2}" != "no"; then
-  IMLIB2="no"
-  PKG_CHECK_MODULES(IMLIB2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
-  if test "${IMLIB2}" != "no"; then
-    AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
-  fi
+ac_cv_my_have_imlib2="no"
+IMLIB2="no"
+PKG_CHECK_MODULES(IMLIB2, imlib2, [ac_cv_my_have_imlib2="yes"])
+AC_MSG_RESULT($ac_cv_my_have_imlib2)
+if test "${ac_cv_my_have_imlib2}" != "no"; then
+  AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
+fi
+AM_CONDITIONAL(USE_IMLIB2, test "${ac_cv_my_have_imlib2}" = "yes")
+
+if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no"; then
+  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2 or OpenCV, please install one of them]])
 fi
 

libpipi/trunk/pipi/Makefile.am

@@ -15 +15 @@
         pipi.c \
         pipi.h \
+        pipi_internals.h \
+        io.c \
+        pixels.c \
         $(NULL)
-libpipi_la_CFLAGS = $(IMLIB2_CFLAGS)
-libpipi_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
-libpipi_la_LIBADD = $(IMLIB2_LIBS)
+libpipi_la_CFLAGS = $(CFLAGS_EXTRA)
+libpipi_la_LDFLAGS = $(LDFLAGS_EXTRA) \
+        -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
+endif
+

libpipi/trunk/pipi/pipi.h

@@ +1 @@
+/*
+ *  libpipi       Proper image processing implementation library
+ *  Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
+ *                All Rights Reserved
+ *
+ *  $Id$
+ *
+ *  This library is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
+ */
+
+/*
+ * pipi.h: the full libpipi public API
+ */
+
+#ifndef __PIPI_H__
+#define __PIPI_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef struct pipi_image pipi_image_t;
+
+extern pipi_image_t *pipi_load(const char *name);
+extern pipi_image_t *pipi_new(int width, int height);
+extern pipi_image_t *pipi_copy(const pipi_image_t *img);
+extern void pipi_free(pipi_image_t *img);
+extern void pipi_save(pipi_image_t *img, const char *name);
+
+extern int pipi_getgray(pipi_image_t const *img, int x, int y, int *g);
+extern int pipi_getpixel(pipi_image_t const *img,
+                         int x, int y, int *r, int *g, int *b);
+extern int pipi_setpixel(pipi_image_t *img, int x, int y, int r, int g, int b);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PIPI_H__ */
+