Defer inlining of blocks until actually required (trac ticket #7106) #251
Conversation
| they are part of. | ||
| attributes, they will also have a Block attribute indicating what block | ||
| they are part of. (Note, in GDAL 2.2.2 and earlier this attribute was called | ||
| BlockName.) |
There was a problem hiding this comment.
"GDAL < 2.3"
(there will likely be a GDAL 2.2.3 without those trunk-only changes)
| <li> The entities in the blocks layer should have the BlockName field | ||
| populated. | ||
| <li> The entities in the blocks layer should have the Block field | ||
| populated. (Note, in GDAL 2.2.2 and earlier this attribute was called |
| /* Convert to polygon, multipolygon, multilinestring or multipoint */ | ||
| /* -------------------------------------------------------------------- */ | ||
| // Restore old inline blocks setting | ||
| bInlineBlocks = bOldInlineBlocks; |
There was a problem hiding this comment.
Missing restoration in above early return in error code path
| /* point. */ | ||
| /************************************************************************/ | ||
| OGRDXFFeature *OGRDXFLayer::InsertBlockReference( const CPLString& osBlockName, | ||
| OGRDXFInsertTransformer oTransformer, OGRDXFFeature* const poFeature ) |
There was a problem hiding this comment.
"const OGRDXFInsertTranformer&" to save a copy
| @@ -74,77 +73,73 @@ void OGRDXFBlocksLayer::ResetReading() | |||
|
|
|||
| { | |||
| iNextFID = 0; | |||
| iNextSubFeature = 0; | |||
| while (!apoPendingFeatures.empty()) | |||
There was a problem hiding this comment.
I guess the pop'ed feature should be deleted
There was a problem hiding this comment.
And probably that the destructor of the layer should also do that cleanup
|
I'm not too familiar with GitHub pull requests so let me know if I am doing something in a non-preferred way. |
|
Hum for some reason Travis-CI checks have not been run. |
|
I've pushed your branch to my repo, and with a small fix rouault@4e7c055 to please cppcheck, all tests are green with Travis-CI: https://travis-ci.org/rouault/gdal2/builds/292020340 |
|
Yes. Thank you as always! |
|
Committed in r40548 |
…Thomas, fixes #7106, #251) git-svn-id: https://svn.osgeo.org/gdal/trunk@40548 f0d54148-0727-0410-94bb-9a71ac55c965
…Thomas, fixes #7106, OSGeo/gdal#251) git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@40548 f0d54148-0727-0410-94bb-9a71ac55c965
See https://trac.osgeo.org/gdal/ticket/7106