summaryrefslogtreecommitdiff
path: root/navit/graphics/win32
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-10-09 07:59:40 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-10-09 07:59:40 +0000
commitd4a04d3a13ac6cba516ac1d9067d6669811da745 (patch)
tree486f45b806500ffd5f1a30913806116c97de53f9 /navit/graphics/win32
parent8a2802049201e1c4870c86e218f5685cc3c8e20c (diff)
downloadnavit-d4a04d3a13ac6cba516ac1d9067d6669811da745.tar.gz
Fix:graphics/win32:Use AlphaBlend for drawing PNGs to overlays, too.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2654 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/graphics/win32')
-rw-r--r--navit/graphics/win32/graphics_win32.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c
index 1e298232f..3de3903d6 100644
--- a/navit/graphics/win32/graphics_win32.c
+++ b/navit/graphics/win32/graphics_win32.c
@@ -1070,7 +1070,7 @@ static int
pngdecode(struct graphics_priv *gr, char *name, struct graphics_image_priv *img)
{
png_struct *png_ptr = NULL;
- png_info *info_ptr = NULL;
+ png_info *info_ptr = NULL;
png_byte buf[8];
png_byte **row_pointers = NULL;
@@ -1154,7 +1154,7 @@ pngdecode(struct graphics_priv *gr, char *name, struct graphics_image_priv *img)
if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_expand (png_ptr);
- png_set_bgr(png_ptr);
+ png_set_bgr(png_ptr);
/* all transformations have been registered; now update info_ptr data,
* get rowbytes and channels, and allocate image memory */
@@ -1402,6 +1402,7 @@ static struct graphics_priv *
this->p.y = p->y;
this->disabled = 0;
this->hPrebuildDC = 0;
+ this->AlphaBlend = gr->AlphaBlend;
this->next = gr->overlays;
gr->overlays = this;