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