Merge pull request #3492 from ahuarte47/Issue_RemoveStrlenWarnings

Remove strlen warnings on windows/vstudio
qgis · Sep 16, 2016 · c74d008 · c74d008
2 parents 1b0efa3 + d1103e5
commit c74d008
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
@@ -453,7 +453,7 @@ QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> QgsGmlStreamingParser:
 }
 
 #define LOCALNAME_EQUALS(string_constant) \
-  ( localNameLen == strlen( string_constant ) && memcmp(pszLocalName, string_constant, localNameLen) == 0 )
+  ( localNameLen == ( int )strlen( string_constant ) && memcmp(pszLocalName, string_constant, localNameLen) == 0 )
 
 void QgsGmlStreamingParser::startElement( const XML_Char* el, const XML_Char** attr )
 {
@@ -674,7 +674,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char* el, const XML_Char** a
     isGeom = true;
   }
   else if ( isGMLNS &&
-            localNameLen == strlen( "Polygon" ) && memcmp( pszLocalName, "Polygon", localNameLen ) == 0 )
+            localNameLen == ( int )strlen( "Polygon" ) && memcmp( pszLocalName, "Polygon", localNameLen ) == 0 )
   {
     isGeom = true;
     mCurrentWKBFragments.push_back( QList<QgsWkbPtr>() );