Skip to content

Commit

Permalink
fix gml wkb assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Feb 9, 2016
1 parent 4a8b49b commit d05c31e
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 22 deletions.
12 changes: 12 additions & 0 deletions src/core/geometry/qgswkbptr.cpp
View file
Expand Up @@ -21,6 +21,12 @@ QgsWkbPtr::QgsWkbPtr( unsigned char *p, int size )
mEnd = mP + size;
}

void QgsWkbPtr::verifyBound( int size ) const
{
if ( !mP || mP + size > mEnd )
throw QgsWkbException( "wkb access out of bounds" );
}

QgsConstWkbPtr::QgsConstWkbPtr( const unsigned char *p, int size )
{
mP = const_cast< unsigned char * >( p );
Expand All @@ -42,3 +48,9 @@ QgsWKBTypes::Type QgsConstWkbPtr::readHeader() const

return static_cast<QgsWKBTypes::Type>( wkbType );
}

void QgsConstWkbPtr::verifyBound( int size ) const
{
if ( !mP || mP + size > mEnd )
throw QgsWkbException( "wkb access out of bounds" );
}
4 changes: 2 additions & 2 deletions src/core/geometry/qgswkbptr.h
View file
Expand Up @@ -40,7 +40,7 @@ class CORE_EXPORT QgsWkbPtr
unsigned char *mStart;
unsigned char *mEnd;

void verifyBound( int size ) const { if ( !mP || mP + size > mEnd ) throw QgsWkbException( "wkb access out of bounds" ); }
void verifyBound( int size ) const;

