diff options
| author | Adrian Robert | 2008-10-03 18:23:43 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-10-03 18:23:43 +0000 |
| commit | 46b0ebed94ff5cf1ca4ff0e03b6a8e76452af1fb (patch) | |
| tree | 8c1cc2ae3786311715d61f947c10c0d450c25917 /src | |
| parent | 716c808a99e76e2b462b0f45309066b6a5aef437 (diff) | |
| download | emacs-46b0ebed94ff5cf1ca4ff0e03b6a8e76452af1fb.tar.gz emacs-46b0ebed94ff5cf1ca4ff0e03b6a8e76452af1fb.zip | |
* image.c (x_clear_image_1): Under NS, call ns_free_indexed_color with correct arguments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 05447ddb884..fb3515511f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-10-02 Adrian Robert <Adrian.B.Robert@gmail.com> | ||
| 2 | |||
| 3 | * image.c (x_clear_image_1): Under NS, call ns_free_indexed_color with | ||
| 4 | correct arguments. | ||
| 5 | |||
| 1 | 2008-10-03 Glenn Morris <rgm@gnu.org> | 6 | 2008-10-03 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * emacs.c (USAGE1): Add --daemon. | 8 | * emacs.c (USAGE1): Add --daemon. |
diff --git a/src/image.c b/src/image.c index 7ce5b9b2e08..b24feca3779 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1624,7 +1624,7 @@ x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p) | |||
| 1624 | img->pixmap = NO_PIXMAP; | 1624 | img->pixmap = NO_PIXMAP; |
| 1625 | #ifdef HAVE_NS | 1625 | #ifdef HAVE_NS |
| 1626 | if (img->background_valid) | 1626 | if (img->background_valid) |
| 1627 | ns_free_indexed_color(img->background); | 1627 | ns_free_indexed_color(img->background, f); |
| 1628 | #endif | 1628 | #endif |
| 1629 | img->background_valid = 0; | 1629 | img->background_valid = 0; |
| 1630 | } | 1630 | } |