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

Compute return buffer size at ExifManager::createJPEGMarker and make the buffer in that

Browse Source
This commit is contained in:
Shiho Midorikawa
2023-02-27 03:26:10 +09:00
parent 23408bfcb3
commit 03fd015e77
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtexif/rtexif.cc
View File

@@ -3243,24 +3243,17 @@ std::vector<Tag*> ExifManager::getDefaultTIFFTags (TagDirectory* forthis)
int ExifManager::createJPEGMarker (const TagDirectory* root, const rtengine::procparams::ExifPairs& changeList, int W, int H, unsigned char* buffer)
int ExifManager::createJPEGMarker (const TagDirectory* root, const rtengine::procparams::ExifPairs& changeList, int W, int H, unsigned char *&buffer, unsigned &bufferSize)
{
// write tiff header
int offs = 6;
memcpy (buffer, "Exif\0\0", 6);
int offs = 6; // "Exif\0\0"
ByteOrder order = INTEL;
if (root) {
order = root->getOrder ();
}
sset2 ((unsigned short)order, buffer + offs, order);
offs += 2;
sset2 (42, buffer + offs, order);
offs += 2;
sset4 (8, buffer + offs, order);
TagDirectory* cl;
if (root) {
@@ -3322,11 +3315,20 @@ int ExifManager::createJPEGMarker (const TagDirectory* root, const rtengine::pro
}
cl->sort ();
int size = cl->write (8, buffer + 6);
bufferSize = cl->calculateSize() + 8 + 6;
buffer = new unsigned char[bufferSize]; // this has to be deleted in caller
memcpy (buffer, "Exif\0\0", 6);
sset2 ((unsigned short)order, buffer + offs, order);
offs += 2;
sset2 (42, buffer + offs, order);
offs += 2;
sset4 (8, buffer + offs, order);
int endOffs = cl->write (8, buffer + 6);
delete cl;
return size + 6;
return endOffs;
}
int ExifManager::createPNGMarker(const TagDirectory* root, const rtengine::procparams::ExifPairs &changeList, int W, int H, int bps, const char* iptcdata, int iptclen, unsigned char *&buffer, unsigned &bufferSize)