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