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

[BUGFIX][Oracle] Mixing SDO_GEOMETRY Point definition

Browse Source 
Fixes #18900

In `sdoobj`, the `elem_info` array size is not the right way to defined the way
to read Point coordinate. The right way is to check the
sdoind attributes, like in Mapserver.

The way Mapserver defined check point coordinate: fd04328a89/maporaclespatial.c (L1588)
This commit is contained in:
rldhont 2018-05-04 12:34:40 +02:00 committed by Nyall Dawson
parent a11db8bbe1
commit 849278a2d6
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/providers/oracle/ocispatial/qsql_ocispatial.cpp
View File

@ -2544,19 +2544,13 @@ bool QOCISpatialCols::convertToWkb( QVariant &v, int index )
return false;
}
if ( iType == GtPoint && nElems == 0 )
if ( iType == GtPoint &&
sdoind->_atomic == OCI_IND_NOTNULL &&
sdoind->point.x == OCI_IND_NOTNULL &&
sdoind->point.y == OCI_IND_NOTNULL )
{
Q_ASSERT( nOrds == 0 );
if ( sdoind->_atomic != OCI_IND_NOTNULL ||
sdoind->point.x != OCI_IND_NOTNULL ||
sdoind->point.y != OCI_IND_NOTNULL )
{
qDebug() << "null point";
v = QVariant();
return true;
}
double x, y, z = 0.0;
if ( !getValue( &sdoobj->point.x, x ) )
{