Merge pull request #3492 from ahuarte47/Issue_RemoveStrlenWarnings

m-kuhn · web-flow · commit c74d0085e6de · 2016-09-16T08:08:44.000+02:00
Remove strlen warnings on windows/vstudio
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>() );

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> QgsGmlStreamingParser:`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`#define LOCALNAME_EQUALS(string_constant) \`
`456`		`- ( localNameLen == strlen( string_constant ) && memcmp(pszLocalName, string_constant, localNameLen) == 0 )`
	`456`	`+ ( localNameLen == ( int )strlen( string_constant ) && memcmp(pszLocalName, string_constant, localNameLen) == 0 )`
`457`	`457`
`458`	`458`	`void QgsGmlStreamingParser::startElement( const XML_Char* el, const XML_Char** attr )`
`459`	`459`	`{`
`@@ -674,7 +674,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char* el, const XML_Char** a`
`674`	`674`	`isGeom = true;`
`675`	`675`	`}`
`676`	`676`	`else if ( isGMLNS &&`
`677`		`- localNameLen == strlen( "Polygon" ) && memcmp( pszLocalName, "Polygon", localNameLen ) == 0 )`
	`677`	`+ localNameLen == ( int )strlen( "Polygon" ) && memcmp( pszLocalName, "Polygon", localNameLen ) == 0 )`
`678`	`678`	`{`
`679`	`679`	`isGeom = true;`
`680`	`680`	`mCurrentWKBFragments.push_back( QList<QgsWkbPtr>() );`