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-09 08:07:13 +02:00
parent 53d32c9135 c0a033e717
commit 941e0bd26c
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rawimage.cc
View File

@@ -767,7 +767,7 @@ float** RawImage::compress_image(unsigned int frameNum, bool freeImage)
this->data[row][col] = image[row * width + col][0];
}
} 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;
width -= left_margin;
}

2
rtengine/rawimagesource.cc
View File

@@ -1298,6 +1298,7 @@ int RawImageSource::interpolateBadPixelsXtrans( PixelsMap &bitmapBads )
for(dx = -2, dy = 0; dx <= 2 && !distance2PixelFound; dx += 4)
if(ri->XTRANSFC(row, col + dx) == pixelColor) {
distance2PixelFound = true;
break;
}
if(!distance2PixelFound)
@@ -1306,6 +1307,7 @@ int RawImageSource::interpolateBadPixelsXtrans( PixelsMap &bitmapBads )
for(dx = 0, dy = -2; dy <= 2 && !distance2PixelFound; dy += 4)
if(ri->XTRANSFC(row + dy, col) == pixelColor) {
distance2PixelFound = true;
break;
}
// calculate the value of its virtual counterpart (marked with a V in above examples)

2
rtengine/rtthumbnail.cc
View File

@@ -714,7 +714,7 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
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;
}