Skip to content

Fix parseTiffFile to use TIFF StripOffsets tag #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
domitto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix parseTiffFile to use TIFF StripOffsets tag #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions eigerApp/src/eigerDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,16 +1932,17 @@ asynStatus eigerDetector::parseTiffFile (char *buf, size_t len)

tag_t *tags = (tag_t*)(buf + offset + 2);

size_t width = 0, height = 0, depth = 0, dataLen = 0;
size_t width = 0, height = 0, depth = 0, dataLen = 0, stripOffset = 0;

for(size_t i = 0; i < numEntries; ++i)
{
switch(tags[i].id)
{
case 256: width = tags[i].offset; break;
case 257: height = tags[i].offset; break;
case 258: depth = tags[i].offset; break;
case 279: dataLen = tags[i].offset; break;
case 256: width = tags[i].offset; break;
case 257: height = tags[i].offset; break;
case 258: depth = tags[i].offset; break;
case 273: stripOffset = tags[i].offset; break;
case 279: dataLen = tags[i].offset; break;
}
}

Expand Down Expand Up @@ -1975,7 +1976,9 @@ asynStatus eigerDetector::parseTiffFile (char *buf, size_t len)
pImage->uniqueId = uniqueId++;
updateTimeStamps(pImage);

memcpy(pImage->pData, buf+8, dataLen);
if(!stripOffset) { ERR("missing StripOffsets tag"); return asynError; }
if(stripOffset + dataLen > len) { ERR("pixel data out of range"); return asynError; }
memcpy(pImage->pData, buf + stripOffset, dataLen);
doCallbacksGenericPointer(pImage, NDArrayData, MONITOR_ASYN_ADDRESS);
pImage->release();

Expand Down