FileBrowser now detects the 2 frames from DualPixel Canon files

The QuickInfo frame from the EditorPanel now display the number of frame
contained in the image file if > 1 

See #4008
This commit is contained in:
Hombre57
2017-09-18 21:30:42 +02:00
parent 17c7ec684d
commit 6c988e94d4
6 changed files with 57 additions and 39 deletions

View File

@@ -1068,22 +1068,6 @@ public:
};
CAFocalPlaneInterpreter caFocalPlaneInterpreter;
class RawImageSegmentationInterpreter : public Interpreter
{
public:
virtual std::string toString (Tag* t)
{
int segmentNumber = t->toInt(0, SHORT);
int segmentWidth = t->toInt(2, SHORT);
int lastSegmentWidth = t->toInt(4, SHORT);
char buffer[32];
sprintf (buffer, "%d %d %d", segmentNumber, segmentWidth, lastSegmentWidth);
return buffer;
}
};
RawImageSegmentationInterpreter rawImageSegmentationInterpreter;
class CAExposureTimeInterpreter : public Interpreter
{
public:
@@ -2011,7 +1995,6 @@ const TagAttrib canonAttribs[] = {
{1, AC_WRITE, 0, nullptr, 0x4005, AUTO, "UnknownBlock2", &stdInterpreter},
{1, AC_WRITE, 0, nullptr, 0x4008, AUTO, "BlackLevel", &stdInterpreter},
{1, AC_WRITE, 0, canonMicroAdjustAttrib, 0x4013, AUTO, "AFMicroAdj", &stdInterpreter},
{1, AC_WRITE, 0, nullptr, 0xc640, AUTO, "RawImageSegmentation", &rawImageSegmentationInterpreter},
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr}
};
}