summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2006-11-15 15:32:13 +0000
committerishmal <ishmal@users.sourceforge.net>2006-11-15 15:32:13 +0000
commit7c859ef567007b86141b59717a164a397f6ab565 (patch)
treee6dc60dc967db15acdf7768ba088c2f57ee2699a /src
parentMore compile error cleanup (diff)
downloadinkscape-7c859ef567007b86141b59717a164a397f6ab565.tar.gz
inkscape-7c859ef567007b86141b59717a164a397f6ab565.zip
Fix non-basenames
(bzr r1956)
Diffstat (limited to 'src')
-rw-r--r--src/dom/uri.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dom/uri.cpp b/src/dom/uri.cpp
index ff5e91ff8..6db803134 100644
--- a/src/dom/uri.cpp
+++ b/src/dom/uri.cpp
@@ -332,13 +332,15 @@ URI URI::resolve(const URI &other) const
}
else
{
- unsigned int pos = path.rfind('/');
+ unsigned int pos = path.find_last_of('/');
if (pos != path.npos)
{
DOMString tpath = path.substr(0, pos+1);
tpath.append(other.path);
newUri.path = tpath;
}
+ else
+ newUri.path = other.path;
}
}