[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 4dc151caf75c2af868fa5104618cd79ada6539f6
Author: Huw Davies <huw at codeweavers.com>
Date:   Thu May 17 14:42:12 2012 +0100

    wineps: Fix top-down dib pattern brushes.
    (cherry picked from commit c5697ff4b106cb08ea74ce6f7f94651fdf6ddc5b)

diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c
index 19784f3..a1d8432 100644
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -20,6 +20,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <locale.h>
@@ -851,7 +852,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U
       "  %d %d scale\n  mypat image\n  end\n }\n>>\n matrix makepattern setpattern\n";
     PSDRV_PDEVICE *physDev = get_psdrv_dev( dev );
     char *buf, *ptr;
-    INT w, h, x, y, w_mult, h_mult;
+    INT w, h, x, y, w_mult, h_mult, abs_height = abs( bmi->bmiHeader.biHeight );
     COLORREF map[2];
 
     TRACE( "size %dx%dx%d\n",
@@ -863,7 +864,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U
     }
 
     w = bmi->bmiHeader.biWidth & ~0x7;
-    h = bmi->bmiHeader.biHeight & ~0x7;
+    h = abs_height & ~0x7;
 
     buf = HeapAlloc(PSDRV_Heap, 0, sizeof(do_pattern) + 100);
     ptr = buf;
@@ -875,7 +876,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U
 	}
     }
     PSDRV_WriteSpool(dev, mypat, sizeof(mypat) - 1);
-    PSDRV_WriteImageDict(dev, 1, 8, 8, buf, FALSE);
+    PSDRV_WriteImageDict(dev, 1, 8, 8, buf, bmi->bmiHeader.biHeight < 0);
     PSDRV_WriteSpool(dev, "def\n", 4);
 
     PSDRV_WriteIndexColorSpaceBegin(dev, 1);

-- 
Debian Wine packaging