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

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

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

Revision 254 Revision 255
31 31
32#if IMAGEMAGICK 32#if IMAGEMAGICK
33 33
34/* This used to be very ugly, but nowadays it is much better */ 34/* This used to be very ugly, but nowadays it is much better */
35 35
36#if IMAGEMAGICK_API == 1 || IMAGEMAGICK_API == 2
36const MagickInfo * GetMagickFileList(void) 37const MagickInfo * GetMagickFileList(void)
37{ 38{
38 ExceptionInfo exc; 39 ExceptionInfo exc;
39 GetExceptionInfo(&exc); 40 GetExceptionInfo(&exc);
40 OpenModules(&exc); 41 OpenModules(&exc);
41 return GetMagickInfo(NULL,&exc); 42 return GetMagickInfo(NULL,&exc);
42} 43}
43 44
45#elif IMAGEMAGICK_API == 3
46
47const MagickInfo * GetMagickFileList(void)
48{
49 MagickInfo **mi;
50 unsigned long nr;
51 int i;
52 ExceptionInfo exc;
53 GetExceptionInfo(&exc);
54 OpenModules(&exc);
55 mi = GetMagickInfoList("*",&nr);
56 for (i = 0; i < nr-1; i++) {
57 mi[i]->next = mi[i+1];
58 }
59 return *mi;
60}
61
62#elif IMAGEMAGICK_API == 4
63
64const MagickInfo * GetMagickFileList(void)
65{
66 MagickInfo **mi;
67 unsigned long nr;
68 int i;
69 ExceptionInfo exc;
70 GetExceptionInfo(&exc);
71 OpenModules(&exc);
72 mi = GetMagickInfoList("*",&nr,&exc);
73 for (i = 0; i < nr-1; i++) {
74 mi[i]->next = mi[i+1];
75 }
76 return *mi;
77}
78#endif
79
44#endif /* IMAGEMAGICK */ 80#endif /* IMAGEMAGICK */

Legend:
Removed from v.254  
changed lines
  Added in v.255

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26