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