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

Backed out changeset: 159f9e7014f8

Browse Source
This commit is contained in:
Oliver Duis
2012-05-06 23:04:47 +02:00
parent 1483ecb47c
commit 05226a2875
125 changed files with 747 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtexif/nikonattribs.cc
View File

@@ -131,37 +131,37 @@ class NAAFInfoInterpreter : public Interpreter {
std::ostringstream af;
if (aff&1)
if (af.str().empty()) af << "Center";
if (af.str()=="") af << "Center";
else af << ", Center";
else if (aff&2)
if (af.str().empty()) af << "Top";
if (af.str()=="") af << "Top";
else af << ", Top";
else if (aff&4)
if (af.str().empty()) af << "Bottom";
if (af.str()=="") af << "Bottom";
else af << ", Bottom";
else if (aff&8)
if (af.str().empty()) af << "Left";
if (af.str()=="") af << "Left";
else af << ", Left";
else if (aff&16)
if (af.str().empty()) af << "Right";
if (af.str()=="") af << "Right";
else af << ", Right";
else if (aff&32)
if (af.str().empty()) af << "Upper-left";
if (af.str()=="") af << "Upper-left";
else af << ", Upper-left";
else if (aff&64)
if (af.str().empty()) af << "Upper-right";
if (af.str()=="") af << "Upper-right";
else af << ", Upper-right";
else if (aff&128)
if (af.str().empty()) af << " Lower-left";
if (af.str()=="") af << " Lower-left";
else af << ", Lower-left";
else if (aff&256)
if (af.str().empty()) af << "Lower-right";
if (af.str()=="") af << "Lower-right";
else af << ", Lower-right";
else if (aff&512)
if (af.str().empty()) af << "Far Left";
if (af.str()=="") af << "Far Left";
else af << ", Far Left";
else if (aff&1024) {
if (af.str().empty()) af << "Far Right";
if (af.str()=="") af << "Far Right";
else af << ", Far Right";
}
@@ -688,7 +688,7 @@ class NALensDataInterpreter : public Interpreter {
lid << std::setw(2) << std::setfill('0') << (int)buffer[lidoffs+i] << ' ';
lid << std::setw(2) << std::setfill('0') << lenstype;
std::map<std::string,std::string>::const_iterator r = lenses.find (lid.str());
std::map<std::string,std::string>::iterator r = lenses.find (lid.str());
if (r!=lenses.end())
ld << "Lens = " << r->second;
else