diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2010-12-15 18:03:01 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2010-12-17 19:37:08 +0100 |
| commit | 1c1be9d275a0301db93980e3d77f9f7745b7c7d7 (patch) | |
| tree | 628e0960a55ed76f238ac45d5766aeb91fc5d69a /common/gdi_canvas.c | |
| parent | d1a0fe05c723f035846a61c0aa5b4979ad513e69 (diff) | |
| download | spice-gtk-1c1be9d275a0301db93980e3d77f9f7745b7c7d7.tar.gz spice-gtk-1c1be9d275a0301db93980e3d77f9f7745b7c7d7.tar.xz spice-gtk-1c1be9d275a0301db93980e3d77f9f7745b7c7d7.zip | |
common: sync with upstream
Diffstat (limited to 'common/gdi_canvas.c')
| -rw-r--r-- | common/gdi_canvas.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c index eda1529..d57aafc 100644 --- a/common/gdi_canvas.c +++ b/common/gdi_canvas.c @@ -16,8 +16,8 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <Windows.h> -#include <Wingdi.h> +#include <windows.h> +#include <wingdi.h> #include "gdi_canvas.h" #define GDI_CANVAS #include "canvas_base.c" @@ -471,7 +471,7 @@ static void copy_bitmap_alpha(const uint8_t *src_alpha, int height, int width, i alphaval = src_alpha[i]; alphaval = alphaval >> (i_count * i_offset); - alphaval = alphaval &= ((uint8_t)0xff >> (8 - i_offset)); + alphaval &= ((uint8_t)0xff >> (8 - i_offset)); alphaval = ((255 * alphaval) / ((uint8_t)0xff >> (8 - i_offset))); dest_bitmap[x * 4 + 3] = alphaval; @@ -637,7 +637,7 @@ static HBRUSH get_brush(GdiCanvas *canvas, SpiceBrush *brush, RecurciveMutex **b case SPICE_BRUSH_TYPE_PATTERN: { GdiCanvas *gdi_surface = NULL; HBRUSH hbrush; - pixman_image_t *surface; + pixman_image_t *surface = NULL; HDC dc; HBITMAP bitmap; HBITMAP prev_bitmap; |