diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-28 09:09:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-29 09:05:39 +0200 |
commit | 37f9fdc11c4e95d6a34cb515a454503256a82c63 (patch) | |
tree | 35099c65caf4c62451a5b7a7c0bac249473c9733 /filter | |
parent | 4c91b89d8ce9c34179f31854dc88bd0a9fa84cba (diff) |
replace rtl_allocateMemory with std::malloc
where used directly, since rtl_allocateMemory now just calls into std::malloc
Change-Id: I59f85bdb7efdf6baa30e8fcd2370c0f8e9c999ad
Reviewed-on: https://gerrit.libreoffice.org/59685
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/ipcd/ipcd.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index cd2f306b499d..d0af67317cf4 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -197,26 +197,26 @@ void PCDReader::ReadImage() nW2=nWidth>>1; nH2=nHeight>>1; - pL0 =static_cast<sal_uInt8*>(rtl_allocateMemory( nWidth )); - pL1 =static_cast<sal_uInt8*>(rtl_allocateMemory( nWidth )); - pCb =static_cast<sal_uInt8*>(rtl_allocateMemory( nW2+1 )); - pCr =static_cast<sal_uInt8*>(rtl_allocateMemory( nW2+1 )); - pL0N=static_cast<sal_uInt8*>(rtl_allocateMemory( nWidth )); - pL1N=static_cast<sal_uInt8*>(rtl_allocateMemory( nWidth )); - pCbN=static_cast<sal_uInt8*>(rtl_allocateMemory( nW2+1 )); - pCrN=static_cast<sal_uInt8*>(rtl_allocateMemory( nW2+1 )); + pL0 =static_cast<sal_uInt8*>(std::malloc( nWidth )); + pL1 =static_cast<sal_uInt8*>(std::malloc( nWidth )); + pCb =static_cast<sal_uInt8*>(std::malloc( nW2+1 )); + pCr =static_cast<sal_uInt8*>(std::malloc( nW2+1 )); + pL0N=static_cast<sal_uInt8*>(std::malloc( nWidth )); + pL1N=static_cast<sal_uInt8*>(std::malloc( nWidth )); + pCbN=static_cast<sal_uInt8*>(std::malloc( nW2+1 )); + pCrN=static_cast<sal_uInt8*>(std::malloc( nW2+1 )); if ( pL0 == nullptr || pL1 == nullptr || pCb == nullptr || pCr == nullptr || pL0N == nullptr || pL1N == nullptr || pCbN == nullptr || pCrN == nullptr) { - rtl_freeMemory(static_cast<void*>(pL0) ); - rtl_freeMemory(static_cast<void*>(pL1) ); - rtl_freeMemory(static_cast<void*>(pCb) ); - rtl_freeMemory(static_cast<void*>(pCr) ); - rtl_freeMemory(static_cast<void*>(pL0N)); - rtl_freeMemory(static_cast<void*>(pL1N)); - rtl_freeMemory(static_cast<void*>(pCbN)); - rtl_freeMemory(static_cast<void*>(pCrN)); + std::free(static_cast<void*>(pL0) ); + std::free(static_cast<void*>(pL1) ); + std::free(static_cast<void*>(pCb) ); + std::free(static_cast<void*>(pCr) ); + std::free(static_cast<void*>(pL0N)); + std::free(static_cast<void*>(pL1N)); + std::free(static_cast<void*>(pCbN)); + std::free(static_cast<void*>(pCrN)); bStatus = false; return; } @@ -340,14 +340,14 @@ void PCDReader::ReadImage() if ( !bStatus ) break; } - rtl_freeMemory(static_cast<void*>(pL0) ); - rtl_freeMemory(static_cast<void*>(pL1) ); - rtl_freeMemory(static_cast<void*>(pCb) ); - rtl_freeMemory(static_cast<void*>(pCr) ); - rtl_freeMemory(static_cast<void*>(pL0N)); - rtl_freeMemory(static_cast<void*>(pL1N)); - rtl_freeMemory(static_cast<void*>(pCbN)); - rtl_freeMemory(static_cast<void*>(pCrN)); + std::free(static_cast<void*>(pL0) ); + std::free(static_cast<void*>(pL1) ); + std::free(static_cast<void*>(pCb) ); + std::free(static_cast<void*>(pCr) ); + std::free(static_cast<void*>(pL0N)); + std::free(static_cast<void*>(pL1N)); + std::free(static_cast<void*>(pCbN)); + std::free(static_cast<void*>(pCrN)); } //================== GraphicImport - the exported Function ================ |