mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use sal crc32 and skip cast frenzy

Browse Source
This commit is contained in:
Caolán McNamara
2012-02-15 16:08:46 +00:00
parent 372a0d505c
commit dcfc99705f
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/source/zipapi/CRC32.cxx
View File

@@ -27,14 +27,8 @@
************************************************************************/ ************************************************************************/
#include <CRC32.hxx> #include <CRC32.hxx>
#ifndef _ZLIB_H
#ifdef SYSTEM_ZLIB
#include <zlib.h>
#else
#include <external/zlib/zlib.h>
#endif
#endif
#include <PackageConstants.hxx> #include <PackageConstants.hxx>
#include <rtl/crc.h>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
@@ -67,14 +61,14 @@ void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b,
sal_Int32 len) sal_Int32 len)
throw(RuntimeException) throw(RuntimeException)
{ {
nCRC = crc32(nCRC, (const unsigned char*)b.getConstArray()+off, len ); nCRC = rtl_crc32(nCRC, b.getConstArray()+off, len );
} }
/** Update CRC32 with specified sequence of bytes /** Update CRC32 with specified sequence of bytes
*/ */
void SAL_CALL CRC32::update(const Sequence< sal_Int8 > &b) void SAL_CALL CRC32::update(const Sequence< sal_Int8 > &b)
throw(RuntimeException) throw(RuntimeException)
{ {
nCRC = crc32(nCRC, (const unsigned char*)b.getConstArray(),b.getLength()); nCRC = rtl_crc32(nCRC, b.getConstArray(),b.getLength());
} }
sal_Int32 SAL_CALL CRC32::updateStream( Reference < XInputStream > & xStream ) sal_Int32 SAL_CALL CRC32::updateStream( Reference < XInputStream > & xStream )