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

Merged master into gtk3, fixed three conflicts.

Browse Source
This commit is contained in:
Beep6581
2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/iplab2rgb.cc
View File

@@ -117,9 +117,9 @@ void ImProcFunctions::lab2monitorRgb (LabImage* lab, Image8* image)
/* copy RGB */
//int R1=((int)gamma2curve[(R)])
data[ix++] = ((int)Color::gamma2curve[CLIP (R)]) >> 8;
data[ix++] = ((int)Color::gamma2curve[CLIP (G)]) >> 8;
data[ix++] = ((int)Color::gamma2curve[CLIP (B)]) >> 8;
data[ix++] = ((int)Color::gamma2curve[R]) >> 8;
data[ix++] = ((int)Color::gamma2curve[G]) >> 8;
data[ix++] = ((int)Color::gamma2curve[B]) >> 8;
}
}
}
@@ -229,9 +229,9 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
Color::xyz2rgb(x_, y_, z_, R, G, B, xyz_rgb);
image->data[ix++] = (int)Color::gamma2curve[CLIP (R)] >> 8;
image->data[ix++] = (int)Color::gamma2curve[CLIP (G)] >> 8;
image->data[ix++] = (int)Color::gamma2curve[CLIP (B)] >> 8;
image->data[ix++] = (int)Color::gamma2curve[R] >> 8;
image->data[ix++] = (int)Color::gamma2curve[G] >> 8;
image->data[ix++] = (int)Color::gamma2curve[B] >> 8;
}
}
}