Mercurial > geeqie.yaz

diff src/image.c @ 1356:681e79dd0820

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Slightly modify access_file() and use it to test profile files existence and read access.
author zas_
date Sun, 01 Mar 2009 15:41:51 +0000
parents c9949c19a6d0
children 4ca837d74999
line wrap: on
line diff
--- a/src/image.c	Sun Mar 01 15:28:06 2009 +0000
+++ b/src/image.c	Sun Mar 01 15:41:51 2009 +0000
@@ -204,13 +204,12 @@
 	if (imd->color_profile_input >= COLOR_PROFILE_FILE &&
 	    imd->color_profile_input <  COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS)
 		{
-		gint n;
-
-		n = imd->color_profile_input - COLOR_PROFILE_FILE;
-		if (!options->color_profile.input_file[n] || !options->color_profile.input_file[n][0]) return FALSE;
+		const gchar *file = options->color_profile.input_file[imd->color_profile_input - COLOR_PROFILE_FILE];
+	
+		if (!access_file(file, R_OK)) return FALSE;
 
 		input_type = COLOR_PROFILE_FILE;
-		input_file = options->color_profile.input_file[n];
+		input_file = file;
 		}
 	else if (imd->color_profile_input >= COLOR_PROFILE_SRGB &&
 		 imd->color_profile_input <  COLOR_PROFILE_FILE)
@@ -224,8 +223,7 @@
 		}
 
 	if (imd->color_profile_screen == 1 &&
-	    options->color_profile.screen_file &&
-	    options->color_profile.screen_file[0])
+	    access_file(options->color_profile.screen_file, R_OK))
 		{
 		screen_type = COLOR_PROFILE_FILE;
 		screen_file = options->color_profile.screen_file;