Mercurial > emacs

comparison src/image.c @ 83622:0a3247aa24a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs--devo--0 Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-744 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-745 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-746 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-747 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-748 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-749 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-750 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-751 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-752 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-753 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-754 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-755 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-756 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-757 Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change. * emacs@sv.gnu.org/emacs--devo--0--patch-758 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-759 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-760 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-761 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-14 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-15 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-16 Update from CVS: src/xterm.c (XTread_socket): Revert last change. * emacs@sv.gnu.org/emacs--rel--22--patch-17 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-18 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-19 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-20 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-21 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-221 Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-12 Creator: Karoly Lorentey <karoly@lorentey.hu>
author Miles Bader <miles@gnu.org>
date Sun, 20 May 2007 23:29:14 +0000
parents 738ce3540ffb 4e046b2396ef
children 7489e9d44b85
comparison
equal deleted inserted replaced
83621:337111eac6a6 83622:0a3247aa24a4
5730 for (x = 0; x < width; ++x) 5730 for (x = 0; x < width; ++x)
5731 { 5731 {
5732 if (raw_p) 5732 if (raw_p)
5733 { 5733 {
5734 if ((x & 7) == 0) 5734 if ((x & 7) == 0)
5735 c = *p++; 5735 {
5736 if (p >= end)
5737 {
5738 x_destroy_x_image (ximg);
5739 x_clear_image (f, img);
5740 image_error ("Invalid image size in image `%s'",
5741 img->spec, Qnil);
5742 goto error;
5743 }
5744 c = *p++;
5745 }
5736 g = c & 0x80; 5746 g = c & 0x80;
5737 c <<= 1; 5747 c <<= 1;
5738 } 5748 }
5739 else 5749 else
5740 g = pbm_scan_number (&p, end); 5750 g = pbm_scan_number (&p, end);
5742 XPutPixel (ximg, x, y, g ? fg : bg); 5752 XPutPixel (ximg, x, y, g ? fg : bg);
5743 } 5753 }
5744 } 5754 }
5745 else 5755 else
5746 { 5756 {
5747 if (raw_p && (p + 3 * height * width > end)) 5757 if (raw_p
5758 && ((type == PBM_GRAY)
5759 ? (p + height * width > end)
5760 : (p + 3 * height * width > end)))
5748 { 5761 {
5749 x_destroy_x_image (ximg); 5762 x_destroy_x_image (ximg);
5763 x_clear_image (f, img);
5750 image_error ("Invalid image size in image `%s'", 5764 image_error ("Invalid image size in image `%s'",
5751 img->spec, Qnil); 5765 img->spec, Qnil);
5752 goto error; 5766 goto error;
5753 } 5767 }
5754 5768