liz/rawTherapee
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 2019-06-07 16:52:34 +02:00
commit b378b0f74c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rawimage.cc
View File

@ -769,7 +769,7 @@ float** RawImage::compress_image(unsigned int frameNum, bool freeImage)
this->data[row][col] = image[row * width + col][0]; this->data[row][col] = image[row * width + col][0];
} }
} else { } else {
if (get_maker() == "Sigma" && dng_version) { // Hack to prevent sigma dng files from crashing if((get_maker() == "Sigma" || get_maker() == "Pentax" || get_maker() == "Sony") && dng_version) { // Hack to prevent sigma dng files and dng files from PixelShift2DNG from crashing
height -= top_margin; height -= top_margin;
width -= left_margin; width -= left_margin;
} }

2
rtengine/rtthumbnail.cc
View File

@ -714,7 +714,7 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
int wmax = tmpw; int wmax = tmpw;
int hmax = tmph; 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; wmax = (width - 2 - left_margin) / hskip;
hmax = (height - 2 - top_margin) / vskip; hmax = (height - 2 - top_margin) / vskip;
} }