Changeset 1255


Ignore:
Timestamp:
Oct 29, 2006, 9:06:27 AM (13 years ago)
Author:
Sam Hocevar
Message:
  • Fix broken Imlib2 support in cacaview.
Location:
libcaca/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r1225 r1255  
    279279    AC_MSG_ERROR([[cannot find Imlib2 development files. Without Imlib2, cacaview will only open BMP files; if this is really what you want, re-run configure with '--disable-imlib2'.]])
    280280  fi
     281  AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
    281282fi
    282283
  • libcaca/trunk/src/cacaview.c

    r1049 r1255  
    335335        else if(!im)
    336336        {
    337 #if defined(HAVE_IMLIB2_H)
     337#if defined(USE_IMLIB2)
    338338#   define ERROR_STRING " Error loading `%s'. "
    339339#else
  • libcaca/trunk/src/common-image.c

    r1048 r1255  
    2121#endif
    2222
    23 #if defined(HAVE_IMLIB2_H)
     23#if defined(USE_IMLIB2)
    2424#   include <Imlib2.h>
    2525#else
     
    3232#include "common-image.h"
    3333
    34 #if !defined(HAVE_IMLIB2_H)
     34#if !defined(USE_IMLIB2)
    3535static unsigned int u32fread(FILE *);
    3636static unsigned int u16fread(FILE *);
     
    4343    unsigned int depth, bpp, rmask, gmask, bmask, amask;
    4444
    45 #if defined(HAVE_IMLIB2_H)
     45#if defined(USE_IMLIB2)
    4646    Imlib_Image image;
    4747
     
    265265void unload_image(struct image * im)
    266266{
    267 #if defined(HAVE_IMLIB2_H)
     267#if defined(USE_IMLIB2)
    268268    /* Imlib_Image image = (Imlib_Image)im->priv; */
    269269    imlib_free_image();
     
    274274}
    275275
    276 #if !defined(HAVE_IMLIB2_H)
     276#if !defined(USE_IMLIB2)
    277277static unsigned int u32fread(FILE *fp)
    278278{
Note: See TracChangeset for help on using the changeset viewer.