diff options
| author | Jason Rumney | 2007-06-21 23:02:14 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-06-21 23:02:14 +0000 |
| commit | 2386b1f188053fd0021c29613b1b2cef43771b02 (patch) | |
| tree | 55d8a60efd4d4ffb1577e4e033167eb01f39754e /src | |
| parent | e96e1531630222502e59383a0cc1ebc3e7be031a (diff) | |
| download | emacs-2386b1f188053fd0021c29613b1b2cef43771b02.tar.gz emacs-2386b1f188053fd0021c29613b1b2cef43771b02.zip | |
(convert_mono_to_color_image): Swap fore and background.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3707ba5d82a..f84bcf4f233 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-06-21 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * image.c (convert_mono_to_color_image): Swap fore and background. | ||
| 4 | |||
| 1 | 2007-06-20 Jason Rumney <jasonr@gnu.org> | 5 | 2007-06-20 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * w32bdf.c (w32_BDF_to_x_font): Unmap memory when finished. | 7 | * w32bdf.c (w32_BDF_to_x_font): Unmap memory when finished. |
diff --git a/src/image.c b/src/image.c index 2dd578afc39..a1a908600ee 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3120,8 +3120,8 @@ static void convert_mono_to_color_image (f, img, foreground, background) | |||
| 3120 | release_frame_dc (f, hdc); | 3120 | release_frame_dc (f, hdc); |
| 3121 | old_prev = SelectObject (old_img_dc, img->pixmap); | 3121 | old_prev = SelectObject (old_img_dc, img->pixmap); |
| 3122 | new_prev = SelectObject (new_img_dc, new_pixmap); | 3122 | new_prev = SelectObject (new_img_dc, new_pixmap); |
| 3123 | SetTextColor (new_img_dc, foreground); | 3123 | SetTextColor (new_img_dc, background); |
| 3124 | SetBkColor (new_img_dc, background); | 3124 | SetBkColor (new_img_dc, foreground); |
| 3125 | 3125 | ||
| 3126 | BitBlt (new_img_dc, 0, 0, img->width, img->height, old_img_dc, | 3126 | BitBlt (new_img_dc, 0, 0, img->width, img->height, old_img_dc, |
| 3127 | 0, 0, SRCCOPY); | 3127 | 0, 0, SRCCOPY); |