Mercurial > hg > xemacs-beta

comparison src/glyphs-eimage.c @ 4982:3c3c1d139863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children 2eec7322eb7f 2ade80e8c640
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
171 171
172 if (data->instream) 172 if (data->instream)
173 retry_fclose (data->instream); 173 retry_fclose (data->instream);
174 174
175 if (data->eimage) 175 if (data->eimage)
176 xfree (data->eimage, Binbyte *); 176 xfree (data->eimage);
177 177
178 return Qnil; 178 return Qnil;
179 } 179 }
180 180
181 /* 181 /*
571 { 571 {
572 DGifCloseFile (data->giffile); 572 DGifCloseFile (data->giffile);
573 FreeSavedImages(data->giffile); 573 FreeSavedImages(data->giffile);
574 } 574 }
575 if (data->eimage) 575 if (data->eimage)
576 xfree (data->eimage, Binbyte *); 576 xfree (data->eimage);
577 577
578 return Qnil; 578 return Qnil;
579 } 579 }
580 580
581 typedef struct gif_memory_storage 581 typedef struct gif_memory_storage
872 872
873 if (data->instream) 873 if (data->instream)
874 retry_fclose (data->instream); 874 retry_fclose (data->instream);
875 875
876 if (data->eimage) 876 if (data->eimage)
877 xfree(data->eimage, Binbyte *); 877 xfree (data->eimage);
878 878
879 return Qnil; 879 return Qnil;
880 } 880 }
881 881
882 static void 882 static void
1068 warn_when_safe (Qpng, Qinfo, "%s - %s", 1068 warn_when_safe (Qpng, Qinfo, "%s - %s",
1069 eidata(key), eidata(text)); 1069 eidata(key), eidata(text));
1070 } 1070 }
1071 } 1071 }
1072 1072
1073 xfree (row_pointers, Binbyte **); 1073 xfree (row_pointers);
1074 } 1074 }
1075 1075
1076 /* now instantiate */ 1076 /* now instantiate */
1077 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), 1077 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain),
1078 init_image_instance_from_eimage, 1078 init_image_instance_from_eimage,
1128 if (data->tiff) 1128 if (data->tiff)
1129 { 1129 {
1130 TIFFClose(data->tiff); 1130 TIFFClose(data->tiff);
1131 } 1131 }
1132 if (data->eimage) 1132 if (data->eimage)
1133 xfree (data->eimage, Binbyte *); 1133 xfree (data->eimage);
1134 1134
1135 return Qnil; 1135 return Qnil;
1136 } 1136 }
1137 1137
1138 typedef struct tiff_memory_storage 1138 typedef struct tiff_memory_storage