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