Contrast by detail levels - fixes to UI and precision in engine .

This commit is contained in:
michael
2013-12-20 12:00:16 -05:00
parent bbac811a44
commit d9821b6d06
2 changed files with 5 additions and 5 deletions

View File

@@ -102,7 +102,7 @@ namespace rtengine {
for (int i=0; i<srcheight; i++) for (int i=0; i<srcheight; i++)
for (int j=0; j<srcwidth; j++) { for (int j=0; j<srcwidth; j++) {
dst[i][j] = CLIP((int)( buffer[i][j] )); // TODO: Really a clip necessary? dst[i][j] = CLIP( buffer[i][j] ); // TODO: Really a clip necessary?
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -170,14 +170,14 @@ namespace rtengine {
for (int i=0; i<srcheight; i++) for (int i=0; i<srcheight; i++)
for (int j=0; j<srcwidth; j++) { for (int j=0; j<srcwidth; j++) {
if(ncie->J_p[i][j] > 8.f && ncie->J_p[i][j] < 92.f) if(ncie->J_p[i][j] > 8.f && ncie->J_p[i][j] < 92.f)
dst[i][j] = CLIP((int)( buffer[i][j] )); // TODO: Really a clip necessary? dst[i][j] = CLIP( buffer[i][j] ); // TODO: Really a clip necessary?
else else
dst[i][j]=src[i][j]; dst[i][j]=src[i][j];
} }
else else
for (int i=0; i<srcheight; i++) for (int i=0; i<srcheight; i++)
for (int j=0; j<srcwidth; j++) { for (int j=0; j<srcwidth; j++) {
dst[i][j] = CLIP((int)( buffer[i][j] )); // TODO: Really a clip necessary? dst[i][j] = CLIP( buffer[i][j] ); // TODO: Really a clip necessary?
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
} }

View File

@@ -218,7 +218,7 @@ void DirPyrEqualizer::lumaneutralPressed () {
void DirPyrEqualizer::lumacontrastPlusPressed () { void DirPyrEqualizer::lumacontrastPlusPressed () {
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
float inc = 0.05 * (4 - i); float inc = 0.05 * (5 - i);
multiplier[i]->setValue(multiplier[i]->getValue() + inc); multiplier[i]->setValue(multiplier[i]->getValue() + inc);
adjusterChanged(multiplier[i], multiplier[i]->getValue()); adjusterChanged(multiplier[i], multiplier[i]->getValue());
} }
@@ -228,7 +228,7 @@ void DirPyrEqualizer::lumacontrastPlusPressed () {
void DirPyrEqualizer::lumacontrastMinusPressed () { void DirPyrEqualizer::lumacontrastMinusPressed () {
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
float inc = -0.05 * (4 - i); float inc = -0.05 * (5 - i);
multiplier[i]->setValue(multiplier[i]->getValue() + inc); multiplier[i]->setValue(multiplier[i]->getValue() + inc);
adjusterChanged(multiplier[i], multiplier[i]->getValue()); adjusterChanged(multiplier[i], multiplier[i]->getValue());
} }