examples/gamma-control: clamp values, default brightness to 1

This commit is contained in:
emersion 2018-07-25 14:37:10 +01:00
parent 1d97202ec2
commit b0c32019c3
1 changed files with 8 additions and 3 deletions

View File

@ -115,7 +115,12 @@ static void fill_gamma_table(uint16_t *table, uint32_t ramp_size,
uint16_t *b = table + 2 * ramp_size; uint16_t *b = table + 2 * ramp_size;
for (uint32_t i = 0; i < ramp_size; ++i) { for (uint32_t i = 0; i < ramp_size; ++i) {
double val = (double)i / (ramp_size - 1); double val = (double)i / (ramp_size - 1);
val = contrast * pow(val, 1.0 / gamma) + brightness; val = contrast * pow(val, 1.0 / gamma) + (1 - brightness);
if (val > 1.0) {
val = 1.0;
} else if (val < 0.0) {
val = 0.0;
}
r[i] = g[i] = b[i] = (uint16_t)(UINT16_MAX * val); r[i] = g[i] = b[i] = (uint16_t)(UINT16_MAX * val);
} }
} }
@ -123,13 +128,13 @@ static void fill_gamma_table(uint16_t *table, uint32_t ramp_size,
static const char usage[] = "usage: gamma-control [options]\n" static const char usage[] = "usage: gamma-control [options]\n"
" -h show this help message\n" " -h show this help message\n"
" -c <value> set contrast (default: 1)\n" " -c <value> set contrast (default: 1)\n"
" -b <value> set brightness (default: 0)\n" " -b <value> set brightness (default: 1)\n"
" -g <value> set gamma (default: 1)\n"; " -g <value> set gamma (default: 1)\n";
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
wl_list_init(&outputs); wl_list_init(&outputs);
double contrast = 1, brightness = 0, gamma = 1; double contrast = 1, brightness = 1, gamma = 1;
int opt; int opt;
while ((opt = getopt(argc, argv, "hc:b:g:")) != -1) { while ((opt = getopt(argc, argv, "hc:b:g:")) != -1) {
switch (opt) { switch (opt) {