Mercurial > geeqie

comparison src/image.c @ 1550:ffc44762e706

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
color profile fixes
author nadvornik
date Mon, 13 Apr 2009 22:40:47 +0000
parents 7302ff300a52
children 3d9f5c078521
comparison
equal deleted inserted replaced
1549:7302ff300a52 1550:ffc44762e706
241 image_get_x11_screen_profile(imd, &screen_profile, &screen_profile_len)) 241 image_get_x11_screen_profile(imd, &screen_profile, &screen_profile_len))
242 { 242 {
243 screen_type = COLOR_PROFILE_MEM; 243 screen_type = COLOR_PROFILE_MEM;
244 DEBUG_1("Using X11 screen profile, length: %d", screen_profile_len); 244 DEBUG_1("Using X11 screen profile, length: %d", screen_profile_len);
245 } 245 }
246 if (options->color_profile.screen_file && 246 else if (options->color_profile.screen_file &&
247 is_readable_file(options->color_profile.screen_file)) 247 is_readable_file(options->color_profile.screen_file))
248 { 248 {
249 screen_type = COLOR_PROFILE_FILE; 249 screen_type = COLOR_PROFILE_FILE;
250 screen_file = options->color_profile.screen_file; 250 screen_file = options->color_profile.screen_file;
251 } 251 }
346 346
347 imd->cm = (gpointer)cm; 347 imd->cm = (gpointer)cm;
348 #if 0 348 #if 0
349 if (run_in_bg) color_man_start_bg(imd->cm, image_post_process_color_cb, imd); 349 if (run_in_bg) color_man_start_bg(imd->cm, image_post_process_color_cb, imd);
350 #endif 350 #endif
351 return TRUE; 351 }
352 } 352
353 353 image_update_util(imd);
354 return FALSE; 354 return !!cm;
355 } 355 }
356 356
357 357
358 static void image_post_process_tile_color_cb(PixbufRenderer *pr, GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data) 358 static void image_post_process_tile_color_cb(PixbufRenderer *pr, GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
359 { 359 {