From: joncruz Date: Mon, 3 Apr 2006 03:15:17 +0000 (+0000) Subject: Fixed to handle relative file paths X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0faeab616a30a2ab125cef9cad994d3652205f63;p=inkscape.git Fixed to handle relative file paths --- diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 049bd14ec..b9e42ccbd 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -137,7 +137,19 @@ static void colorprofile_set( SPObject *object, unsigned key, gchar const *value // TODO open filename and URIs properly //FILE* fp = fopen_utf8name( filename, "r" ); //LCMSAPI cmsHPROFILE LCMSEXPORT cmsOpenProfileFromMem(LPVOID MemPtr, DWORD dwSize); - cprof->profHandle = cmsOpenProfileFromFile( value, "r" ); + + if ( !g_path_is_absolute(cprof->href) ) { + // Try to open relative + gchar* docbase = SP_DOCUMENT_BASE( SP_OBJECT_DOCUMENT(object) ); + gchar* fullname = g_build_filename( docbase ? docbase : ".", cprof->href, NULL ); + + cprof->profHandle = cmsOpenProfileFromFile( fullname, "r" ); + + g_free (fullname); + } else { + cprof->profHandle = cmsOpenProfileFromFile( cprof->href, "r" ); + } + #endif // ENABLE_LCMS } }