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

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-04-17 07:57:56 +02:00
parent eb8a1c9a3b 931db7ab4e
commit 5006a89110
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/imagedata.cc
View File

@@ -566,7 +566,7 @@ std::string ImageMetaData::shutterToString (double shutter)
char buffer[256];
if (shutter > 0.0 && shutter < 0.9) {
if (shutter > 0.0 && shutter <= 0.5) {
sprintf (buffer, "1/%0.0f", 1.0 / shutter);
} else {
sprintf (buffer, "%0.1f", shutter);

2
rtexif/rtexif.cc
View File

@@ -977,7 +977,7 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
// There are 2 format pentaxLensDataAttribs
int offsetFirst = 4; // LensInfo2
if( strstr(model, "*ist") || strstr(model, "GX-1") || strstr(model, "K100D") || strstr(model, "K110D") ) {
if( strstr(model, "*ist") || strstr(model, "GX-1") || strstr(model, "K200D") || (strstr(model, "K100D") && !strstr(model, "K100D Super")) || strstr(model, "K110D") || strstr(model, "645Z")) {
offsetFirst = 3; // LensInfo
} else if( strstr(model, "645D") ) {
offsetFirst = 13; // LensInfo3

4
rtexif/stdattribs.cc
View File

@@ -389,7 +389,7 @@ public:
char buffer[32];
double d = pow (2.0, -t->toDouble());
if (d > 0.0 && d < 0.9) {
if (d > 0.0 && d <= 0.5) {
sprintf (buffer, "1/%.0f", 1.0 / d);
} else {
sprintf (buffer, "%.1f", d);
@@ -409,7 +409,7 @@ public:
char buffer[32];
double d = t->toDouble();
if (d > 0.0 && d < 0.9) {
if (d > 0.0 && d <= 0.5) {
sprintf (buffer, "1/%.0f", 1.0 / d);
} else {
sprintf (buffer, "%.1f", d);