/[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 58 Revision 192
… …
18 */ 18 */
19 19
20#include "config.h" 20#include "config.h"
21#include "psiconv/data.h" 21#include "psiconv/data.h"
22#include "gen.h" 22#include "gen.h"
23#include "psiconv.h"
23#include <string.h> 24#include <string.h>
24#include "psiconv.h" 25#include <stdlib.h>
25 26
26#if IMAGEMAGICK 27#ifdef IMAGEMAGICK
27#include "magick-aux.h" 28#include "magick-aux.h"
28#include <magick/magick.h> 29#include <magick/magick.h>
30#endif
29 31
30static void set_filename(char *dest,const char *type, const char *name) 32#ifdef DMALLOC
31{ 33#include "dmalloc.h"
32 int len; 34#endif
33 strcpy(dest,type); 35
34 len = strlen(dest); 36static Image *get_paint_data_section(psiconv_paint_data_section sec);
35 dest[len] = ':'; 37static void image_to_list(psiconv_list list,Image *image,const char *dest);
36 strcpy(dest + len + 1,name); 38static void gen_image_list(const psiconv_config config,psiconv_list list,
37} 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);
38 46
39/* This is ridiculously simple using ImageMagick. Without it, it would 47/* This is ridiculously simple using ImageMagick. Without it, it would
40 be quite somewhat harder - it will be left for later on. 48 be quite somewhat harder - it will be left for later on.
41 Note that we ignore any errors. Dangerous... */ 49 Note that we ignore any errors. Dangerous... */
42 50
43static Image *get_paint_data_section(psiconv_paint_data_section sec) 51Image *get_paint_data_section(psiconv_paint_data_section sec)
44{ 52{
45 Image *image; 53 Image *image;
46 float *pixel, *p, *red, *green, *blue; 54 float *pixel, *p, *red, *green, *blue;
47 int x,y; 55 int x,y;
48 ExceptionInfo exc; 56 ExceptionInfo exc;
… …
57 *p++ = *red++; 65 *p++ = *red++;
58 *p++ = *green++; 66 *p++ = *green++;
59 *p++ = *blue++; 67 *p++ = *blue++;
60 } 68 }
61 } 69 }
70
62 image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exc); 71 image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exc);
63 if (! image) { 72 if (! image || (exc.severity != UndefinedException)) {
64 MagickError(exc.severity,exc.message,exc.qualifier); 73 MagickError(exc.severity,exc.reason,exc.description);
74 exit(1);
65 } 75 }
66 free(pixel); 76 free(pixel);
67 77
78 DestroyExceptionInfo(&exc);
79
68 return image; 80 return image;
69} 81}
70 82
71#endif
72 83
73static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f, 84void image_to_list(psiconv_list list,Image *image,const char *dest)
74 const char *dest)
75{ 85{
76#if IMAGEMAGICK 86 ImageInfo *image_info;
87 ExceptionInfo exc;
88 size_t length;
89 char *data;
90 int i;
91
92 strcpy(image->magick,dest);
93 image_info = CloneImageInfo(NULL);
94 GetExceptionInfo(&exc);
95 data = ImageToBlob(image_info,image,&length,&exc);
96 if (!data || (exc.severity != UndefinedException)) {
97 MagickError(exc.severity,exc.reason,exc.description);
98 exit(1);
99 }
100 for (i = 0; i < length; i++) {
101 if (psiconv_list_add(list,data+i)) {
102 fprintf(stderr,"Out of memory error");
103 exit(1);
104 }
105 }
106 DestroyExceptionInfo(&exc);
107 DestroyImageInfo(image_info);
108}
109
110void gen_image_list(const psiconv_config config,psiconv_list list,
111 const psiconv_list sections, const char *dest)
112{
77 psiconv_clipart_section section; 113 psiconv_paint_data_section section;
78 MagickInfo *mi = GetMagickInfo(dest); 114 const MagickInfo *mi;
79 ImageInfo *image_info; 115 ImageInfo *image_info;
80 Image *image = NULL; 116 Image *image = NULL;
81 Image *last_image = NULL; 117 Image *last_image = NULL;
82 Image *this_image, *images; 118 Image *this_image, *images;
83 ExceptionInfo exc; 119 ExceptionInfo exc;
84 int i; 120 int i;
85 unsigned int status; 121
122 GetExceptionInfo(&exc);
123 mi = GetMagickInfo(dest,&exc);
124 if (!mi || (exc.severity != UndefinedException)) {
125 MagickError(exc.severity,exc.reason,exc.description);
126 exit(1);
86 127 }
128
87 if ((psiconv_list_length(f->sections) < 1) || 129 if ((psiconv_list_length(sections) < 1) ||
88 ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin))) 130 ((psiconv_list_length(sections)) > 1 && ! (mi->adjoin))) {
89#endif 131 fprintf(stderr,"This image type supports only one image\n");
90 return -1; 132 exit(1);
91#if IMAGEMAGICK 133 }
134
92 for (i = 0; i < psiconv_list_length(f->sections); i++) { 135 for (i = 0; i < psiconv_list_length(sections); i++) {
93 section = psiconv_list_get(f->sections,i); 136 if (!(section = psiconv_list_get(sections,i))) {
137 fprintf(stderr,"Internal data structures corrupted\n");
138 exit(1);
139 }
94 this_image = get_paint_data_section(section->picture); 140 this_image = get_paint_data_section(section);
95 if (! image) { 141 if (! image) {
96 image = this_image; 142 image = this_image;
97 } else { 143 } else {
98 last_image->next=this_image; 144 last_image->next=this_image;
99 this_image->previous=last_image; 145 this_image->previous=last_image;
100 } 146 }
101 last_image = this_image; 147 last_image = this_image;
102 } 148 }
103 149
104 GetExceptionInfo(&exc);
105 image_info = CloneImageInfo(NULL); 150 image_info = CloneImageInfo(NULL);
106 set_filename(image->filename,dest,filename); 151 if (image->next) {
107 images = CoalesceImages(image,&exc); 152 images = CoalesceImages(image,&exc);
108 if (! images) 153 if (!images || (exc.severity != UndefinedException)) {
109 CatchImageException(image); 154 MagickError(exc.severity,exc.reason,exc.description);
155 exit(1);
156 }
157 } else
158 images = image;
110 159
111 status = WriteImage(image_info,images); 160 image_to_list(list,image,dest);
112 if (!status) 161
113 CatchImageException(images); 162 DestroyExceptionInfo(&exc);
114 DestroyImageInfo(image_info); 163 DestroyImageInfo(image_info);
164 if (image != images)
115 DestroyImages(image); 165 DestroyImages(image);
116 DestroyImages(images); 166 DestroyImages(images);
117 return 0;
118#endif
119} 167}
120 168
121static int psiconv_gen_image_mbm(const char *filename, psiconv_mbm_f f, 169void gen_clipart(const psiconv_config config,psiconv_list list,
122 const char *dest) 170 const psiconv_clipart_f f, const char *dest)
123{ 171{
124#if IMAGEMAGICK
125 psiconv_paint_data_section section;
126 MagickInfo *mi = GetMagickInfo(dest);
127 ImageInfo *image_info;
128 Image *image = NULL;
129 Image *last_image = NULL;
130 Image *this_image, *images;
131 ExceptionInfo exc;
132 int i; 172 int i;
133 unsigned int status; 173 psiconv_list sections;
174 psiconv_clipart_section section;
175
176 if (!(sections = psiconv_list_new(sizeof(*section->picture)))) {
177 fprintf(stderr,"Out of memory error\n");
178 exit(1);
134 179 }
135 if ((psiconv_list_length(f->sections) < 1) ||
136 ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin)))
137#endif
138 return -1;
139#if IMAGEMAGICK
140 for (i = 0; i < psiconv_list_length(f->sections); i++) { 180 for (i = 0; i < psiconv_list_length(f->sections); i ++) {
141 section = psiconv_list_get(f->sections,i); 181 if (!(section = psiconv_list_get(f->sections,i))) {
142 this_image = get_paint_data_section(section); 182 fprintf(stderr,"Internal data structures corrupted\n");
143 if (! image) { 183 exit(1);
144 image = this_image;
145 this_image->scene=1;
146 } else {
147 last_image->next=this_image;
148 this_image->previous=last_image;
149 }
150 last_image = this_image;
151 } 184 }
152 185 if ((psiconv_list_add(sections,section->picture))) {
153 GetExceptionInfo(&exc); 186 fprintf(stderr,"Out of memory error\n");
154 image_info = CloneImageInfo(NULL); 187 exit(1);
155 set_filename(image->filename,dest,filename); 188 }
156 images = CoalesceImages(image,&exc); 189 }
157 if (! images) 190 gen_image_list(config,list,sections,dest);
158 CatchImageException(image); 191 psiconv_list_free(sections);
159
160 status = WriteImage(image_info,images);
161 if (!status)
162 CatchImageException(images);
163 DestroyImageInfo(image_info);
164 DestroyImages(image);
165 DestroyImages(images);
166 return 0;
167#endif
168} 192}
169 193
170static void psiconv_gen_image_sketch(const char *filename, psiconv_sketch_f f, 194void gen_mbm(const psiconv_config config,psiconv_list list,
171 const char *dest) 195 const psiconv_mbm_f f, const char *dest)
172{ 196{
173#if IMAGEMAGICK 197 gen_image_list(config,list,f->sections,dest);
174 ImageInfo *image_info; 198}
199
200
201void gen_sketch(const psiconv_config config,psiconv_list list,
202 const psiconv_sketch_f f, const char *dest)
203{
175 Image *image; 204 Image *image;
176 205
177 image = get_paint_data_section(f->sketch_sec->picture); 206 image = get_paint_data_section(f->sketch_sec->picture);
178 image_info = CloneImageInfo(NULL); 207 image_to_list(list,image,dest);
179 set_filename(image->filename,dest,filename);
180 WriteImage(image_info,image);
181 DestroyImageInfo(image_info);
182 DestroyImage(image); 208 DestroyImage(image);
183#endif
184} 209}
185 210
186static int psiconv_gen_image(const char * filename, const psiconv_file file, 211
187 const char *dest) 212static int gen_image(psiconv_config config, psiconv_list list,
213 const psiconv_file file, const char *dest,
214 const encoding encoding_type)
188{ 215{
189 if (file->type == psiconv_mbm_file) 216 if (file->type == psiconv_mbm_file)
190 psiconv_gen_image_mbm(filename,(psiconv_mbm_f) file->file,dest); 217 gen_mbm(config,list,(psiconv_mbm_f) file->file,dest);
191 if (file->type == psiconv_clipart_file) 218 else if (file->type == psiconv_clipart_file)
192 psiconv_gen_image_clipart(filename,(psiconv_clipart_f) file->file,dest); 219 gen_clipart(config,list,
220 (psiconv_clipart_f) file->file,dest);
221 else
193 else if (file->type == psiconv_sketch_file) { 222 if (file->type == psiconv_sketch_file) {
194 psiconv_gen_image_sketch(filename,(psiconv_sketch_f) file->file,dest); 223 gen_sketch(config, list,(psiconv_sketch_f) file->file,dest);
195 } else 224 } else
196 return -1; 225 return -1;
197 return 0; 226 return 0;
198} 227}
199 228
200void init_image(void) 229void init_image(void)
201{ 230{
202 struct psiconv_fileformat_s ff; 231 struct fileformat_s ff;
203#if IMAGEMAGICK 232#if IMAGEMAGICK
204 MagickInfo *mi; 233 const MagickInfo *mi;
205 ff.output = psiconv_gen_image; 234 ff.output = gen_image;
206 for (mi = GetMagickFileList(); mi ; mi = mi->next) { 235 for (mi = GetMagickFileList(); mi ; mi = mi->next) {
207 if (mi->encoder) { 236 if (mi->encoder) {
208 ff.name = strdup(mi->tag); 237 ff.name = strdup(mi->name);
209 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;
210 psiconv_list_add(fileformat_list,&ff); 243 psiconv_list_add(fileformat_list,&ff);
211 } 244 }
212 } 245 }
213#endif 246#endif
214} 247}
Legend:
Removed from v.58  
changed lines
  Added in v.192
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26