From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 22 Jul 2008 03:01:23 +0000 (+0000)
Subject: (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return.
X-Git-Tag: emacs-pretest-22.2.90~95
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d2bcff4842192869b7042c41dd16fb5a105d974;p=emacs.git

(XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c9ac5a8eff..297dca6cbf4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return.
+
 2008-07-21  Ami Fischman  <ami@fischman.org>  (tiny change)
 
 	* print.c (print_object): Check print_depth before searching for
diff --git a/src/macterm.c b/src/macterm.c
index f73050788c2..8a0b2d61846 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -422,10 +422,7 @@ XDrawLine (display, p, gc, x1, y1, x2, y2)
       color_space = NULL;
       alpha_info = kCGImageAlphaOnly;
     }
-  if (color_space == NULL)
-    return;
-  context = CGBitmapContextCreate (ximg->data, ximg->width,
-				   ximg->height, 8,
+  context = CGBitmapContextCreate (ximg->data, ximg->width, ximg->height, 8,
 				   ximg->bytes_per_line, color_space,
 				   alpha_info);
   if (ximg->bits_per_pixel == 32)