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

Alexandre Julliard julliard at winehq.org
Wed Sep 2 09:30:33 CDT 2009


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

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Tue Sep  1 17:54:45 2009 -0500

gdiplus: Use WIC to decode JPEG 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 61e7b03..0292979 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_jpeg(IStream* stream, REFCLSID clsid, GpImage **image)
+{
+    return decode_image_wic(stream, &CLSID_WICJpegDecoder, image);
+}
+
 static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, GpImage **image)
 {
     IPicture *pic;
@@ -2060,7 +2065,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
             /* SigMask */            jpeg_sig_mask,
         },
         NULL,
-        decode_image_olepicture_bitmap
+        decode_image_jpeg
     },
     {
         { /* GIF */




More information about the wine-cvs mailing list