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

Merge with d52d5c66eaf33d055589837c3c6b142d111d3ef5

Browse Source
This commit is contained in:
Hombre
2014-01-29 21:26:21 +01:00
parent 2bd2f4cce2
commit d8e5bc8bd9
8 changed files with 668 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/imagedata.cc
View File

@@ -118,7 +118,7 @@ void ImageData::extractInfo () {
make = root->getTag ("Make")->valueToString ();
// same dcraw treatment
static const char *corp[] =
{ "Canon", "NIKON", "EPSON", "KODAK", "Kodak", "OLYMPUS", "PENTAX",
{ "Canon", "NIKON", "EPSON", "KODAK", "Kodak", "OLYMPUS", "PENTAX", "RICOH",
"MINOLTA", "Minolta", "Konica", "CASIO", "Sinar", "Phase One",
"SAMSUNG", "Mamiya", "MOTOROLA", "Leaf" };
for (size_t i=0; i < (sizeof(corp)/sizeof(*corp)); i++)
@@ -304,7 +304,7 @@ void ImageData::extractInfo () {
}
}
}
else if (mnote && !make.compare (0, 6, "PENTAX")) {
else if (mnote && (!make.compare (0, 6, "PENTAX") || (!make.compare (0, 5, "RICOH") && !model.compare (0, 6, "PENTAX")))) {
if (mnote->getTag ("LensType"))
lens = mnote->getTag ("LensType")->valueToString ();