summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/pdfinput/svg-builder.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2012-04-18 07:02:24 +0000
committerJon A. Cruz <jon@joncruz.org>2012-04-18 07:02:24 +0000
commit36e3c5550b49949729f2f23ab1796afdc53d6487 (patch)
tree8e1dc72ecb79f130bf9c07576c7d97e44c9d0186 /src/extension/internal/pdfinput/svg-builder.cpp
parentFix for 903676 : Replace GtkCList with GtkTreeView in XML Tree, fix assert on... (diff)
downloadinkscape-36e3c5550b49949729f2f23ab1796afdc53d6487.tar.gz
inkscape-36e3c5550b49949729f2f23ab1796afdc53d6487.zip
Warning cleanup
(bzr r11265)
Diffstat (limited to 'src/extension/internal/pdfinput/svg-builder.cpp')
-rw-r--r--src/extension/internal/pdfinput/svg-builder.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index eefd66e12..6606e1846 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -910,10 +910,10 @@ void SvgBuilder::updateStyle(GfxState *state) {
that a space in sp may be removed or replaced by some other tokens
specified in the code. (Bug LP #179589)
*/
-static int MatchingChars(std::string s1, std::string sp)
+static size_t MatchingChars(std::string s1, std::string sp)
{
- unsigned int is = 0;
- unsigned int ip = 0;
+ size_t is = 0;
+ size_t ip = 0;
while(is < s1.length() && ip < sp.length()) {
if (s1[is] == sp[ip]) {
@@ -927,7 +927,7 @@ static int MatchingChars(std::string s1, std::string sp)
break;
}
}
- return(ip);
+ return ip;
}
/*
@@ -944,12 +944,12 @@ std::string SvgBuilder::_BestMatchingFont(std::string PDFname)
std::string fontname = _availableFontNames[i];
// At least the first word of the font name should match.
- guint minMatch = fontname.find(" ");
+ size_t minMatch = fontname.find(" ");
if (minMatch == std::string::npos) {
minMatch = fontname.length();
}
- int Match = MatchingChars(PDFname, fontname);
+ size_t Match = MatchingChars(PDFname, fontname);
if (Match >= minMatch) {
double relMatch = (float)Match / (fontname.length() + PDFname.length());
if (relMatch > bestMatch) {