Skip to content

Commit 17b31c2

Browse files
committed
Feature #8725: Minor improvement
1 parent 5a6dc99 commit 17b31c2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/providers/ogr/qgsogrfeatureiterator.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,12 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
236236
notifyReadedFeature( fet, geom, feature );
237237

238238
// get the wkb representation
239-
unsigned char *wkb = new unsigned char[OGR_G_WkbSize( geom )];
239+
int memorySize = OGR_G_WkbSize( geom );
240+
unsigned char *wkb = new unsigned char[memorySize];
240241
OGR_G_ExportToWkb( geom, ( OGRwkbByteOrder ) QgsApplication::endian(), wkb );
241242

242-
feature.setGeometryAndOwnership( wkb, OGR_G_WkbSize( geom ) );
243+
QgsGeometry* geometry = feature.geometry();
244+
if ( !geometry ) feature.setGeometryAndOwnership( wkb, memorySize ); else geometry->fromWkb( wkb, memorySize );
243245

244246
notifyLoadedFeature( fet, feature );
245247
}

0 commit comments

Comments
 (0)