Vincent Povirk : windowscodecs: Implement GetFrameCount for the TIFF decoder.
Alexandre Julliard
julliard at winehq.org
Mon Mar 22 11:12:02 CDT 2010
Module: wine
Branch: master
Commit: c048bb07ca8a170b52215a6dc7537c1602835e79
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c048bb07ca8a170b52215a6dc7537c1602835e79
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Mar 17 16:00:33 2010 -0500
windowscodecs: Implement GetFrameCount for the TIFF decoder.
---
dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index 38edf70..3962f9a 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -57,6 +57,8 @@ static void *libtiff_handle;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f
MAKE_FUNCPTR(TIFFClientOpen);
MAKE_FUNCPTR(TIFFClose);
+MAKE_FUNCPTR(TIFFCurrentDirectory);
+MAKE_FUNCPTR(TIFFReadDirectory);
#undef MAKE_FUNCPTR
static void *load_libtiff(void)
@@ -78,6 +80,8 @@ static void *load_libtiff(void)
}
LOAD_FUNCPTR(TIFFClientOpen);
LOAD_FUNCPTR(TIFFClose);
+ LOAD_FUNCPTR(TIFFCurrentDirectory);
+ LOAD_FUNCPTR(TIFFReadDirectory);
#undef LOAD_FUNCPTR
}
@@ -330,8 +334,22 @@ static HRESULT WINAPI TiffDecoder_GetThumbnail(IWICBitmapDecoder *iface,
static HRESULT WINAPI TiffDecoder_GetFrameCount(IWICBitmapDecoder *iface,
UINT *pCount)
{
- FIXME("(%p,%p)\n", iface, pCount);
- return E_NOTIMPL;
+ TiffDecoder *This = (TiffDecoder*)iface;
+
+ if (!This->tiff)
+ {
+ WARN("(%p) <-- WINCODEC_ERR_WRONGSTATE\n", iface);
+ return WINCODEC_ERR_WRONGSTATE;
+ }
+
+ EnterCriticalSection(&This->lock);
+ while (pTIFFReadDirectory(This->tiff)) { }
+ *pCount = pTIFFCurrentDirectory(This->tiff)+1;
+ LeaveCriticalSection(&This->lock);
+
+ TRACE("(%p) <-- %i\n", iface, *pCount);
+
+ return S_OK;
}
static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface,
More information about the wine-cvs
mailing list