windowscodecs: Allow CopyPixels to succeed without padding from the last row.

32bfd810 · Vincent Povirk · Alexandre Julliard · 1742012f · 32bfd810
Commit 32bfd810 authored Aug 14, 2012 by Vincent Povirk Committed by Alexandre Julliard Aug 20, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

main.c dlls/windowscodecs/main.c +1 -1

No files found.
--- a/dlls/windowscodecs/main.c
+++ b/dlls/windowscodecs/main.c
@@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer,
    if (dststride < bytesperrow)
        return E_INVALIDARG;

-    if ((dststride * rc->Height) > dstbuffersize)
+    if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize)
        return E_INVALIDARG;

    /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */