diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:49:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:49:04 +0000 |
| commit | f6e09242599dd62a16d3cb34ea2c8e2c456237c7 (patch) | |
| tree | 2d289747688634fc72515c6b5edae7a8bc94dcf4 /goodies | |
| parent | INTEGRATION: CWS warnings01 (1.5.28); FILE MERGED (diff) | |
| download | core-f6e09242599dd62a16d3cb34ea2c8e2c456237c7.tar.gz core-f6e09242599dd62a16d3cb34ea2c8e2c456237c7.zip | |
INTEGRATION: CWS warnings01 (1.6.24); FILE MERGED
2006/05/23 20:59:36 sb 1.6.24.4: RESYNC: (1.7-1.8); FILE MERGED
2006/04/20 14:54:08 sb 1.6.24.3: #i53898# Made code compile and/or warning-free again after resync to SRC680m162.
2006/04/07 19:21:22 sb 1.6.24.2: RESYNC: (1.6-1.7); FILE MERGED
2005/10/28 10:28:01 sj 1.6.24.1: #i55991# warning free code
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/itiff/itiff.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/goodies/source/filter.vcl/itiff/itiff.cxx b/goodies/source/filter.vcl/itiff/itiff.cxx index bfea3e381c9f..5963cb3e67c4 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.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2006-05-05 10:08:21 $ + * last change: $Author: hr $ $Date: 2006-06-19 21:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,9 +33,6 @@ * ************************************************************************/ -#ifndef _NEW_HXX -#include <tools/new.hxx> -#endif #ifndef _SV_GRAPH_HXX #include <vcl/graph.hxx> #endif @@ -1063,6 +1060,7 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic, ULONG nMaxPos; ULONG nPos; sal_uInt32 nFirstIfd, nDataLen; + bStatus = TRUE; pCallback = pcallback; @@ -1213,8 +1211,8 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic, nStripsPerPlane = ( nImageLength - 1 ) / nRowsPerStrip + 1; nBytesPerRow = ( nImageWidth * nSamplesPerPixel / nPlanes * nBitsPerSample + 7 ) >> 3; - for ( ULONG i = 0; i < 4; i++ ) - pMap[ i ] = new BYTE[ nBytesPerRow ]; + for ( ULONG j = 0; j < 4; j++ ) + pMap[ j ] = new BYTE[ nBytesPerRow ]; if ( ReadMap( 10, 60 ) ) { |