/[public]/psiconv/trunk/program/psiconv/gen_image.c
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/gen_image.c

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

Revision 187 Revision 249
1/* 1/*
2 * gen_image.c - Part of psiconv, a PSION 5 file formats converter 2 * gen_image.c - Part of psiconv, a PSION 5 file formats converter
3 * Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> 3 * Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
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.
… …
31 31
32#ifdef DMALLOC 32#ifdef DMALLOC
33#include "dmalloc.h" 33#include "dmalloc.h"
34#endif 34#endif
35 35
36#ifdef IMAGEMAGICK
37static Image *get_paint_data_section(psiconv_paint_data_section sec);
38static void image_to_list(psiconv_list list,Image *image,const char *dest);
39static void gen_image_list(const psiconv_config config,psiconv_list list,
40 const psiconv_list sections, const char *dest);
41static void gen_clipart(const psiconv_config config,psiconv_list list,
42 const psiconv_clipart_f f, const char *dest);
43static void gen_mbm(const psiconv_config config,psiconv_list list,
44 const psiconv_mbm_f f, const char *dest);
45static void gen_sketch(const psiconv_config config,psiconv_list list,
46 const psiconv_sketch_f f, const char *dest);
47static int gen_image(psiconv_config config, psiconv_list list,
48 const psiconv_file file, const char *dest,
49 const encoding encoding_type);
50
36/* This is ridiculously simple using ImageMagick. Without it, it would 51/* This is ridiculously simple using ImageMagick. Without it, it would
37 be quite somewhat harder - it will be left for later on. 52 be quite somewhat harder - it will be left for later on.
38 Note that we ignore any errors. Dangerous... */ 53 Note that we ignore any errors. Dangerous... */
39 54
40static Image *get_paint_data_section(psiconv_paint_data_section sec) 55Image *get_paint_data_section(psiconv_paint_data_section sec)
41{ 56{
42 Image *image; 57 Image *image;
43 float *pixel, *p, *red, *green, *blue; 58 float *pixel, *p, *red, *green, *blue;
44 int x,y; 59 int x,y;
45 ExceptionInfo exc; 60 ExceptionInfo exc;
… …
68 83
69 return image; 84 return image;
70} 85}
71 86
72 87
73static void image_to_list(psiconv_list list,Image *image,const char *dest) 88void image_to_list(psiconv_list list,Image *image,const char *dest)
74{ 89{
75 ImageInfo *image_info; 90 ImageInfo *image_info;
76 ExceptionInfo exc; 91 ExceptionInfo exc;
77 size_t length; 92 size_t length;
78 char *data; 93 char *data;
… …
94 } 109 }
95 DestroyExceptionInfo(&exc); 110 DestroyExceptionInfo(&exc);
96 DestroyImageInfo(image_info); 111 DestroyImageInfo(image_info);
97} 112}
98 113
99static void gen_image_list(const psiconv_config config,psiconv_list list, 114void gen_image_list(const psiconv_config config,psiconv_list list,
100 const psiconv_list sections, const char *dest) 115 const psiconv_list sections, const char *dest)
101{ 116{
102 psiconv_paint_data_section section; 117 psiconv_paint_data_section section;
103 const MagickInfo *mi; 118 const MagickInfo *mi;
104 ImageInfo *image_info; 119 ImageInfo *image_info;
… …
153 if (image != images) 168 if (image != images)
154 DestroyImages(image); 169 DestroyImages(image);
155 DestroyImages(images); 170 DestroyImages(images);
156} 171}
157 172
158static void gen_image_clipart(const psiconv_config config,psiconv_list list, 173void gen_clipart(const psiconv_config config,psiconv_list list,
159 const psiconv_clipart_f f, const char *dest) 174 const psiconv_clipart_f f, const char *dest)
160{ 175{
161 int i; 176 int i;
162 psiconv_list sections; 177 psiconv_list sections;
163 psiconv_clipart_section section; 178 psiconv_clipart_section section;
… …
178 } 193 }
179 gen_image_list(config,list,sections,dest); 194 gen_image_list(config,list,sections,dest);
180 psiconv_list_free(sections); 195 psiconv_list_free(sections);
181} 196}
182 197
183static void gen_image_mbm(const psiconv_config config,psiconv_list list, 198void gen_mbm(const psiconv_config config,psiconv_list list,
184 const psiconv_mbm_f f, const char *dest) 199 const psiconv_mbm_f f, const char *dest)
185{ 200{
186 gen_image_list(config,list,f->sections,dest); 201 gen_image_list(config,list,f->sections,dest);
187} 202}
188 203
189 204
190static void gen_image_sketch(const psiconv_config config,psiconv_list list, 205void gen_sketch(const psiconv_config config,psiconv_list list,
191 const psiconv_sketch_f f, const char *dest) 206 const psiconv_sketch_f f, const char *dest)
192{ 207{
193 Image *image; 208 Image *image;
194 209
195 image = get_paint_data_section(f->sketch_sec->picture); 210 image = get_paint_data_section(f->sketch_sec->picture);
196 image_to_list(list,image,dest); 211 image_to_list(list,image,dest);
197 DestroyImage(image); 212 DestroyImage(image);
198} 213}
199 214
200 215
201static int gen_image(psiconv_config config, psiconv_list list, 216int gen_image(psiconv_config config, psiconv_list list,
202 const psiconv_file file, const char *dest, 217 const psiconv_file file, const char *dest,
203 const encoding encoding_type) 218 const encoding encoding_type)
204{ 219{
205 if (file->type == psiconv_mbm_file) 220 if (file->type == psiconv_mbm_file)
206 gen_image_mbm(config,list,(psiconv_mbm_f) file->file,dest); 221 gen_mbm(config,list,(psiconv_mbm_f) file->file,dest);
207 else if (file->type == psiconv_clipart_file) 222 else if (file->type == psiconv_clipart_file)
208 gen_image_clipart(config,list, 223 gen_clipart(config,list,
209 (psiconv_clipart_f) file->file,dest); 224 (psiconv_clipart_f) file->file,dest);
210 else 225 else
211 if (file->type == psiconv_sketch_file) { 226 if (file->type == psiconv_sketch_file) {
212 gen_image_sketch(config, list,(psiconv_sketch_f) file->file,dest); 227 gen_sketch(config, list,(psiconv_sketch_f) file->file,dest);
213 } else 228 } else
214 return -1; 229 return -1;
215 return 0; 230 return 0;
216} 231}
232
233#endif
217 234
218void init_image(void) 235void init_image(void)
219{ 236{
220 struct fileformat_s ff; 237 struct fileformat_s ff;
221#if IMAGEMAGICK 238#if IMAGEMAGICK
… …
223 ff.output = gen_image; 240 ff.output = gen_image;
224 for (mi = GetMagickFileList(); mi ; mi = mi->next) { 241 for (mi = GetMagickFileList(); mi ; mi = mi->next) {
225 if (mi->encoder) { 242 if (mi->encoder) {
226 ff.name = strdup(mi->name); 243 ff.name = strdup(mi->name);
227 ff.description = strdup(mi->description); 244 ff.description = strdup(mi->description);
245 ff.supported_format = FORMAT_CLIPART_SINGLE | FORMAT_MBM_SINGLE |
246 FORMAT_SKETCH;
247 if (mi->adjoin)
248 ff.supported_format |= FORMAT_MBM_MULTIPLE | FORMAT_CLIPART_MULTIPLE;
228 psiconv_list_add(fileformat_list,&ff); 249 psiconv_list_add(fileformat_list,&ff);
229 } 250 }
230 } 251 }
231#endif 252#endif
232} 253}
Legend:
Removed from v.187  
changed lines
  Added in v.249
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26