diff options
| author | YAMAMOTO Mitsuharu | 2008-07-22 03:01:23 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2008-07-22 03:01:23 +0000 |
| commit | 9d2bcff4842192869b7042c41dd16fb5a105d974 (patch) | |
| tree | 425b8d3fccbd9fa94f99b1e18a93bff425a29774 /src | |
| parent | 40b2758ace2013f1e2914204a5c27b91eab37409 (diff) | |
| download | emacs-9d2bcff4842192869b7042c41dd16fb5a105d974.tar.gz emacs-9d2bcff4842192869b7042c41dd16fb5a105d974.zip | |
(XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/macterm.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3c9ac5a8eff..297dca6cbf4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-07-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * macterm.c (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return. | ||
| 4 | |||
| 1 | 2008-07-21 Ami Fischman <ami@fischman.org> (tiny change) | 5 | 2008-07-21 Ami Fischman <ami@fischman.org> (tiny change) |
| 2 | 6 | ||
| 3 | * print.c (print_object): Check print_depth before searching for | 7 | * 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) | |||
| 422 | color_space = NULL; | 422 | color_space = NULL; |
| 423 | alpha_info = kCGImageAlphaOnly; | 423 | alpha_info = kCGImageAlphaOnly; |
| 424 | } | 424 | } |
| 425 | if (color_space == NULL) | 425 | context = CGBitmapContextCreate (ximg->data, ximg->width, ximg->height, 8, |
| 426 | return; | ||
| 427 | context = CGBitmapContextCreate (ximg->data, ximg->width, | ||
| 428 | ximg->height, 8, | ||
| 429 | ximg->bytes_per_line, color_space, | 426 | ximg->bytes_per_line, color_space, |
| 430 | alpha_info); | 427 | alpha_info); |
| 431 | if (ximg->bits_per_pixel == 32) | 428 | if (ximg->bits_per_pixel == 32) |