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

Add explicit type conversions to satisfy C++11 requirements.

Browse Source 
(cherry picked from commit b93c730)
This commit is contained in:
bobobo1618
2015-11-01 01:02:48 -07:00
parent 6dc09ed8a9
commit 6ec6e51c35
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/rawimagesource.cc
View File

@@ -2744,7 +2744,9 @@ void RawImageSource::processFlatField(const RAWParams &raw, RawImage *riFlatFile
*/
void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, RawImage *riDark, RawImage *riFlatFile )
{
unsigned short black[4] = {ri->get_cblack(0), ri->get_cblack(1), ri->get_cblack(2), ri->get_cblack(3)};
unsigned short black[4] = {
(unsigned short)ri->get_cblack(0), (unsigned short)ri->get_cblack(1),
(unsigned short)ri->get_cblack(2), (unsigned short)ri->get_cblack(3)};
if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS) {
if (!rawData) {
@@ -4217,7 +4219,10 @@ void RawImageSource::getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LU
histRedRaw.clear();
histGreenRaw.clear();
histBlueRaw.clear();
const float mult[4] = { 65535.0 / ri->get_white(0), 65535.0 / ri->get_white(1), 65535.0 / ri->get_white(2), 65535.0 / ri->get_white(3) };
const float mult[4] = { 65535.0f / ri->get_white(0),
65535.0f / ri->get_white(1),
65535.0f / ri->get_white(2),
65535.0f / ri->get_white(3) };
#ifdef _OPENMP
int numThreads;