avifil32: Remove superfluous casts of void pointers.

Michael Stefaniuc mstefani at redhat.de
Sun Nov 2 15:34:43 CST 2008


---
 dlls/avifil32/editstream.c |    2 +-
 dlls/avifil32/icmstream.c  |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c
index f2c6e5d..f19f3ac 100644
--- a/dlls/avifil32/editstream.c
+++ b/dlls/avifil32/editstream.c
@@ -935,7 +935,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,
   if (! This->bDecompress)
     return IAVIStream_ReadFormat(stream, n, format, fmtsize);
 
-  lp = (LPBITMAPINFOHEADER)AVIFILE_ReadFrame(This, stream, n);
+  lp = AVIFILE_ReadFrame(This, stream, n);
   if (lp == NULL)
     return AVIERR_ERROR;
   if (lp->biBitCount <= 8) {
diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c
index cb79fa4..8276e41 100644
--- a/dlls/avifil32/icmstream.c
+++ b/dlls/avifil32/icmstream.c
@@ -393,7 +393,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos,
       return hr;
   }
 
-  lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, pos);
+  lpbi = AVIStreamGetFrame(This->pg, pos);
   if (lpbi == NULL)
     return AVIERR_MEMORY;
 
@@ -611,7 +611,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start,
   /* compress or decompress? */
   if (This->hic == NULL) {
     /* decompress */
-    lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, start);
+    lpbi = AVIStreamGetFrame(This->pg, start);
     if (lpbi == NULL)
       return AVIERR_MEMORY;
 
@@ -634,7 +634,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start,
     while (start > This->lCurrent) {
       HRESULT hr;
 
-      lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, ++This->lCurrent);
+      lpbi = AVIStreamGetFrame(This->pg, ++This->lCurrent);
       if (lpbi == NULL) {
 	AVIFILE_Reset(This);
 	return AVIERR_MEMORY;
@@ -902,7 +902,7 @@ static HRESULT AVIFILE_OpenGetFrame(IAVIStreamImpl *This)
   assert(This->lpbiOutput == NULL);
 
   /* get input format */
-  lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, This->sInfo.dwStart);
+  lpbi = AVIStreamGetFrame(This->pg, This->sInfo.dwStart);
   if (lpbi == NULL)
     return AVIERR_MEMORY;
 
-- 
1.6.0.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20081102/e3297d6f/attachment.pgp 


More information about the wine-patches mailing list