Skip to content

Commit e92e447

Browse files
authored
Merge pull request #19648 from victoryforce/crop-factor-for-older-Olympus-models
[imageio] Add crop factor calculation for older Olympus models
2 parents 254a6fe + 2494973 commit e92e447

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

RELEASE_NOTES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ changes (where available).
204204
the <focused> action or to the mimics set up with for example the
205205
x-touch Lua script.
206206

207+
- Added the ability to calculate crop factor for Olympus cameras.
208+
207209
## Bug Fixes
208210

209211
- Fixed some issues with the hierarchical styles handling in the

src/common/exif.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,10 @@ static bool _exif_decode_exif_data(dt_image_t *img, Exiv2::ExifData &exifData)
15631563
img->exif_crop = 0.0f; // Will be shown as "no data" in the image information module
15641564
}
15651565

1566-
if(img->exif_crop == 0.0f && FIND_EXIF_TAG("Exif.OlympusEq.FocalPlaneDiagonal"))
1566+
if(img->exif_crop == 0.0f
1567+
&& (FIND_EXIF_TAG("Exif.OlympusEq.FocalPlaneDiagonal")
1568+
|| FIND_EXIF_TAG("Exif.Olympus.FocalPlaneDiagonal"))
1569+
)
15671570
{
15681571
const Exiv2::Rational r = pos->toRational();
15691572

0 commit comments

Comments
 (0)