summaryrefslogtreecommitdiff
path: root/goodies
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-23 12:45:44 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-23 12:45:44 +0000
commitf2565f03257a02dc61df3d830a1225cccdd5d55d (patch)
tree75047ab88be88fa976d8315c571b268bffce00b3 /goodies
parent1210e94372fef91c3c21cd5e3141bf45657b9964 (diff)
INTEGRATION: CWS sj22 (1.10.50); FILE MERGED
2005/07/21 13:23:05 sj 1.10.50.1: #i42147# fixed problem, with single bith depth bitmaps
Diffstat (limited to 'goodies')
-rw-r--r--goodies/source/filter.vcl/ipict/ipict.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/goodies/source/filter.vcl/ipict/ipict.cxx b/goodies/source/filter.vcl/ipict/ipict.cxx
index f8aec22b64ae..aead36b59ff5 100644
--- a/goodies/source/filter.vcl/ipict/ipict.cxx
+++ b/goodies/source/filter.vcl/ipict/ipict.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ipict.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 03:00:24 $
+ * last change: $Author: hr $ $Date: 2005-09-23 13:45:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -766,7 +766,11 @@ ULONG PictReader::ReadPixMapEtc( Bitmap &rBitmap, BOOL bBaseAddr, BOOL bColorTab
if ( nRowBytes < 8 || nPackType == 1 )
{
for ( i = 0; i < nRowBytes; i++ )
- SETBYTE;
+ {
+ *pPict >> nDat;
+ if ( nx < nWidth )
+ SETBYTE;
+ }
nDataSize += nRowBytes;
}
else