summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-27 09:53:23 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-27 09:53:23 +0000
commitff83e559cee5e0a62b3c53dee8dec43df60c7ca5 (patch)
treea53bf503ee05ec4791a5b59b64a47127810e3784 /vcl/source
parent19ab760c6fb7ffd839abc7c1a32d1480b1be7fc9 (diff)
INTEGRATION: CWS sixtyfour08 (1.13.14); FILE MERGED
2006/09/21 10:00:20 cmc 1.13.14.1: #i68339# applying mask to a *long, not a *sal_uInt32
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/bmpacc.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index bb1f79d71588..e2e354763f42 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: bmpacc.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 11:58:08 $
+ * last change: $Author: vg $ $Date: 2006-09-27 10:53:23 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -304,7 +304,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
nMask = SWAPLONG( nMask );
#endif
for( sal_uInt32 i = 0; i < nHeight; i++, pLast4Bytes += nScanSize )
- ( *(long*) pLast4Bytes ) &= nMask;
+ ( *(sal_uInt32*) pLast4Bytes ) &= nMask;
}
}
}