Changeset 2228 for libpipi


Ignore:
Timestamp:
Feb 24, 2008, 7:49:39 PM (12 years ago)
Author:
Sam Hocevar
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:
4 added
5 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/.gitignore

    r2227 r2228  
    11aclocal.m4
     2autom4te.cache
    23configure
    34config.h.in
     
    910libtool
    1011pipi/pipi.pc
     12genethumb/genethumb
    1113stamp-h1
    1214.auto
  • libpipi/trunk/Makefile.am

    r2227 r2228  
    33SUBDIRS = pipi genethumb
    44
    5 EXTRA_DIST = bootstrap
     5EXTRA_DIST = bootstrap common.h
    66AUTOMAKE_OPTIONS = dist-bzip2
    77
  • libpipi/trunk/configure.ac

    r2227 r2228  
    44AC_CONFIG_AUX_DIR(.auto)
    55AM_INIT_AUTOMAKE([no-define tar-ustar])
    6 AM_MAINTAINER_MODE
     6dnl AM_MAINTAINER_MODE
    77
    88AM_CONFIG_HEADER(config.h)
     
    2626AC_C_INLINE
    2727
    28 AC_ARG_ENABLE(imlib2,
    29   [  --enable-imlib2         Imlib2 graphics support (autodetected)])
    30 
    3128AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h)
    3229
     
    3633CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
    3734
     35# Use DevIL?
     36#AC_CHECK_HEADERS(IL/il.h,
     37# [ac_cv_my_have_il="yes"],
     38# [ac_cv_my_have_il="no"])
     39#CPPFLAGS="${save_CPPFLAGS}"
     40#AM_CONDITIONAL(USE_IL, test "${ac_cv_my_have_il}" = "yes")
     41
     42# Use Windows?
     43#AC_CHECK_HEADERS(olectl.h,
     44# [ac_cv_my_have_ole="yes"],
     45# [ac_cv_my_have_ole="no"])
     46#CPPFLAGS="${save_CPPFLAGS}"
     47#AM_CONDITIONAL(USE_OLE, test "${ac_cv_my_have_ole}" = "yes")
     48
     49# Use SDL?
     50ac_cv_my_have_sdl="no"
     51save_CPPFLAGS="${CPPFLAGS}"
     52AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
     53if test "${SDL_CONFIG}" != "no"; then
     54  CPPFLAGS="${CPPFLAGS} `sdl-config --cflags`"
     55fi
     56AC_CHECK_HEADERS(SDL_image.h,
     57 [ac_cv_my_have_sdl="yes"],
     58 [ac_cv_my_have_sdl="no"])
     59CPPFLAGS="${save_CPPFLAGS}"
     60AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
     61
     62# Use OpenCV?
     63ac_cv_my_have_opencv="no"
     64save_CPPFLAGS="${CPPFLAGS}"
     65AC_PATH_PROG(OPENCV_CONFIG, opencv-config, no)
     66if test "${OPENCV_CONFIG}" != "no"; then
     67  CPPFLAGS="${CPPFLAGS} `opencv-config --cflags`"
     68fi
     69AC_CHECK_HEADERS(cv.h,
     70 [ac_cv_my_have_opencv="yes"],
     71 [ac_cv_my_have_opencv="no"])
     72CPPFLAGS="${save_CPPFLAGS}"
     73AM_CONDITIONAL(USE_OPENCV, test "${ac_cv_my_have_opencv}" = "yes")
     74
    3875# Use Imlib2?
    39 if test "${enable_imlib2}" != "no"; then
    40   IMLIB2="no"
    41   PKG_CHECK_MODULES(IMLIB2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
    42   if test "${IMLIB2}" != "no"; then
    43     AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
    44   fi
     76ac_cv_my_have_imlib2="no"
     77IMLIB2="no"
     78PKG_CHECK_MODULES(IMLIB2, imlib2, [ac_cv_my_have_imlib2="yes"])
     79AC_MSG_RESULT($ac_cv_my_have_imlib2)
     80if test "${ac_cv_my_have_imlib2}" != "no"; then
     81  AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
     82fi
     83AM_CONDITIONAL(USE_IMLIB2, test "${ac_cv_my_have_imlib2}" = "yes")
     84
     85if 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
     86  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2 or OpenCV, please install one of them]])
    4587fi
    4688
  • libpipi/trunk/pipi/Makefile.am

    r2227 r2228  
    1515        pipi.c \
    1616        pipi.h \
     17        pipi_internals.h \
     18        io.c \
     19        pixels.c \
    1720        $(NULL)
    18 libpipi_la_CFLAGS = $(IMLIB2_CFLAGS)
    19 libpipi_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
    20 libpipi_la_LIBADD = $(IMLIB2_LIBS)
     21libpipi_la_CFLAGS = $(CFLAGS_EXTRA)
     22libpipi_la_LDFLAGS = $(LDFLAGS_EXTRA) \
     23        -no-undefined -version-number @LT_VERSION@
    2124
     25if USE_SDL
     26CFLAGS_EXTRA = `sdl-config --cflags`
     27LDFLAGS_EXTRA = `sdl-config --libs` -lSDL_image
     28else
     29if USE_IMLIB2
     30CFLAGS_EXTRA = @IMLIB2_CFLAGS@
     31LDFLAGS_EXTRA = @IMLIB2_LIBS@
     32else
     33if USE_OPENCV
     34CFLAGS_EXTRA = `opencv-config --cflags`
     35LDFLAGS_EXTRA = `opencv-config --libs opencv highgui`
     36endif
     37endif
     38endif
     39
  • libpipi/trunk/pipi/pipi.h

    r2227 r2228  
     1/*
     2 *  libpipi       Proper image processing implementation library
     3 *  Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
     4 *                All Rights Reserved
     5 *
     6 *  $Id$
     7 *
     8 *  This library is free software. It comes without any warranty, to
     9 *  the extent permitted by applicable law. You can redistribute it
     10 *  and/or modify it under the terms of the Do What The Fuck You Want
     11 *  To Public License, Version 2, as published by Sam Hocevar. See
     12 *  http://sam.zoy.org/wtfpl/COPYING for more details.
     13 */
     14
     15/*
     16 * pipi.h: the full libpipi public API
     17 */
     18
     19#ifndef __PIPI_H__
     20#define __PIPI_H__
     21
     22#ifdef __cplusplus
     23extern "C"
     24{
     25#endif
     26
     27typedef struct pipi_image pipi_image_t;
     28
     29extern pipi_image_t *pipi_load(const char *name);
     30extern pipi_image_t *pipi_new(int width, int height);
     31extern pipi_image_t *pipi_copy(const pipi_image_t *img);
     32extern void pipi_free(pipi_image_t *img);
     33extern void pipi_save(pipi_image_t *img, const char *name);
     34
     35extern int pipi_getgray(pipi_image_t const *img, int x, int y, int *g);
     36extern int pipi_getpixel(pipi_image_t const *img,
     37                         int x, int y, int *r, int *g, int *b);
     38extern int pipi_setpixel(pipi_image_t *img, int x, int y, int r, int g, int b);
     39
     40#ifdef __cplusplus
     41}
     42#endif
     43
     44#endif /* __PIPI_H__ */
     45
Note: See TracChangeset for help on using the changeset viewer.