template<typename T> void read( T& v ) const
{
Expand Down Expand Up @@ -93,7 +93,7 @@ class CORE_EXPORT QgsConstWkbPtr
unsigned char *mEnd;
mutable bool mEndianSwap;

void verifyBound( int size ) const { if ( !mP || mP + size > mEnd ) throw QgsWkbException( "wkb access out of bounds" ); }
void verifyBound( int size ) const;

template<typename T> void read( T& v ) const
{
Expand Down
37 changes: 18 additions & 19 deletions src/core/qgsgml.cpp
View file
Expand Up @@ -110,7 +110,7 @@ int QgsGml::getFeatures( const QString& uri, QGis::WkbType* wkbType, QgsRectangl
QProgressDialog* progressDialog = nullptr;
QWidget* mainWindow = nullptr;
QWidgetList topLevelWidgets = qApp->topLevelWidgets();
for ( QWidgetList::iterator it = topLevelWidgets.begin(); it != topLevelWidgets.end(); ++it )
for ( QWidgetList::const_iterator it = topLevelWidgets.constBegin(); it != topLevelWidgets.constEnd(); ++it )
{
if (( *it )->objectName() == "QgisApp" )
{
Expand Down Expand Up @@ -417,7 +417,7 @@ void QgsGml::endElement( const XML_Char* el )
if ( theParseMode == QgsGml::geometry )
{
//directly add WKB point to the feature
if ( getPointWKB( mCurrentWKB, *( pointList.begin() ) ) != 0 )
if ( getPointWKB( mCurrentWKB, *( pointList.constBegin() ) ) != 0 )
{
//error
}
Expand All @@ -430,7 +430,7 @@ void QgsGml::endElement( const XML_Char* el )
else //multipoint, add WKB as fragment
{
QgsWkbPtr wkbPtr( nullptr, 0 );
if ( getPointWKB( wkbPtr, *( pointList.begin() ) ) != 0 )
if ( getPointWKB( wkbPtr, *( pointList.constBegin() ) ) != 0 )
{
//error
}
Expand Down Expand Up @@ -739,7 +739,7 @@ int QgsGml::getLineWKB( QgsWkbPtr &wkbPtr, const QList<QgsPoint>& lineCoordinate
fillPtr << mEndian << QGis::WKBLineString << lineCoordinates.size();

QList<QgsPoint>::const_iterator iter;
for ( iter = lineCoordinates.begin(); iter != lineCoordinates.end(); ++iter )
for ( iter = lineCoordinates.constBegin(); iter != lineCoordinates.constEnd(); ++iter )
{
fillPtr << iter->x() << iter->y();
}
Expand All @@ -757,7 +757,7 @@ int QgsGml::getRingWKB( QgsWkbPtr &wkbPtr, const QList<QgsPoint>& ringCoordinate
fillPtr << ringCoordinates.size();

QList<QgsPoint>::const_iterator iter;
for ( iter = ringCoordinates.begin(); iter != ringCoordinates.end(); ++iter )
for ( iter = ringCoordinates.constBegin(); iter != ringCoordinates.constEnd(); ++iter )
{
fillPtr << iter->x() << iter->y();
}
Expand All @@ -772,12 +772,11 @@ int QgsGml::createMultiLineFromFragments()

QgsWkbPtr wkbPtr( mCurrentWKB, mCurrentWKBSize );

wkbPtr << mEndian << QGis::WKBMultiLineString << mCurrentWKBFragments.begin()->size();

QList<QgsWkbPtr>::iterator wkbIt = mCurrentWKBFragments.begin()->begin();
wkbPtr << mEndian << QGis::WKBMultiLineString << mCurrentWKBFragments.constBegin()->size();

//copy (and delete) all the wkb fragments
for ( ; wkbIt != mCurrentWKBFragments.begin()->end(); ++wkbIt )
QList<QgsWkbPtr>::const_iterator wkbIt = mCurrentWKBFragments.constBegin()->constBegin();
for ( ; wkbIt != mCurrentWKBFragments.constBegin()->constEnd(); ++wkbIt )
{
memcpy( wkbPtr, *wkbIt, wkbIt->size() );
wkbPtr += wkbIt->size();
Expand All @@ -795,10 +794,10 @@ int QgsGml::createMultiPointFromFragments()
mCurrentWKB = QgsWkbPtr( new unsigned char[mCurrentWKBSize], mCurrentWKBSize );

QgsWkbPtr wkbPtr( mCurrentWKB );
wkbPtr << mEndian << QGis::WKBMultiPoint << mCurrentWKBFragments.begin()->size();
wkbPtr << mEndian << QGis::WKBMultiPoint << mCurrentWKBFragments.constBegin()->size();

QList<QgsWkbPtr>::iterator wkbIt = mCurrentWKBFragments.begin()->begin();
for ( ; wkbIt != mCurrentWKBFragments.begin()->end(); ++wkbIt )
QList<QgsWkbPtr>::const_iterator wkbIt = mCurrentWKBFragments.constBegin()->constBegin();
for ( ; wkbIt != mCurrentWKBFragments.constBegin()->constEnd(); ++wkbIt )
{
memcpy( wkbPtr, *wkbIt, wkbIt->size() );
wkbPtr += wkbIt->size();
Expand All @@ -817,10 +816,10 @@ int QgsGml::createPolygonFromFragments()
mCurrentWKB = QgsWkbPtr( new unsigned char[mCurrentWKBSize], mCurrentWKBSize );

QgsWkbPtr wkbPtr( mCurrentWKB );
wkbPtr << mEndian << QGis::WKBPolygon << mCurrentWKBFragments.begin()->size();
wkbPtr << mEndian << QGis::WKBPolygon << mCurrentWKBFragments.constBegin()->size();

QList<QgsWkbPtr>::iterator wkbIt = mCurrentWKBFragments.begin()->begin();
for ( ; wkbIt != mCurrentWKBFragments.begin()->end(); ++wkbIt )
QList<QgsWkbPtr>::const_iterator wkbIt = mCurrentWKBFragments.constBegin()->constBegin();
for ( ; wkbIt != mCurrentWKBFragments.constBegin()->constEnd(); ++wkbIt )
{
memcpy( wkbPtr, *wkbIt, wkbIt->size() );
wkbPtr += wkbIt->size();
Expand All @@ -845,15 +844,15 @@ int QgsGml::createMultiPolygonFromFragments()
wkbPtr << ( char ) mEndian << QGis::WKBMultiPolygon << mCurrentWKBFragments.size();

//have outer and inner iterators
QList< QList<QgsWkbPtr> >::iterator outerWkbIt = mCurrentWKBFragments.begin();
QList< QList<QgsWkbPtr> >::const_iterator outerWkbIt = mCurrentWKBFragments.constBegin();

for ( ; outerWkbIt != mCurrentWKBFragments.end(); ++outerWkbIt )
for ( ; outerWkbIt != mCurrentWKBFragments.constEnd(); ++outerWkbIt )
{
//new polygon
wkbPtr << ( char ) mEndian << QGis::WKBPolygon << outerWkbIt->size();

QList<QgsWkbPtr>::iterator innerWkbIt = outerWkbIt->begin();
for ( ; innerWkbIt != outerWkbIt->end(); ++innerWkbIt )
QList<QgsWkbPtr>::const_iterator innerWkbIt = outerWkbIt->constBegin();
for ( ; innerWkbIt != outerWkbIt->constEnd(); ++innerWkbIt )
{
memcpy( wkbPtr, *innerWkbIt, innerWkbIt->size() );
wkbPtr += innerWkbIt->size();
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsgml.h
View file
Expand Up @@ -235,7 +235,7 @@ class CORE_EXPORT QgsGml : public QObject
* are used*/
QList< QList<QgsWkbPtr> > mCurrentWKBFragments;
QString mAttributeName;
QgsApplication::endian_t mEndian;
char mEndian;
/** Coordinate separator for coordinate strings. Usually "," */
QString mCoordinateSeparator;
/** Tuple separator for coordinate strings. Usually " " */
Expand Down

0 comments on commit d05c31e

Please sign in to comment.