Mercurial > emacs
diff src/image.c @ 90237:aa89c814f853
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 569-579)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 129-132)
- Update from CVS
- Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 07 Oct 2005 07:15:40 +0000 |
parents | b1c1fc853d2f 375ab086d366 |
children | 5e2d3828e89f |
line wrap: on
line diff
--- a/src/image.c Thu Oct 06 02:00:50 2005 +0000 +++ b/src/image.c Fri Oct 07 07:15:40 2005 +0000 @@ -2178,7 +2178,7 @@ if (stat (file, &st) == 0 && (fp = fopen (file, "rb")) != NULL - && (buf = (char *) xmalloc (st.st_size), + && (buf = (unsigned char *) xmalloc (st.st_size), fread (buf, 1, st.st_size, fp) == st.st_size)) { *size = st.st_size; @@ -3029,7 +3029,7 @@ bytes_per_line = (*width + 7) / 8 + padding_p; nbytes = bytes_per_line * *height; - p = *data = (char *) xmalloc (nbytes); + p = *data = (unsigned char *) xmalloc (nbytes); if (v10) {