Mercurial > hg > xemacs-beta

comparison src/glyphs-eimage.c @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 8b2f75cecb89 6c6d78781d59
children db84c9d41437
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
1 /* EImage-specific Lisp objects. 1 /* EImage-specific Lisp objects.
2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Tinker Systems 4 Copyright (C) 1995 Tinker Systems
5 Copyright (C) 1995, 1996, 2001, 2002, 2004, 2005 Ben Wing 5 Copyright (C) 1995, 1996, 2001, 2002, 2004, 2005, 2010 Ben Wing
6 Copyright (C) 1995 Sun Microsystems 6 Copyright (C) 1995 Sun Microsystems
7 7
8 This file is part of XEmacs. 8 This file is part of XEmacs.
9 9
10 XEmacs is free software; you can redistribute it and/or modify it 10 XEmacs is free software; you can redistribute it and/or modify it
175 free_opaque_ptr (unwind_obj); 175 free_opaque_ptr (unwind_obj);
176 if (data->cinfo_ptr) 176 if (data->cinfo_ptr)
177 jpeg_destroy_decompress (data->cinfo_ptr); 177 jpeg_destroy_decompress (data->cinfo_ptr);
178 178
179 if (data->instream) 179 if (data->instream)
180 retry_fclose (data->instream); 180 {
181 retry_fclose (data->instream);
182 data->instream = 0;
183 }
181 184
182 if (data->eimage) 185 if (data->eimage)
183 xfree (data->eimage); 186 {
187 xfree (data->eimage);
188 data->eimage = 0;
189 }
184 190
185 return Qnil; 191 return Qnil;
186 } 192 }
187 193
188 /* 194 /*
575 581
576 free_opaque_ptr (unwind_obj); 582 free_opaque_ptr (unwind_obj);
577 if (data->giffile) 583 if (data->giffile)
578 { 584 {
579 DGifCloseFile (data->giffile); 585 DGifCloseFile (data->giffile);
580 FreeSavedImages(data->giffile); 586 FreeSavedImages (data->giffile);
587 data->giffile = 0;
581 } 588 }
582 if (data->eimage) 589 if (data->eimage)
583 xfree (data->eimage); 590 {
591 xfree (data->eimage);
592 data->eimage = 0;
593 }
584 594
585 return Qnil; 595 return Qnil;
586 } 596 }
587 597
588 typedef struct gif_memory_storage 598 typedef struct gif_memory_storage
876 data->png_ptr = NULL; 886 data->png_ptr = NULL;
877 png_destroy_read_struct (&tmp, &(data->info_ptr), (png_infopp)NULL); 887 png_destroy_read_struct (&tmp, &(data->info_ptr), (png_infopp)NULL);
878 } 888 }
879 889
880 if (data->instream) 890 if (data->instream)
881 retry_fclose (data->instream); 891 {
892 retry_fclose (data->instream);
893 data->instream = 0;
894 }
882 895
883 if (data->eimage) 896 if (data->eimage)
884 xfree (data->eimage); 897 {
898 xfree (data->eimage);
899 data->eimage = 0;
900 }
885 901
886 return Qnil; 902 return Qnil;
887 } 903 }
888 904
889 static void 905 static void
1132 (struct tiff_unwind_data *) get_opaque_ptr (unwind_obj); 1148 (struct tiff_unwind_data *) get_opaque_ptr (unwind_obj);
1133 1149
1134 free_opaque_ptr (unwind_obj); 1150 free_opaque_ptr (unwind_obj);
1135 if (data->tiff) 1151 if (data->tiff)
1136 { 1152 {
1137 TIFFClose(data->tiff); 1153 TIFFClose (data->tiff);
1154 data->tiff = 0;
1138 } 1155 }
1139 if (data->eimage) 1156 if (data->eimage)
1140 xfree (data->eimage); 1157 {
1158 xfree (data->eimage);
1159 data->eimage = 0;
1160 }
1141 1161
1142 return Qnil; 1162 return Qnil;
1143 } 1163 }
1144 1164
1145 typedef struct tiff_memory_storage 1165 typedef struct tiff_memory_storage