sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compoundcurve parser

Browse Source
This commit is contained in:
Tamas Szekeres 2019-06-11 13:11:51 +02:00 committed by Nyall Dawson
parent 68a5d1a994
commit 2dc40ae039
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/providers/mssql/qgsmssqlgeometryparser.cpp
View File

@ -467,11 +467,13 @@ std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( i
switch ( SegmentType( mSegment ) )
{
case SMT_FIRSTLINE:
if ( isCurve )
poCompoundCurve->addCurve( readCircularString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
else
poCompoundCurve->addCurve( readLineString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
if (nPointsPrepared > 0)
{
if ( isCurve )
poCompoundCurve->addCurve( readCircularString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
else
poCompoundCurve->addCurve( readLineString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
}
isCurve = false;
nPointsPrepared = 1;
++iPoint;
@ -481,11 +483,13 @@ std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( i
++iPoint;
break;
case SMT_FIRSTARC:
if ( isCurve )
poCompoundCurve->addCurve( readCircularString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
else
poCompoundCurve->addCurve( readLineString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
if ( nPointsPrepared > 0 )
{
if ( isCurve )
poCompoundCurve->addCurve( readCircularString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
else
poCompoundCurve->addCurve( readLineString( iPoint - nPointsPrepared, iPoint + 1 ).release() );
}
isCurve = true;
nPointsPrepared = 2;
iPoint += 2;