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