liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge n.6

Browse Source 
Includes some memory leaks fixes, dcraw update
This commit is contained in:
ffsup2
2011-06-10 20:23:50 +02:00
parent 063252e423 0542a8eafe
commit bc0a8d56f4
13 changed files with 1027 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/imageio.cc
View File

@@ -135,9 +135,9 @@ ImageIO::~ImageIO () {
if (embProfile)
cmsCloseProfile(embProfile);
delete loadedProfileData;
delete [] loadedProfileData;
delete exifRoot;
delete profileData;
delete [] profileData;
}
void png_read_data(png_struct_def *png_ptr, unsigned char *data, size_t length);
@@ -294,9 +294,11 @@ int ImageIO::loadJPEGFromMemory (const char* buffer, int bufsize)
//jpeg_memory_src (&cinfo,buffer,bufsize);
jpeg_read_header(&cinfo, TRUE);
unsigned int proflen;
delete loadedProfileData;
loadedProfileData = NULL;
unsigned int proflen;
if( loadedProfileData ){
delete [] loadedProfileData;
loadedProfileData = NULL;
}
bool hasprofile = read_icc_profile (&cinfo, (JOCTET**)&loadedProfileData, (unsigned int*)&loadedProfileLength);
if (hasprofile)
embProfile = cmsOpenProfileFromMem (loadedProfileData, loadedProfileLength);
@@ -450,8 +452,10 @@ int ImageIO::loadTIFF (Glib::ustring fname) {
}
char* profdata;
delete loadedProfileData;
loadedProfileData = NULL;
if( loadedProfileData ){
delete [] loadedProfileData;
loadedProfileData = NULL;
}
if (TIFFGetField(in, TIFFTAG_ICCPROFILE, &loadedProfileLength, &profdata)) {
embProfile = cmsOpenProfileFromMem (profdata, loadedProfileLength);
loadedProfileData = new char [loadedProfileLength];