Mercurial > geeqie
comparison src/image.c @ 320:c74af1cbd61a
Move more options to ConfOptions.
| author | zas_ |
|---|---|
| date | Fri, 11 Apr 2008 22:52:22 +0000 |
| parents | b16b9b8979e5 |
| children | 049d6b00cc14 |
comparison
equal
deleted
inserted
replaced
| 319:f9611a6cf0e2 | 320:c74af1cbd61a |
|---|---|
| 333 imd->color_profile_input <= COLOR_PROFILE_INPUTS) | 333 imd->color_profile_input <= COLOR_PROFILE_INPUTS) |
| 334 { | 334 { |
| 335 gint n; | 335 gint n; |
| 336 | 336 |
| 337 n = imd->color_profile_input - 1; | 337 n = imd->color_profile_input - 1; |
| 338 if (!color_profile_input_file[n]) return FALSE; | 338 if (!options->color_profile_input_file[n]) return FALSE; |
| 339 | 339 |
| 340 input_type = COLOR_PROFILE_FILE; | 340 input_type = COLOR_PROFILE_FILE; |
| 341 input_file = color_profile_input_file[n]; | 341 input_file = options->color_profile_input_file[n]; |
| 342 } | 342 } |
| 343 else if (imd->color_profile_input == 0) | 343 else if (imd->color_profile_input == 0) |
| 344 { | 344 { |
| 345 input_type = COLOR_PROFILE_SRGB; | 345 input_type = COLOR_PROFILE_SRGB; |
| 346 input_file = NULL; | 346 input_file = NULL; |
| 349 { | 349 { |
| 350 return FALSE; | 350 return FALSE; |
| 351 } | 351 } |
| 352 | 352 |
| 353 if (imd->color_profile_screen == 1 && | 353 if (imd->color_profile_screen == 1 && |
| 354 color_profile_screen_file) | 354 options->color_profile_screen_file) |
| 355 { | 355 { |
| 356 screen_type = COLOR_PROFILE_FILE; | 356 screen_type = COLOR_PROFILE_FILE; |
| 357 screen_file = color_profile_screen_file; | 357 screen_file = options->color_profile_screen_file; |
| 358 } | 358 } |
| 359 else if (imd->color_profile_screen == 0) | 359 else if (imd->color_profile_screen == 0) |
| 360 { | 360 { |
| 361 screen_type = COLOR_PROFILE_SRGB; | 361 screen_type = COLOR_PROFILE_SRGB; |
| 362 screen_file = NULL; | 362 screen_file = NULL; |
| 425 { | 425 { |
| 426 ExifData *exif = NULL; | 426 ExifData *exif = NULL; |
| 427 | 427 |
| 428 if (!image_get_pixbuf(imd)) return; | 428 if (!image_get_pixbuf(imd)) return; |
| 429 | 429 |
| 430 if (exif_rotate_enable || | 430 if (options->exif_rotate_enable || |
| 431 (imd->color_profile_enable && imd->color_profile_use_image) ) | 431 (imd->color_profile_enable && imd->color_profile_use_image) ) |
| 432 { | 432 { |
| 433 exif = exif_read_fd(imd->image_fd, (imd->color_profile_enable && imd->color_profile_use_image)); | 433 exif = exif_read_fd(imd->image_fd, (imd->color_profile_enable && imd->color_profile_use_image)); |
| 434 } | 434 } |
| 435 | 435 |
| 436 if (exif_rotate_enable && exif) | 436 if (options->exif_rotate_enable && exif) |
| 437 { | 437 { |
| 438 gint orientation; | 438 gint orientation; |
| 439 | 439 |
| 440 if (exif_get_integer(exif, "Exif.Image.Orientation", &orientation)) | 440 if (exif_get_integer(exif, "Exif.Image.Orientation", &orientation)) |
| 441 { | 441 { |
| 1520 ImageWindow *imd = data; | 1520 ImageWindow *imd = data; |
| 1521 time_t newtime; | 1521 time_t newtime; |
| 1522 | 1522 |
| 1523 if (!imd || !image_get_pixbuf(imd) || | 1523 if (!imd || !image_get_pixbuf(imd) || |
| 1524 imd->il || !imd->image_fd || | 1524 imd->il || !imd->image_fd || |
| 1525 !update_on_time_change) return TRUE; | 1525 !options->update_on_time_change) return TRUE; |
| 1526 | 1526 |
| 1527 newtime = filetime(imd->image_fd->path); | 1527 newtime = filetime(imd->image_fd->path); |
| 1528 if (newtime > 0 && newtime != imd->mtime) | 1528 if (newtime > 0 && newtime != imd->mtime) |
| 1529 { | 1529 { |
| 1530 imd->mtime = newtime; | 1530 imd->mtime = newtime; |