diff options
| author | Guiu Rocafort <neandertalspeople@gmail.com> | 2014-03-05 17:55:31 +0000 |
|---|---|---|
| committer | Guiu Rocafort <neandertalspeople@gmail.com> | 2014-03-05 17:55:31 +0000 |
| commit | 2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc (patch) | |
| tree | 8998af65af0544ce2a92d71b82027607483a0ea3 /src/color-profile.cpp | |
| parent | translations from spanish to english done, it might need a little review, but... (diff) | |
| parent | Change tooltip to one more explicit to make cusp nodes (diff) | |
| download | inkscape-2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc.tar.gz inkscape-2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc.zip | |
completed merging
(bzr r11950.5.2)
Diffstat (limited to 'src/color-profile.cpp')
| -rw-r--r-- | src/color-profile.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 2736b9a3b..09eaa36e5 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -46,7 +46,7 @@ #include "document.h" #include "preferences.h" -#include "dom/uri.h" +#include "uri.h" #ifdef WIN32 #include <icm.h> @@ -331,13 +331,17 @@ void ColorProfile::set(unsigned key, gchar const *value) { gchar* escaped = g_uri_escape_string(this->href, "!*'();:@=+$,/?#[]", TRUE); //g_message("docbase:%s\n", docbase); - org::w3c::dom::URI docUri(docbase); + //org::w3c::dom::URI docUri(docbase); + Inkscape::URI docUri(docbase); + //# 2. Get href of icc file. we don't care if it's rel or abs - org::w3c::dom::URI hrefUri(escaped); + //org::w3c::dom::URI hrefUri(escaped); + Inkscape::URI hrefUri(escaped); //# 3. Resolve the href according the docBase. This follows // the w3c specs. All absolute and relative issues are considered - org::w3c::dom::URI cprofUri = docUri.resolve(hrefUri); - gchar* fullname = g_uri_unescape_string(cprofUri.getNativePath().c_str(), ""); + std::string fullpath = docUri.getFullPath(hrefUri.getFullPath("")); + + gchar* fullname = g_uri_unescape_string(fullpath.c_str(), ""); this->impl->_clearProfile(); this->impl->_profHandle = cmsOpenProfileFromFile( fullname, "r" ); if ( this->impl->_profHandle ) { |