diff options
| author | Miles Bader | 2007-07-15 02:05:20 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-15 02:05:20 +0000 |
| commit | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (patch) | |
| tree | 34fc72789f1cfbfeb067cf507f8871c322df300a /src/image.c | |
| parent | 76d11d2cf9623e9f4c38e8239c4444ffc1fae485 (diff) | |
| parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
| download | emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.gz emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-813)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c index 322689c8d0f..f22c5014404 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3123,8 +3123,8 @@ static void convert_mono_to_color_image (f, img, foreground, background) | |||
| 3123 | release_frame_dc (f, hdc); | 3123 | release_frame_dc (f, hdc); |
| 3124 | old_prev = SelectObject (old_img_dc, img->pixmap); | 3124 | old_prev = SelectObject (old_img_dc, img->pixmap); |
| 3125 | new_prev = SelectObject (new_img_dc, new_pixmap); | 3125 | new_prev = SelectObject (new_img_dc, new_pixmap); |
| 3126 | SetTextColor (new_img_dc, foreground); | 3126 | SetTextColor (new_img_dc, background); |
| 3127 | SetBkColor (new_img_dc, background); | 3127 | SetBkColor (new_img_dc, foreground); |
| 3128 | 3128 | ||
| 3129 | BitBlt (new_img_dc, 0, 0, img->width, img->height, old_img_dc, | 3129 | BitBlt (new_img_dc, 0, 0, img->width, img->height, old_img_dc, |
| 3130 | 0, 0, SRCCOPY); | 3130 | 0, 0, SRCCOPY); |