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-10-07 18:41:30 +02:00
parent 39c2ffb05f 710f6c089d
commit 4f33394122
18 changed files with 2085 additions and 2097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/CMakeLists.txt
View File

@@ -99,16 +99,6 @@ set(RTENGINESOURCEFILES
ipwavelet.cc
jdatasrc.cc
jpeg_ijg/jpeg_memsrc.cc
klt/convolve.cc
klt/error.cc
klt/klt_util.cc
klt/klt.cc
klt/pnmio.cc
klt/pyramid.cc
klt/selectGoodFeatures.cc
klt/storeFeatures.cc
klt/trackFeatures.cc
klt/writeFeatures.cc
labimage.cc
lcp.cc
lj92.c

2
rtengine/color.h
View File

@@ -1078,7 +1078,6 @@ public:
//very small differences between the 2
return x <= 0.003040 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;//continuous
// return x <= 0.003041 ? x * 12.92310 : 1.055011 * exp(log(x) / sRGBGammaCurve) - 0.055011;//continuous
}
@@ -1095,7 +1094,6 @@ public:
//very small differences between the 4
return x <= 0.039286 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//continuous
// return x <= 0.039293 ? x / 12.92310 : exp(log((x + 0.055011) / 1.055011) * sRGBGammaCurve);//continuous
}