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