diff options
Diffstat (limited to 'image.c')
| -rw-r--r-- | image.c | 54 |
1 files changed, 53 insertions, 1 deletions
@@ -39,11 +39,27 @@ enum { MIN_GIF_DELAY = 25 }; float zoom_min; float zoom_max; -int zoomdiff(float z1, float z2) +static int zoomdiff(float z1, float z2) { return (int) (z1 * 1000.0 - z2 * 1000.0); } +static void img_apply_gamma(img_t *img) +{ + if (img == NULL || img->im == NULL || img->cmod == NULL) + return; + + if (img->gamma == 0) { + imlib_context_set_color_modifier(NULL); + } else { + double range = img->gamma <= 0 ? 1.0 : GAMMA_MAX - 1.0; + + imlib_context_set_color_modifier(img->cmod); + imlib_reset_color_modifier(); + imlib_modify_color_modifier_gamma(1.0 + img->gamma * (range / GAMMA_RANGE)); + } +} + void img_init(img_t *img, win_t *win) { zoom_min = zoom_levels[0] / 100.0; @@ -67,6 +83,9 @@ void img_init(img_t *img, win_t *win) img->alpha = !RENDER_WHITE_ALPHA; img->multi.cap = img->multi.cnt = 0; img->multi.animate = false; + + img->cmod = imlib_create_color_modifier(); + img->gamma = MIN(MAX(options->gamma, -GAMMA_RANGE), GAMMA_RANGE); } void exif_auto_orientate(const fileinfo_t *file) @@ -303,6 +322,8 @@ bool img_load(img_t *img, const fileinfo_t *file) img_load_gif(img, file); #endif + img_apply_gamma(img); + img->w = imlib_image_get_width(); img->h = imlib_image_get_height(); img->scalemode = options->scalemode; @@ -335,6 +356,9 @@ void img_close(img_t *img, bool decache) imlib_free_image(); img->im = NULL; } + + if (img->cmod) + imlib_context_set_color_modifier(NULL); } void img_check_pan(img_t *img, bool moved) @@ -706,6 +730,34 @@ void img_toggle_antialias(img_t *img) img->dirty = true; } +bool img_change_gamma(img_t *img, int d) +{ + /* d < 0: decrease gamma + * d = 0: reset gamma + * d > 0: increase gamma + */ + int gamma; + + if (img == NULL || img->im == NULL) + return false; + + if (d == 0) + gamma = 0; + else if (d < 0) + gamma = MAX(-GAMMA_RANGE, img->gamma - 1); + else + gamma = MIN(+GAMMA_RANGE, img->gamma + 1); + + if (img->gamma != gamma) { + img->gamma = gamma; + img_apply_gamma(img); + img->dirty = true; + return true; + } else { + return false; + } +} + bool img_frame_goto(img_t *img, int n) { if (img == NULL || img->im == NULL) |