diff options
| author | Gerd Moellmann | 2001-10-28 20:57:00 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-10-28 20:57:00 +0000 |
| commit | 053b3256838699849db10972e2146f57fc10fd55 (patch) | |
| tree | b5d40f64dd5018d50b0c14870032c71cce0f1903 /src | |
| parent | 138f08595bd8be045e5391232a30a3b20fba3bdf (diff) | |
| download | emacs-053b3256838699849db10972e2146f57fc10fd55.tar.gz emacs-053b3256838699849db10972e2146f57fc10fd55.zip | |
(x_build_heuristic_mask): Use x_alloc_image_color.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ef7fdb24170..f7273b44cfb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | 2001-10-28 Gerd Moellmann <gerd@gnu.org> | 6 | 2001-10-28 Gerd Moellmann <gerd@gnu.org> |
| 7 | 7 | ||
| 8 | * xfns.c (x_build_heuristic_mask): Use x_alloc_image_color. | ||
| 9 | |||
| 8 | * xfns.c (x_build_heuristic_mask): Fix a bug not incrementing | 10 | * xfns.c (x_build_heuristic_mask): Fix a bug not incrementing |
| 9 | a loop counter. | 11 | a loop counter. |
| 10 | 12 | ||
diff --git a/src/xfns.c b/src/xfns.c index fb71e47c14c..96ddd1f4dc8 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -8196,17 +8196,9 @@ x_build_heuristic_mask (f, img, how) | |||
| 8196 | if (i == 3 && NILP (how)) | 8196 | if (i == 3 && NILP (how)) |
| 8197 | { | 8197 | { |
| 8198 | char color_name[30]; | 8198 | char color_name[30]; |
| 8199 | XColor exact, color; | ||
| 8200 | Colormap cmap; | ||
| 8201 | |||
| 8202 | sprintf (color_name, "#%04x%04x%04x", rgb[0], rgb[1], rgb[2]); | 8199 | sprintf (color_name, "#%04x%04x%04x", rgb[0], rgb[1], rgb[2]); |
| 8203 | 8200 | bg = x_alloc_image_color (f, img, build_string (color_name), 0); | |
| 8204 | cmap = FRAME_X_COLORMAP (f); | 8201 | use_img_background = 0; |
| 8205 | if (XLookupColor (dpy, cmap, color_name, &exact, &color)) | ||
| 8206 | { | ||
| 8207 | bg = color.pixel; | ||
| 8208 | use_img_background = 0; | ||
| 8209 | } | ||
| 8210 | } | 8202 | } |
| 8211 | } | 8203 | } |
| 8212 | 8204 | ||