Mercurial > geeqie
comparison src/image.c @ 1333:bdc19836c33d
Really fix up color profiles options tests. Add an indicator of the embedded color profile when recognized (a * just after sRGB or AdobeRGB compatible).
| author | zas_ |
|---|---|
| date | Fri, 27 Feb 2009 23:25:31 +0000 |
| parents | c37f36b97173 |
| children | 091ba3e6aedb |
comparison
equal
deleted
inserted
replaced
| 1332:4286f08079b6 | 1333:bdc19836c33d |
|---|---|
| 205 imd->color_profile_input < COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS) | 205 imd->color_profile_input < COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS) |
| 206 { | 206 { |
| 207 gint n; | 207 gint n; |
| 208 | 208 |
| 209 n = imd->color_profile_input - COLOR_PROFILE_FILE; | 209 n = imd->color_profile_input - COLOR_PROFILE_FILE; |
| 210 if (!options->color_profile.input_file[n]) return FALSE; | 210 if (!options->color_profile.input_file[n] || !options->color_profile.input_file[n][0]) return FALSE; |
| 211 | 211 |
| 212 input_type = COLOR_PROFILE_FILE; | 212 input_type = COLOR_PROFILE_FILE; |
| 213 input_file = options->color_profile.input_file[n]; | 213 input_file = options->color_profile.input_file[n]; |
| 214 } | 214 } |
| 215 else if (imd->color_profile_input >= COLOR_PROFILE_SRGB && | 215 else if (imd->color_profile_input >= COLOR_PROFILE_SRGB && |
| 222 { | 222 { |
| 223 return FALSE; | 223 return FALSE; |
| 224 } | 224 } |
| 225 | 225 |
| 226 if (imd->color_profile_screen == 1 && | 226 if (imd->color_profile_screen == 1 && |
| 227 options->color_profile.screen_file) | 227 options->color_profile.screen_file && |
| 228 options->color_profile.screen_file[0]) | |
| 228 { | 229 { |
| 229 screen_type = COLOR_PROFILE_FILE; | 230 screen_type = COLOR_PROFILE_FILE; |
| 230 screen_file = options->color_profile.screen_file; | 231 screen_file = options->color_profile.screen_file; |
| 231 } | 232 } |
| 232 else if (imd->color_profile_screen == 0) | 233 else if (imd->color_profile_screen == 0) |