/[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 39 Revision 56
… …
22#include "gen.h" 22#include "gen.h"
23#include <string.h> 23#include <string.h>
24#include "psiconv.h" 24#include "psiconv.h"
25 25
26#if IMAGEMAGICK 26#if IMAGEMAGICK
27#include "magick-aux.h"
27#include <magick/magick.h> 28#include <magick/magick.h>
28#endif 29
30static void set_filename(char *dest,const char *type, const char *name)
31{
32 int len;
33 strcpy(dest,type);
34 len = strlen(dest);
35 dest[len] = ':';
36 strcpy(dest + len + 1,name);
37}
29 38
30/* This is ridiculously simple using ImageMagick. Without it, it would 39/* This is ridiculously simple using ImageMagick. Without it, it would
31 be quite somewhat harder - it will be left for later on */ 40 be quite somewhat harder - it will be left for later on.
41 Note that we ignore any errors. Dangerous... */
32 42
33static Image *get_paint_data_section(psiconv_paint_data_section sec) 43static Image *get_paint_data_section(psiconv_paint_data_section sec)
34{ 44{
35 Image *image; 45 Image *image;
36 image = CreateImage(sec->xsize,sec->ysize,sec->red,sec->green, 46 float *pixel, *p, *red, *green, *blue;
37 sec->blue,NULL); 47 int x,y;
48 ExceptionInfo exc;
49
50 GetExceptionInfo(&exc);
51 red = sec->red;
52 green = sec->green;
53 blue = sec->blue;
54 p = pixel = malloc(sec->xsize * sec->ysize * 3 * sizeof(float));
55 for (y = 0; y < sec->ysize; y++) {
56 for (x = 0; x < sec->xsize; x++) {
57 *p++ = *red++;
58 *p++ = *green++;
59 *p++ = *blue++;
60 }
61 }
62 image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exc);
63 if (! image) {
64 MagickError(exc.severity,exc.message,exc.qualifier);
65 }
66 free(pixel);
67
38 return image; 68 return image;
39} 69}
40 70
71#endif
41 72
42static int psiconv_gen_image_mbm(FILE *of, psiconv_mbm_f f, const char *dest) 73static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f,
74 const char *dest)
43{ 75{
44#if IMAGEMAGICK 76#if IMAGEMAGICK
45 psiconv_paint_data_section section; 77 psiconv_clipart_section section;
46 MagickInfo *mi = GetMagickInfo(dest); 78 MagickInfo *mi = GetMagickInfo(dest);
47 ImageInfo image_info; 79 ImageInfo *image_info;
48 Image *image = NULL; 80 Image *image = NULL;
49 Image *last_image = NULL; 81 Image *last_image = NULL;
50 Image *this_image; 82 Image *this_image, *images;
83 ExceptionInfo exc;
51 int i; 84 int i;
85 unsigned int status;
52 86
53 if ((psiconv_list_length(f->sections) < 1) || 87 if ((psiconv_list_length(f->sections) < 1) ||
54 ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin))) 88 ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin)))
55#endif 89#endif
56 return -1; 90 return -1;
57#if IMAGEMAGICK 91#if IMAGEMAGICK
58 for (i = 0; i < psiconv_list_length(f->sections); i++) { 92 for (i = 0; i < psiconv_list_length(f->sections); i++) {
59 section = psiconv_list_get(f->sections,0); 93 section = psiconv_list_get(f->sections,i);
60 this_image = get_paint_data_section(section); 94 this_image = get_paint_data_section(section->picture);
61 if (! image) { 95 if (! image) {
62 image = image; 96 image = this_image;
63 last_image = image;
64 } else { 97 } else {
65 last_image->next=this_image; 98 last_image->next=this_image;
66 this_image->previous=last_image; 99 this_image->previous=last_image;
67 } 100 }
101 last_image = this_image;
68 } 102 }
69 103
104 GetExceptionInfo(&exc);
105 image_info = CloneImageInfo(NULL);
106 set_filename(image->filename,dest,filename);
107 images = CoalesceImages(image,&exc);
108 if (! images)
109 CatchImageException(image);
110
111 status = WriteImage(image_info,images);
112 if (!status)
113 CatchImageException(images);
70 GetImageInfo(&image_info); 114 DestroyImageInfo(image_info);
71 image_info.file = of; 115 DestroyImages(image);
72 strcpy(image->magick, dest); 116 DestroyImages(images);
73 WriteImage(&image_info,image);
74 return 0; 117 return 0;
75#endif 118#endif
76} 119}
77 120
121static int psiconv_gen_image_mbm(const char *filename, psiconv_mbm_f f,
122 const char *dest)
123{
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;
133 unsigned int status;
134
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++) {
141 section = psiconv_list_get(f->sections,i);
142 this_image = get_paint_data_section(section);
143 if (! image) {
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 }
152
153 GetExceptionInfo(&exc);
154 image_info = CloneImageInfo(NULL);
155 set_filename(image->filename,dest,filename);
156 images = CoalesceImages(image,&exc);
157 if (! images)
158 CatchImageException(image);
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}
169
78static void psiconv_gen_image_sketch(FILE *of, psiconv_sketch_f f, 170static void psiconv_gen_image_sketch(const char *filename, psiconv_sketch_f f,
79 const char *dest) 171 const char *dest)
80{ 172{
81#if IMAGEMAGICK 173#if IMAGEMAGICK
82 ImageInfo image_info; 174 ImageInfo *image_info;
83 Image *image; 175 Image *image;
84 176
85 image = get_paint_data_section(f->sketch_sec->picture); 177 image = get_paint_data_section(f->sketch_sec->picture);
86 GetImageInfo(&image_info); 178 image_info = CloneImageInfo(NULL);
87 image_info.file = of; 179 set_filename(image->filename,dest,filename);
88 strcpy(image->magick, dest);
89 WriteImage(&image_info,image); 180 WriteImage(image_info,image);
181 DestroyImageInfo(image_info);
182 DestroyImage(image);
90#endif 183#endif
91} 184}
92 185
93static int psiconv_gen_image(FILE * of, const psiconv_file file, 186static int psiconv_gen_image(const char * filename, const psiconv_file file,
94 const char *dest) 187 const char *dest)
95{ 188{
96 if (file->type == psiconv_mbm_file) 189 if (file->type == psiconv_mbm_file)
97 return psiconv_gen_image_mbm(of,(psiconv_mbm_f) file->file,dest); 190 psiconv_gen_image_mbm(filename,(psiconv_mbm_f) file->file,dest);
191 if (file->type == psiconv_clipart_file)
192 psiconv_gen_image_clipart(filename,(psiconv_clipart_f) file->file,dest);
98 else if (file->type == psiconv_sketch_file) { 193 else if (file->type == psiconv_sketch_file) {
99 psiconv_gen_image_sketch(of,(psiconv_sketch_f) file->file,dest); 194 psiconv_gen_image_sketch(filename,(psiconv_sketch_f) file->file,dest);
100 return 0;
101 } else 195 } else
102 return -1; 196 return -1;
197 return 0;
103} 198}
104 199
105void init_image(void) 200void init_image(void)
106{ 201{
107 struct psiconv_fileformat ff; 202 struct psiconv_fileformat_s ff;
108#if IMAGEMAGICK 203#if IMAGEMAGICK
109 MagickInfo *mi; 204 MagickInfo *mi;
110 ff.output = psiconv_gen_image; 205 ff.output = psiconv_gen_image;
111 for (mi = GetMagickInfo(NULL); mi ; mi = mi->next) { 206 for (mi = GetMagickFileList(); mi ; mi = mi->next) {
112 if (mi->encoder) { 207 if (mi->encoder) {
113 ff.name = strdup(mi->tag); 208 ff.name = strdup(mi->tag);
114 ff.description = strdup(mi->description); 209 ff.description = strdup(mi->description);
115 psiconv_list_add(fileformat_list,&ff); 210 psiconv_list_add(fileformat_list,&ff);
116 } 211 }
Legend:
Removed from v.39  
changed lines
  Added in v.56
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26