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

Merge branch 'dev' into relax-procparam-dependency

Browse Source
This commit is contained in:
Flössie
2019-03-10 12:54:04 +01:00
parent 3074803688 d89364fcc0
commit 9fe6bcaab1
24 changed files with 281 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtexif/rtexif.cc
View File

@@ -1769,7 +1769,7 @@ std::string Tag::nameToString (int i)
return buffer;
}
std::string Tag::valueToString ()
std::string Tag::valueToString () const
{
if (attrib && attrib->interpreter) {
@@ -2118,6 +2118,7 @@ void ExifManager::parseCIFF ()
}
parseCIFF (rml->ciffLength, root);
root->sort ();
parse(true);
}
Tag* ExifManager::saveCIFFMNTag (TagDirectory* root, int len, const char* name)
@@ -3441,7 +3442,7 @@ short int int2_to_signed (short unsigned int i)
* <focal>-<focal>mm f/<aperture>-<aperture>
* NB: no space between separator '-'; no space between focal length and 'mm'
*/
bool extractLensInfo (std::string &fullname, double &minFocal, double &maxFocal, double &maxApertureAtMinFocal, double &maxApertureAtMaxFocal)
bool extractLensInfo (const std::string &fullname, double &minFocal, double &maxFocal, double &maxApertureAtMinFocal, double &maxApertureAtMaxFocal)
{
minFocal = 0.0;
maxFocal = 0.0;