third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DataBuf] Replace wrong usage of release() with free()

Browse Source
This commit is contained in:
Dan Čermák 2018-07-06 11:35:08 +02:00
parent 1b74db8f51
commit 607b19111c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/image.cpp
View File

@ -662,7 +662,7 @@ namespace Exiv2 {
void Image::clearIccProfile()
{
iccProfile_.release();
iccProfile_.free();
}
void Image::setByteOrder(ByteOrder byteOrder)

9
src/pngimage.cpp
View File

@ -99,13 +99,14 @@ namespace Exiv2 {
zlibResult = uncompress((Bytef*)result.pData_,&uncompressedLen,bytes,length);
// if result buffer is large than necessary, redo to fit perfectly.
if (zlibResult == Z_OK && (long) uncompressedLen < result.size_ ) {
result.release();
result.free();
result.alloc(uncompressedLen);
zlibResult = uncompress((Bytef*)result.pData_,&uncompressedLen,bytes,length);
}
if (zlibResult == Z_BUF_ERROR) {
// the uncompressed buffer needs to be larger
result.release();
result.free();
// Sanity - never bigger than 16mb
if (uncompressedLen > 16*1024*1024) zlibResult = Z_DATA_ERROR;
@ -126,10 +127,10 @@ namespace Exiv2 {
zlibResult = compress((Bytef*)result.pData_,&compressedLen,bytes,length);
if (zlibResult == Z_BUF_ERROR) {
// the compressedArray needs to be larger
result.release();
result.free();
compressedLen *= 2;
} else {
result.release();
result.free();
result.alloc(compressedLen);
zlibResult = compress((Bytef*)result.pData_,&compressedLen,bytes,length);
}