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