/[public]/psiconv/trunk/program/psiconv/magick-aux.h
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/magick-aux.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 252 Revision 343
1/* 1/*
2 magick-aux.h - Part of psiconv, a PSION 5 file formats converter 2 magick-aux.h - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 Frodo Looijaard <frodo@frodo.looijaard.name>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
19 19
20#include "config.h" 20#include "config.h"
21 21
22#if IMAGEMAGICK 22#if IMAGEMAGICK
23 23
24#if IMAGEMAGICK_OLD 24#if IMAGEMAGICK_API == 1
25 25
26#include <magick/magick.h> 26#include <magick/magick.h>
27
28extern const MagickInfo * GetMagickFileList(void);
29 27
30#else 28#else
31 29
32#include <stdio.h> 30#include <stdio.h>
31#include <stdlib.h>
33#include <time.h> 32#include <time.h>
34#include <magick/api.h> 33#include <magick/api.h>
35 34
36#endif /* IMAGEMAGICK_OLD */ 35#endif /* IMAGEMAGICK_API == 1 */
36
37#if IMAGEMAGICK_API == 100
38
39#define DestroyImages DestroyImageList
40
41#endif
42
43extern const MagickInfo ** GetMagickFileList(void);
37 44
38#endif /* IMAGEMAGICK */ 45#endif /* IMAGEMAGICK */
Legend:
Removed from v.252  
changed lines
  Added in v.343
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26