/[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 118 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;
… …
59 *p++ = *blue++; 67 *p++ = *blue++;
60 } 68 }
61 } 69 }
62 70
63 image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exc); 71 image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exc);
64 if (! image) { 72 if (! image || (exc.severity != UndefinedException)) {
65 MagickError(exc.severity,exc.reason,exc.description); 73 MagickError(exc.severity,exc.reason,exc.description);
74 exit(1);
66 } 75 }
67 free(pixel); 76 free(pixel);
68 77
78 DestroyExceptionInfo(&exc);
79
69 return image; 80 return image;
70} 81}
71 82
72#endif
73 83
74static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f, 84void image_to_list(psiconv_list list,Image *image,const char *dest)
75 const char *dest)
76{ 85{
77#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{
78 psiconv_clipart_section section; 113 psiconv_paint_data_section section;
79 MagickInfo *mi; 114 const MagickInfo *mi;
80 ImageInfo *image_info; 115 ImageInfo *image_info;
81 Image *image = NULL; 116 Image *image = NULL;
82 Image *last_image = NULL; 117 Image *last_image = NULL;
83 Image *this_image, *images; 118 Image *this_image, *images;
84 ExceptionInfo exc; 119 ExceptionInfo exc;
85 int i; 120 int i;
86 unsigned int status;
87 121
88 GetExceptionInfo(&exc); 122 GetExceptionInfo(&exc);
89 if (!(mi = GetMagickInfo(dest,&exc))) 123 mi = GetMagickInfo(dest,&exc);
90 return -1; 124 if (!mi || (exc.severity != UndefinedException)) {
125 MagickError(exc.severity,exc.reason,exc.description);
126 exit(1);
91 127 }
128
92 if ((psiconv_list_length(f->sections) < 1) || 129 if ((psiconv_list_length(sections) < 1) ||
93 ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin))) 130 ((psiconv_list_length(sections)) > 1 && ! (mi->adjoin))) {
94#endif 131 fprintf(stderr,"This image type supports only one image\n");
95 return -1; 132 exit(1);
96#if IMAGEMAGICK 133 }
134
97 for (i = 0; i < psiconv_list_length(f->sections); i++) { 135 for (i = 0; i < psiconv_list_length(sections); i++) {
98 section = psiconv_list_get(f->sections,i); 136 if (!(section = psiconv_list_get(sections,i))) {
99 this_image = get_paint_data_section(section->picture); 137 fprintf(stderr,"Internal data structures corrupted\n");
100 if (! image) { 138 exit(1);
101 image = this_image;
102 } else {
103 last_image->next=this_image;
104 this_image->previous=last_image;
105 }
106 last_image = this_image;
107 } 139 }
108
109 image_info = CloneImageInfo(NULL);
110 set_filename(image->filename,dest,filename);
111 if (image->next)
112 images = CoalesceImages(image,&exc);
113 else
114 images = image;
115 if (! images)
116 CatchImageException(image);
117
118 status = WriteImage(image_info,images);
119 if (!status)
120 CatchImageException(images);
121 DestroyImageInfo(image_info);
122 if (image != images)
123 DestroyImages(image);
124 DestroyImages(images);
125 return 0;
126#endif
127}
128
129static int psiconv_gen_image_mbm(const char *filename, psiconv_mbm_f f,
130 const char *dest)
131{
132
133#if IMAGEMAGICK
134 psiconv_paint_data_section section;
135 MagickInfo *mi;
136 ImageInfo *image_info;
137 Image *image = NULL;
138 Image *last_image = NULL;
139 Image *this_image, *images;
140 ExceptionInfo exc;
141 int i;
142 unsigned int status;
143
144 GetExceptionInfo(&exc);
145 if (!(mi = GetMagickInfo(dest,&exc)))
146 return -1;
147
148 if ((psiconv_list_length(f->sections) < 1) ||
149 ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin)))
150#endif
151 return -1;
152#if IMAGEMAGICK
153
154 for (i = 0; i < psiconv_list_length(f->sections); i++) {
155 section = psiconv_list_get(f->sections,i);
156 this_image = get_paint_data_section(section); 140 this_image = get_paint_data_section(section);
157 if (! image) { 141 if (! image) {
158 image = this_image; 142 image = this_image;
159 } else { 143 } else {
160 last_image->next=this_image; 144 last_image->next=this_image;
… …
162 } 146 }
163 last_image = this_image; 147 last_image = this_image;
164 } 148 }
165 149
166 image_info = CloneImageInfo(NULL); 150 image_info = CloneImageInfo(NULL);
167 set_filename(image->filename,dest,filename);
168 if (image->next) 151 if (image->next) {
169 images = CoalesceImages(image,&exc); 152 images = CoalesceImages(image,&exc);
153 if (!images || (exc.severity != UndefinedException)) {
154 MagickError(exc.severity,exc.reason,exc.description);
155 exit(1);
156 }
170 else 157 } else
171 images = image; 158 images = image;
172 if (! images)
173 CatchImageException(image);
174 159
175 status = WriteImage(image_info,images); 160 image_to_list(list,image,dest);
176 if (!status) 161
177 CatchImageException(images); 162 DestroyExceptionInfo(&exc);
178 DestroyImageInfo(image_info); 163 DestroyImageInfo(image_info);
179 if (image != images) 164 if (image != images)
180 DestroyImages(image); 165 DestroyImages(image);
181 DestroyImages(images); 166 DestroyImages(images);
182 return 0;
183#endif
184} 167}
185 168
186static void psiconv_gen_image_sketch(const char *filename, psiconv_sketch_f f, 169void gen_clipart(const psiconv_config config,psiconv_list list,
187 const char *dest) 170 const psiconv_clipart_f f, const char *dest)
188{ 171{
189#if IMAGEMAGICK 172 int i;
190 ImageInfo *image_info; 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);
179 }
180 for (i = 0; i < psiconv_list_length(f->sections); i ++) {
181 if (!(section = psiconv_list_get(f->sections,i))) {
182 fprintf(stderr,"Internal data structures corrupted\n");
183 exit(1);
184 }
185 if ((psiconv_list_add(sections,section->picture))) {
186 fprintf(stderr,"Out of memory error\n");
187 exit(1);
188 }
189 }
190 gen_image_list(config,list,sections,dest);
191 psiconv_list_free(sections);
192}
193
194void gen_mbm(const psiconv_config config,psiconv_list list,
195 const psiconv_mbm_f f, const char *dest)
196{
197 gen_image_list(config,list,f->sections,dest);
198}
199
200
201void gen_sketch(const psiconv_config config,psiconv_list list,
202 const psiconv_sketch_f f, const char *dest)
203{
191 Image *image; 204 Image *image;
192 205
193 image = get_paint_data_section(f->sketch_sec->picture); 206 image = get_paint_data_section(f->sketch_sec->picture);
194 image_info = CloneImageInfo(NULL); 207 image_to_list(list,image,dest);
195 set_filename(image->filename,dest,filename);
196 WriteImage(image_info,image);
197 DestroyImageInfo(image_info);
198 DestroyImage(image); 208 DestroyImage(image);
199#endif
200} 209}
201 210
202static int psiconv_gen_image(const char * filename, const psiconv_file file, 211
203 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)
204{ 215{
205 if (file->type == psiconv_mbm_file) 216 if (file->type == psiconv_mbm_file)
206 psiconv_gen_image_mbm(filename,(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 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
209 else if (file->type == psiconv_sketch_file) { 222 if (file->type == psiconv_sketch_file) {
210 psiconv_gen_image_sketch(filename,(psiconv_sketch_f) file->file,dest); 223 gen_sketch(config, list,(psiconv_sketch_f) file->file,dest);
211 } else 224 } else
212 return -1; 225 return -1;
213 return 0; 226 return 0;
214} 227}
215 228
216void init_image(void) 229void init_image(void)
217{ 230{
218 struct psiconv_fileformat_s ff; 231 struct fileformat_s ff;
219#if IMAGEMAGICK 232#if IMAGEMAGICK
220 MagickInfo *mi; 233 const MagickInfo *mi;
221 ff.output = psiconv_gen_image; 234 ff.output = gen_image;
222 for (mi = GetMagickFileList(); mi ; mi = mi->next) { 235 for (mi = GetMagickFileList(); mi ; mi = mi->next) {
223 if (mi->encoder) { 236 if (mi->encoder) {
224 ff.name = strdup(mi->tag); 237 ff.name = strdup(mi->name);
225 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;
226 psiconv_list_add(fileformat_list,&ff); 243 psiconv_list_add(fileformat_list,&ff);
227 } 244 }
228 } 245 }
229#endif 246#endif
230} 247}
Legend:
Removed from v.118  
changed lines
  Added in v.192
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26