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

FileBrowser now detects the 2 frames from DualPixel Canon files

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

42
rtexif/rtexif.cc
View File

@@ -2318,9 +2318,6 @@ void ExifManager::parseCIFF (int length, TagDirectory* root)
root->addTag (t);
}
if (root->getTag("RawImageSegmentation")) { // Canon CR2 files
frames.push_back(root);
}
roots.push_back(root);
}
@@ -2932,25 +2929,42 @@ void ExifManager::parse (bool isRaw, bool skipIgnored)
// --- detecting image root IFD based on SubFileType, or if not provided, on PhotometricInterpretation
bool frameRootDetected = false;
std::vector<const Tag*> sftTagList = root->findTags(TIFFTAG_SUBFILETYPE);
if (!sftTagList.empty()) {
for (auto sft : sftTagList) {
int sftVal = sft->toInt();
if (sftVal == (isRaw ? 0 : 2)) {
frames.push_back(sft->getParent());
if(!frameRootDetected) {
std::vector<const Tag*> risTagList = root->findTags("RawImageSegmentation");
if (!risTagList.empty()) {
for (auto ris : risTagList) {
frames.push_back(ris->getParent());
frameRootDetected = true;
#if PRINT_METADATA_TREE
printf("\n--------------- FRAME (SUBFILETYPE) ---------------\n\n");
sft->getParent()->printAll ();
#endif
#if PRINT_METADATA_TREE
printf("\n--------------- FRAME (RAWIMAGESEGMENTATION) ---------------\n\n");
ris->getParent()->printAll ();
#endif
}
}
}
if(!frameRootDetected) {
sftTagList = root->findTags(TIFFTAG_OSUBFILETYPE);
std::vector<const Tag*> sftTagList = root->findTags(TIFFTAG_SUBFILETYPE);
if (!sftTagList.empty()) {
for (auto sft : sftTagList) {
int sftVal = sft->toInt();
if (sftVal == (isRaw ? 0 : 2)) {
frames.push_back(sft->getParent());
frameRootDetected = true;
#if PRINT_METADATA_TREE
printf("\n--------------- FRAME (SUBFILETYPE) ---------------\n\n");
sft->getParent()->printAll ();
#endif
}
}
}
}
if(!frameRootDetected) {
std::vector<const Tag*> sftTagList = root->findTags(TIFFTAG_OSUBFILETYPE);
if (!sftTagList.empty()) {
for (auto sft : sftTagList) {
int sftVal = sft->toInt();