haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dxflib_qcad: backport "cleanup" 

upstream commits
6a43fa3c6d6a99f73bda7a36eaf3b78906d41380
f2db48daf183575a3767beed6345767901803cb9
722ee2223069afac1b5a3c02812242cd9f723b8a
This commit is contained in:
Marek Roszko 2020-11-19 18:54:18 -05:00
parent 1703eb8494
commit 7fd37c39a1
3 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
thirdparty/dxflib_qcad/dl_dxf.cpp vendored
View File

@ -4290,7 +4290,7 @@ void DL_Dxf::writeHatchEdge( DL_WriterA& dw,
* *
* @return IMAGEDEF handle. Needed for the IMAGEDEF counterpart. * @return IMAGEDEF handle. Needed for the IMAGEDEF counterpart.
*/ */
int DL_Dxf::writeImage( DL_WriterA& dw, unsigned int DL_Dxf::writeImage( DL_WriterA& dw,
const DL_ImageData& data, const DL_ImageData& data,
const DL_Attributes& aAttrib ) const DL_Attributes& aAttrib )
{ {
@ -4335,8 +4335,7 @@ int DL_Dxf::writeImage( DL_WriterA& dw,
dw.dxfReal( 23, data.height ); dw.dxfReal( 23, data.height );
// handle of IMAGEDEF object // handle of IMAGEDEF object
int handle = dw.incHandle(); unsigned int handle = dw.handle(340);
dw.dxfHex( 340, handle );
// flags // flags
dw.dxfInt( 70, 15 ); dw.dxfInt( 70, 15 );
@ -5496,13 +5495,10 @@ void DL_Dxf::writeAppDictionary( DL_WriterA& dw )
} }
int DL_Dxf::writeDictionaryEntry( DL_WriterA& dw, const std::string& name ) unsigned int DL_Dxf::writeDictionaryEntry( DL_WriterA& dw, const std::string& name )
{ {
dw.dxfString( 3, name ); dw.dxfString( 3, name );
int handle = dw.getNextHandle(); return dw.handle(350);
dw.dxfHex( 350, handle );
dw.incHandle();
return handle;
} }

4
thirdparty/dxflib_qcad/dl_dxf.h vendored
View File

@ -323,7 +323,7 @@ public:
void writeHatchEdge( DL_WriterA& dw, void writeHatchEdge( DL_WriterA& dw,
const DL_HatchEdgeData& data ); const DL_HatchEdgeData& data );
int writeImage( DL_WriterA& dw, unsigned int writeImage( DL_WriterA& dw,
const DL_ImageData& data, const DL_ImageData& data,
const DL_Attributes& attrib ); const DL_Attributes& attrib );
@ -354,7 +354,7 @@ public:
void writeBlockRecord( DL_WriterA& dw, const std::string& name ); void writeBlockRecord( DL_WriterA& dw, const std::string& name );
void writeObjects( DL_WriterA& dw, const std::string& appDictionaryName = "" ); void writeObjects( DL_WriterA& dw, const std::string& appDictionaryName = "" );
void writeAppDictionary( DL_WriterA& dw ); void writeAppDictionary( DL_WriterA& dw );
int writeDictionaryEntry( DL_WriterA& dw, const std::string& name ); unsigned int writeDictionaryEntry( DL_WriterA& dw, const std::string& name );
void writeXRecord( DL_WriterA& dw, int handle, int value ); void writeXRecord( DL_WriterA& dw, int handle, int value );
void writeXRecord( DL_WriterA& dw, int handle, double value ); void writeXRecord( DL_WriterA& dw, int handle, double value );
void writeXRecord( DL_WriterA& dw, int handle, bool value ); void writeXRecord( DL_WriterA& dw, int handle, bool value );

50
thirdparty/dxflib_qcad/dl_writer.h vendored
View File

@ -626,56 +626,6 @@ public:
return m_handle; return m_handle;
} }
/**
* Increases handle, so that the handle returned remains available.
*/
unsigned long incHandle() const
{
return m_handle++;
}
/**
* Sets the handle of the model space. Entities refer to
* this handle.
*/
void setModelSpaceHandle( unsigned long h )
{
modelSpaceHandle = h;
}
unsigned long getModelSpaceHandle()
{
return modelSpaceHandle;
}
/**
* Sets the handle of the paper space. Some special blocks refer to
* this handle.
*/
void setPaperSpaceHandle( unsigned long h )
{
paperSpaceHandle = h;
}
unsigned long getPaperSpaceHandle()
{
return paperSpaceHandle;
}
/**
* Sets the handle of the paper space 0. Some special blocks refer to
* this handle.
*/
void setPaperSpace0Handle( unsigned long h )
{
paperSpace0Handle = h;
}
unsigned long getPaperSpace0Handle()
{
return paperSpace0Handle;
}
/** /**
* Must be overwritten by the implementing class to write a * Must be overwritten by the implementing class to write a
* real value to the file. * real value to the file.