diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 09:08:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 09:08:21 +0000 |
| commit | 3061b0ed2ed1ca7deb96e6d0a7c47570ea236083 (patch) | |
| tree | 1e6ef576e538a292b2f2c0310412ce8425d41928 /goodies | |
| parent | 37e5e3c7a56b4ef9c6251b122a641ebfe51985cc (diff) | |
INTEGRATION: CWS impress92 (1.7.8); FILE MERGED
2006/04/19 14:56:32 sj 1.7.8.1: #51579# fixes a gpf when loading tif picture
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/itiff/itiff.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/goodies/source/filter.vcl/itiff/itiff.cxx b/goodies/source/filter.vcl/itiff/itiff.cxx index e47800846952..bfea3e381c9f 100644 --- a/goodies/source/filter.vcl/itiff/itiff.cxx +++ b/goodies/source/filter.vcl/itiff/itiff.cxx @@ -4,9 +4,9 @@ * * $RCSfile: itiff.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2006-03-16 13:11:49 $ + * last change: $Author: rt $ $Date: 2006-05-05 10:08:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1111,6 +1111,8 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic, nMaxPos = Max( nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos ); } *pTIFF >> nOffset; + if ( pTIFF->IsEof() ) + nOffset = 0; nMaxPos = Max( pTIFF->Tell(), nMaxPos ); if ( !nOffset ) @@ -1180,6 +1182,8 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic, break; } *pTIFF >> nNextIfd; + if ( pTIFF->IsEof() ) + nNextIfd = 0; } if ( bStatus ) { |