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