Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve OGR CAD driver #172

Closed
wants to merge 8 commits into from
Closed

Improve OGR CAD driver #172

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4170d57
Add more code pages for text recoding
perob Nov 29, 2016
78561eb
Fix infinite loop when reading layer table
perob Nov 29, 2016
38f6d8d
Add CRC validation for headervars, classes and objects
perob Nov 29, 2016
a1dc520
Fix undefined encodings (correct array ordering)
perob Nov 30, 2016
a808c38
Fix array initializer
perob Nov 30, 2016
2bae23e
Remove explicit array initializer
perob Nov 30, 2016
90eb510
Merge branch 'trunk' into dwgcrc
perob Nov 30, 2016
fe619c9
Merge trunk, resolve conflict
perob Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 11 additions & 24 deletions gdal/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp
View file
Open in desktop
Expand Up @@ -127,35 +127,22 @@ int CADTables::ReadLayersTable( CADFile * const pCADFile, long dLayerControlHand
unique_ptr<CADEntityObject> spEntityObj( static_cast<CADEntityObject *>(
pCADFile->GetObject( dCurrentEntHandle, true )) );

if( dCurrentEntHandle == dLastEntHandle )
if( spEntityObj == nullptr )
{
if( nullptr != spEntityObj )
FillLayer( spEntityObj.get() );
else
{
#ifdef _DEBUG
assert( 0 );
#endif //_DEBUG
}
DebugMsg( "Entity object is null\n" );
break;
}

/* This check may look excessive, but if something goes wrong way -
* some part of geometries will be parsed. */
if( spEntityObj != nullptr )
} else if ( dCurrentEntHandle == dLastEntHandle )
{
FillLayer( spEntityObj.get() );

if( spEntityObj->stCed.bNoLinks )
++dCurrentEntHandle;
else
dCurrentEntHandle = spEntityObj->stChed.hNextEntity.getAsLong( spEntityObj->stCed.hObjectHandle );
} else
{
#ifdef _DEBUG
assert( 0 );
#endif //_DEBUG
break;
}

FillLayer( spEntityObj.get() );

if( spEntityObj->stCed.bNoLinks )
++dCurrentEntHandle;
else
dCurrentEntHandle = spEntityObj->stChed.hNextEntity.getAsLong( spEntityObj->stCed.hObjectHandle );
}

DebugMsg( "Readed aLayers using LayerControl object count: %d\n",
Expand Down