Vincent Povirk : windowscodecs: Implement IWICBitmapScaler::GetPixelFormat.

[Alexandre Julliard]

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

Author: Vincent Povirk 
Date:   Tue Feb 28 16:31:00 2012 -0600

windowscodecs: Implement IWICBitmapScaler::GetPixelFormat.

---

dlls/windowscodecs/scaler.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c
index f7ac48a..2289a9d 100644
--- a/dlls/windowscodecs/scaler.c
+++ b/dlls/windowscodecs/scaler.c
@@ -120,9 +120,16 @@ static HRESULT WINAPI BitmapScaler_GetSize(IWICBitmapScaler *iface,
 static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface,
     WICPixelFormatGUID *pPixelFormat)
 {
-    FIXME("(%p,%p): stub\n", iface, pPixelFormat);
+    BitmapScaler *This = impl_from_IWICBitmapScaler(iface);
+    TRACE("(%p,%p)\n", iface, pPixelFormat);

-    return E_NOTIMPL;
+    if (!pPixelFormat)
+        return E_INVALIDARG;
+
+    if (!This->source)
+        return WINCODEC_ERR_WRONGSTATE;
+
+    return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat);
 }

static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface,