From a31e4cfa511502f747d33a85aecf8b986fa17a4a Mon Sep 17 00:00:00 2001 From: David Reveman Date: Thu, 2 Feb 2006 02:10:49 +0000 Subject: [PATCH] Negative stride fix --- ChangeLog | 2 ++ fb/fbbltone.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67f5fc69d..3acc0e0f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-02-01 David Reveman + * fb/fbbltone.c: Negative stride fix. + * hw/xgl/xglglx.h: * hw/xgl/xglglx.c: * hw/xgl/glxext/xglglxext.c: Some GLX code cleanups. diff --git a/fb/fbbltone.c b/fb/fbbltone.c index 3da937150..5a96af841 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -52,12 +52,12 @@ #define LoadBits {\ if (leftShift) { \ - bitsRight = (src < srcEnd ? *src++ : 0); \ + bitsRight = (src != srcEnd ? *src++ : 0); \ bits = (FbStipLeft (bitsLeft, leftShift) | \ FbStipRight(bitsRight, rightShift)); \ bitsLeft = bitsRight; \ } else \ - bits = (src < srcEnd ? *src++ : 0); \ + bits = (src != srcEnd ? *src++ : 0); \ } #ifndef FBNOPIXADDR @@ -538,7 +538,7 @@ const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { stip = FbLeftStipBits(bits, len); \ } else { \ stip = FbLeftStipBits(bits, remain); \ - bits = (src < srcEnd ? *src++ : 0); \ + bits = (src != srcEnd ? *src++ : 0); \ __len = (len) - remain; \ stip = FbMergePartStip24Bits(stip, FbLeftStipBits(bits, __len), \ remain, __len); \