From 0b15698a8c76bb8abc1b555c1d91892669b4118f Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Mon, 6 Jun 2011 17:02:24 -0400 Subject: Skia Merge (revision 1510) This CL includes bug fixes and closely mirrors the version of Skia used in Chrome M13, which is likely to be our baseline for ICS. The CL also adds source files for the SampleApp which will allow us to execute basic skia tests. The SampleApp requires the utils/views directory in order to run. Finally, we have included the PDF backend for Skia in order to experiment with using it to generate PDF files for certain applications. Note: The SampleApp and PDF code are not built as part of libskia. Change-Id: I1895ccfbd8074e25f19148cc7bd1b4af571fb307 --- src/svg/SkSVGParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/svg') diff --git a/src/svg/SkSVGParser.cpp b/src/svg/SkSVGParser.cpp index df86178..f4ad198 100644 --- a/src/svg/SkSVGParser.cpp +++ b/src/svg/SkSVGParser.cpp @@ -76,8 +76,8 @@ void SkSVGParser::Delete(SkTDArray& fChildren) { int SkSVGParser::findAttribute(SkSVGBase* element, const char* attrValue, size_t len, bool isPaint) { const SkSVGAttribute* attributes; - int count = element->getAttributes(&attributes); - int result = 0; + size_t count = element->getAttributes(&attributes); + size_t result = 0; while (result < count) { if (strncmp(attributes->fName, attrValue, len) == 0 && strlen(attributes->fName) == len) { SkASSERT(result == (attributes->fOffset - @@ -200,7 +200,7 @@ bool SkSVGParser::onStartElementLen(const char name[], size_t len) { } else if (fInSVG == false) return false; const char* nextColon = strchr(name, ':'); - if (nextColon && nextColon - name < len) + if (nextColon && (size_t)(nextColon - name) < len) return false; SkSVGTypes type = GetType(name, len); // SkASSERT(type >= 0); -- cgit v1.1