Improve OGR CAD driver #172
Conversation
| @@ -150,7 +150,7 @@ void RegisterOGRCAD() | |||
|
|
|||
| CPLString CADRecode( const CPLString& sString, int CADEncoding ) | |||
| { | |||
| const char* pszSource[44] = { | |||
| const char* pszSource[45] = { | |||
There was a problem hiding this comment.
Shouldn't we just remove the explicit number ?
| /* 44 ANSI_1258 */ "CP1258" | ||
| }; | ||
| if( CADEncoding > 0 && CADEncoding < 45 ) | ||
| if( CADEncoding > 0 && CADEncoding < 45 && CADEncoding != 4 ) |
There was a problem hiding this comment.
sizeof(pszSource) / sizeof(pszSource[0]) would be more robust than the hard coded 45
|
@BishopGIS I let you handle this |
| size_t nRecordsInSection = 0; | ||
|
|
||
| // read section data | ||
| pFileIO->Read( pabySectionContent, dSectionSize ); | ||
| unsigned int dSectionBitSize = (dSectionSize * 8) - 128; // 8 + 8*7 | ||
| pFileIO->Seek( -2L, CADFileIO::SeekOrigin::CUR ); |
There was a problem hiding this comment.
We already read 2 bytes upper. Not need to read it twice.
There was a problem hiding this comment.
Actually we do, because size is included in CRC validation.
| unsigned int dSectionBitSize = (dSectionSize * 8) - 128; // 8 + 8*7 | ||
| pFileIO->Seek( -2L, CADFileIO::SeekOrigin::CUR ); | ||
| pFileIO->Read( pabySectionContent, 2 + dSectionSize ); | ||
| unsigned int dSectionBitSize = (2 + dSectionSize - 2) * 8; |
There was a problem hiding this comment.
2 + dSectionSize - 2 will translate by compiler to dSectionSize
There was a problem hiding this comment.
Section structure is awkward, so I left this as a reminder. Comment may be more appropriate.
| pFileIO->Read( pabySectionContent, 2 + dSectionSize ); | ||
| unsigned int dSectionBitSize = (2 + dSectionSize - 2) * 8; | ||
|
|
||
| size_t nBitOffsetFromStart = 16; |
There was a problem hiding this comment.
Skip the size (short, 2 bytes). See comment above.
|
Merge to svn in r36752. Thanks @perob! This PR may be closed. |
…s. Add CRC validation to header variables section, classes section and for individual objects/entities. Add more encoding for text recoding. Avoid infinite loop when reading layer table git-svn-id: https://svn.osgeo.org/gdal/trunk@36752 f0d54148-0727-0410-94bb-9a71ac55c965
|
@BishopGIS By the way, I see std::cerr uses in libopencad (some already existing, some new added). Would be good if it had an abstraction for error reporting, that could default to std:cerr for standalone libopencad, and that could be plugged to CPLError() when called from the OGR CAD driver. |
|
@rouault good idea. I'll fix this soon. |
Ticket #6739
Summary of changes: