diff options
| author | Adrian Robert | 2008-11-25 02:45:39 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-11-25 02:45:39 +0000 |
| commit | 5a06864fb69973eb2be01e230a98d6c24ff2138c (patch) | |
| tree | 4a9039884d5f65352c64a72970a8fdd198e3476f /src/image.c | |
| parent | 3a37fceafaf3bf2697849012e20d265a228d431b (diff) | |
| download | emacs-5a06864fb69973eb2be01e230a98d6c24ff2138c.tar.gz emacs-5a06864fb69973eb2be01e230a98d6c24ff2138c.zip | |
Fix bug #1362. * image.c (x_clear_image_1): Do not free background under HAVE_NS, it is not an indexed color. * nsterm.m (free_indexed_color): Add argument checking. * nsfns.m: Move config.h to before system includes (advised by Dan N.).
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c index b24feca3779..6701637f951 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1622,10 +1622,7 @@ x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p) | |||
| 1622 | { | 1622 | { |
| 1623 | Free_Pixmap (FRAME_X_DISPLAY (f), img->pixmap); | 1623 | Free_Pixmap (FRAME_X_DISPLAY (f), img->pixmap); |
| 1624 | img->pixmap = NO_PIXMAP; | 1624 | img->pixmap = NO_PIXMAP; |
| 1625 | #ifdef HAVE_NS | 1625 | /* NOTE (HAVE_NS): background color is NOT an indexed color! */ |
| 1626 | if (img->background_valid) | ||
| 1627 | ns_free_indexed_color(img->background, f); | ||
| 1628 | #endif | ||
| 1629 | img->background_valid = 0; | 1626 | img->background_valid = 0; |
| 1630 | } | 1627 | } |
| 1631 | 1628 | ||