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