Vincent Povirk : gdiplus: Use WIC to decode BMP files.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 947e39dbc77d3c6b1882d2f1191877961ec87ab9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=947e39dbc77d3c6b1882d2f119...

Author: Vincent Povirk 
Date:   Fri Sep  4 09:54:55 2009 -0500

gdiplus: Use WIC to decode BMP files.

---

dlls/gdiplus/image.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index b1e831f..4acf706 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -1507,6 +1507,11 @@ static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, GpImage **ima
     return decode_image_wic(stream, &CLSID_WICIcoDecoder, image);
 }

+static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **image)
+{
+    return decode_image_wic(stream, &CLSID_WICBmpDecoder, image);
+}
+
 static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image)
 {
     return decode_image_wic(stream, &CLSID_WICJpegDecoder, image);
@@ -2051,7 +2056,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
             /* SigMask */            bmp_sig_mask,
         },
         encode_image_BMP,
-        decode_image_olepicture_bitmap
+        decode_image_bmp
     },
     {
         { /* JPEG */