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

Merge branch 'dev' into metadata-exiv2

Browse Source
This commit is contained in:
Flössie
2019-07-09 13:34:19 +02:00
parent 8df4973610 3b78a5c227
commit 21a97980b6
70 changed files with 1341 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rtthumbnail.cc
View File

@@ -685,7 +685,7 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, eSensorType &sens
int wmax = tmpw;
int hmax = tmph;
if (ri->get_maker() == "Sigma" && ri->DNGVERSION()) { // Hack to prevent sigma dng files from crashing
if ((ri->get_maker() == "Sigma" || ri->get_maker() == "Pentax" || ri->get_maker() == "Sony") && ri->DNGVERSION()) { // Hack to prevent sigma dng files from crashing
wmax = (width - 2 - left_margin) / hskip;
hmax = (height - 2 - top_margin) / vskip;
}