diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 12:11:49 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 12:11:49 +0000 |
| commit | 002f230463d7034ae9701b00f99e69d0e0b73427 (patch) | |
| tree | 675e099893111c0bc4b52820647d8324a24c8808 /goodies | |
| parent | 65ed487ba72c526a1a119f092a77b103efcad27c (diff) | |
INTEGRATION: CWS sixtyfour02 (1.6.62); FILE MERGED
2006/02/23 08:38:02 cmc 1.6.62.2: typo, trailing comma
2006/02/21 12:06:37 cmc 1.6.62.1: #i62323# goodies for 64bit
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/itiff/itiff.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/goodies/source/filter.vcl/itiff/itiff.cxx b/goodies/source/filter.vcl/itiff/itiff.cxx index f0ea34802496..e47800846952 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.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 03:02:52 $ + * last change: $Author: vg $ $Date: 2006-03-16 13:11:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -266,7 +266,7 @@ ULONG TIFFReader::ReadIntData() double TIFFReader::ReadDoubleData() { - ULONG nulong; + sal_uInt32 nulong; double nd; if ( nDataType == 5 ) @@ -1061,12 +1061,8 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic, { USHORT i, nNumTags, nTagType; ULONG nMaxPos; - ULONG nFirstIfd, nDataLen, nPos; - ULONG* pDummy = new ULONG; delete pDummy; // damit unter OS/2 - // das richtige (Tools-)new - // verwendet wird, da es sonst - // in dieser DLL nur Vector-news - // gibt; + ULONG nPos; + sal_uInt32 nFirstIfd, nDataLen; bStatus = TRUE; pCallback = pcallback; @@ -1090,7 +1086,7 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic, if ( bStatus ) { - ULONG nOffset = nFirstIfd; + sal_uInt32 nOffset = nFirstIfd; // calculate length of TIFF file do |