diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-28 15:08:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-28 15:08:13 +0000 |
| commit | 7e205c3ff5afa58b07de0bc2c74c48a687bfd6f1 (patch) | |
| tree | c58a947cfad28c61ed032c867574d59861f92cce /tools/source/zcodec | |
| parent | 7941a06ca2f3f65e9851749f29383f67104ae1bd (diff) | |
INTEGRATION: CWS impress14ea (1.2.82); FILE MERGED
2004/06/18 09:58:38 sj 1.2.82.1: #i23822# removed compiler warnings
Diffstat (limited to 'tools/source/zcodec')
| -rw-r--r-- | tools/source/zcodec/zcodec.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 05da03c4ec83..8ede955a4fef 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zcodec.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-06-17 13:13:05 $ + * last change: $Author: kz $ $Date: 2004-06-28 16:08:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,7 +145,7 @@ void ZCodec::BeginCompression( ULONG nCompressMethod ) long ZCodec::EndCompression() { - long retvalue; + long retvalue = 0; if ( mbInit != 0 ) { @@ -199,7 +199,7 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm ) break; } }; - return ( mbStatus ) ? PZSTREAM->total_in - nOldTotal_In : -1; + return ( mbStatus ) ? (long)(PZSTREAM->total_in - nOldTotal_In) : -1; } // ------------------------------------------------------------------------ @@ -246,7 +246,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) if ( err == Z_STREAM_END ) mbFinish = TRUE; - return ( mbStatus ) ? PZSTREAM->total_out - nOldTotal_Out : -1; + return ( mbStatus ) ? (long)(PZSTREAM->total_out - nOldTotal_Out) : -1; } // ------------------------------------------------------------------------ @@ -273,7 +273,7 @@ long ZCodec::Write( SvStream& rOStm, const BYTE* pData, ULONG nSize ) break; } } - return ( mbStatus ) ? nSize : -1; + return ( mbStatus ) ? (long)nSize : -1; } // ------------------------------------------------------------------------ @@ -320,7 +320,7 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize ) if ( err == Z_STREAM_END ) mbFinish = TRUE; - return (mbStatus ? nSize - PZSTREAM->avail_out : -1); + return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1); } // ------------------------------------------------------------------------ @@ -329,7 +329,7 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize ) long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ) { - char err; + char err = 0; ULONG nInToRead; if ( mbFinish ) @@ -380,7 +380,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ) if ( err == Z_STREAM_END ) mbFinish = TRUE; - return (mbStatus ? nSize - PZSTREAM->avail_out : -1); + return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1); } #pragma optimize ("",on) |