/[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 191 Revision 192
31 31
32#ifdef DMALLOC 32#ifdef DMALLOC
33#include "dmalloc.h" 33#include "dmalloc.h"
34#endif 34#endif
35 35
36static Image *get_paint_data_section(psiconv_paint_data_section sec);
37static void image_to_list(psiconv_list list,Image *image,const char *dest);
38static void gen_image_list(const psiconv_config config,psiconv_list list,
39 const psiconv_list sections, const char *dest);
40static void gen_clipart(const psiconv_config config,psiconv_list list,
41 const psiconv_clipart_f f, const char *dest);
42static void gen_mbm(const psiconv_config config,psiconv_list list,
43 const psiconv_mbm_f f, const char *dest);
44static void gen_sketch(const psiconv_config config,psiconv_list list,
45 const psiconv_sketch_f f, const char *dest);
46
36/* This is ridiculously simple using ImageMagick. Without it, it would 47/* This is ridiculously simple using ImageMagick. Without it, it would
37 be quite somewhat harder - it will be left for later on. 48 be quite somewhat harder - it will be left for later on.
38 Note that we ignore any errors. Dangerous... */ 49 Note that we ignore any errors. Dangerous... */
39 50
40static Image *get_paint_data_section(psiconv_paint_data_section sec) 51Image *get_paint_data_section(psiconv_paint_data_section sec)
41{ 52{
42 Image *image; 53 Image *image;
43 float *pixel, *p, *red, *green, *blue; 54 float *pixel, *p, *red, *green, *blue;
44 int x,y; 55 int x,y;
45 ExceptionInfo exc; 56 ExceptionInfo exc;
68 79
69 return image; 80 return image;
70} 81}
71 82
72 83
73static void image_to_list(psiconv_list list,Image *image,const char *dest) 84void image_to_list(psiconv_list list,Image *image,const char *dest)
74{ 85{
75 ImageInfo *image_info; 86 ImageInfo *image_info;
76 ExceptionInfo exc; 87 ExceptionInfo exc;
77 size_t length; 88 size_t length;
78 char *data; 89 char *data;
94 } 105 }
95 DestroyExceptionInfo(&exc); 106 DestroyExceptionInfo(&exc);
96 DestroyImageInfo(image_info); 107 DestroyImageInfo(image_info);
97} 108}
98 109
99static void gen_image_list(const psiconv_config config,psiconv_list list, 110void gen_image_list(const psiconv_config config,psiconv_list list,
100 const psiconv_list sections, const char *dest) 111 const psiconv_list sections, const char *dest)
101{ 112{
102 psiconv_paint_data_section section; 113 psiconv_paint_data_section section;
103 const MagickInfo *mi; 114 const MagickInfo *mi;
104 ImageInfo *image_info; 115 ImageInfo *image_info;
153 if (image != images) 164 if (image != images)
154 DestroyImages(image); 165 DestroyImages(image);
155 DestroyImages(images); 166 DestroyImages(images);
156} 167}
157 168
158static void gen_image_clipart(const psiconv_config config,psiconv_list list, 169void gen_clipart(const psiconv_config config,psiconv_list list,
159 const psiconv_clipart_f f, const char *dest) 170 const psiconv_clipart_f f, const char *dest)
160{ 171{
161 int i; 172 int i;
162 psiconv_list sections; 173 psiconv_list sections;
163 psiconv_clipart_section section; 174 psiconv_clipart_section section;
178 } 189 }
179 gen_image_list(config,list,sections,dest); 190 gen_image_list(config,list,sections,dest);
180 psiconv_list_free(sections); 191 psiconv_list_free(sections);
181} 192}
182 193
183static void gen_image_mbm(const psiconv_config config,psiconv_list list, 194void gen_mbm(const psiconv_config config,psiconv_list list,
184 const psiconv_mbm_f f, const char *dest) 195 const psiconv_mbm_f f, const char *dest)
185{ 196{
186 gen_image_list(config,list,f->sections,dest); 197 gen_image_list(config,list,f->sections,dest);
187} 198}
188 199
189 200
190static void gen_image_sketch(const psiconv_config config,psiconv_list list, 201void gen_sketch(const psiconv_config config,psiconv_list list,
191 const psiconv_sketch_f f, const char *dest) 202 const psiconv_sketch_f f, const char *dest)
192{ 203{
193 Image *image; 204 Image *image;
194 205
195 image = get_paint_data_section(f->sketch_sec->picture); 206 image = get_paint_data_section(f->sketch_sec->picture);
201static int gen_image(psiconv_config config, psiconv_list list, 212static int gen_image(psiconv_config config, psiconv_list list,
202 const psiconv_file file, const char *dest, 213 const psiconv_file file, const char *dest,
203 const encoding encoding_type) 214 const encoding encoding_type)
204{ 215{
205 if (file->type == psiconv_mbm_file) 216 if (file->type == psiconv_mbm_file)
206 gen_image_mbm(config,list,(psiconv_mbm_f) file->file,dest); 217 gen_mbm(config,list,(psiconv_mbm_f) file->file,dest);
207 else if (file->type == psiconv_clipart_file) 218 else if (file->type == psiconv_clipart_file)
208 gen_image_clipart(config,list, 219 gen_clipart(config,list,
209 (psiconv_clipart_f) file->file,dest); 220 (psiconv_clipart_f) file->file,dest);
210 else 221 else
211 if (file->type == psiconv_sketch_file) { 222 if (file->type == psiconv_sketch_file) {
212 gen_image_sketch(config, list,(psiconv_sketch_f) file->file,dest); 223 gen_sketch(config, list,(psiconv_sketch_f) file->file,dest);
213 } else 224 } else
214 return -1; 225 return -1;
215 return 0; 226 return 0;
216} 227}
217 228
223 ff.output = gen_image; 234 ff.output = gen_image;
224 for (mi = GetMagickFileList(); mi ; mi = mi->next) { 235 for (mi = GetMagickFileList(); mi ; mi = mi->next) {
225 if (mi->encoder) { 236 if (mi->encoder) {
226 ff.name = strdup(mi->name); 237 ff.name = strdup(mi->name);
227 ff.description = strdup(mi->description); 238 ff.description = strdup(mi->description);
239 ff.supported_format = FORMAT_CLIPART_SINGLE | FORMAT_MBM_SINGLE |
240 FORMAT_SKETCH;
241 if (mi->adjoin)
242 ff.supported_format |= FORMAT_MBM_MULTIPLE | FORMAT_CLIPART_MULTIPLE;
228 psiconv_list_add(fileformat_list,&ff); 243 psiconv_list_add(fileformat_list,&ff);
229 } 244 }
230 } 245 }
231#endif 246#endif
232} 247}

Legend:
Removed from v.191  
changed lines
  Added in v.192

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