Fix GCC warnings.

This commit is contained in:
Roman Telezhynskyi 2023-01-05 15:14:13 +02:00
parent 964b4c0aea
commit 33b2fb5ed0
5 changed files with 15 additions and 15 deletions

View File

@ -466,7 +466,7 @@ public:
void addDouble(double d) {setType(DOUBLE); content.d = d;} void addDouble(double d) {setType(DOUBLE); content.d = d;}
void addCoord() {setType(COORD); vdata.x=0.0; vdata.y=0.0; vdata.z=0.0; content.v = &vdata;} void addCoord() {setType(COORD); vdata.x=0.0; vdata.y=0.0; vdata.z=0.0; content.v = &vdata;}
void addCoord(const DRW_Coord &v) {setType(COORD); vdata = v; content.v = &vdata;} void addCoord(const DRW_Coord &v) {setType(COORD); vdata = v; content.v = &vdata;}
void setType(enum TYPE t) { type = t;} void setType(TYPE t) { type = t;}
void setCoordX(double d) { if (type == COORD) vdata.x = d;} void setCoordX(double d) { if (type == COORD) vdata.x = d;}
void setCoordY(double d) { if (type == COORD) vdata.y = d;} void setCoordY(double d) { if (type == COORD) vdata.y = d;}
void setCoordZ(double d) { if (type == COORD) vdata.z = d;} void setCoordZ(double d) { if (type == COORD) vdata.z = d;}
@ -481,7 +481,7 @@ private:
public: public:
DRW_VarContent content; DRW_VarContent content;
enum TYPE type; TYPE type;
int code; /*!< dxf code of this value*/ int code; /*!< dxf code of this value*/
private: private:
@ -529,7 +529,7 @@ public:
widthDefault = 31 /*!< by default (dxf -3) */ widthDefault = 31 /*!< by default (dxf -3) */
}; };
static int lineWidth2dxfInt(enum lineWidth lw){ static int lineWidth2dxfInt(lineWidth lw){
switch (lw){ switch (lw){
case widthByLayer: case widthByLayer:
return -1; return -1;
@ -591,7 +591,7 @@ public:
return -3; return -3;
} }
static enum lineWidth dxfInt2lineWidth(int i){ static lineWidth dxfInt2lineWidth(int i){
if (i<0) { if (i<0) {
if (i==-1) if (i==-1)
return widthByLayer; return widthByLayer;

View File

@ -194,7 +194,7 @@ protected:
bool parseDxfGroups(int code, dxfReader *reader); bool parseDxfGroups(int code, dxfReader *reader);
public: public:
enum DRW::ETYPE eType; /*!< enum: entity type, code 0 */ DRW::ETYPE eType; /*!< enum: entity type, code 0 */
duint32 handle; /*!< entity identifier, code 5 */ duint32 handle; /*!< entity identifier, code 5 */
std::list<std::list<DRW_Variant> > appData; /*!< list of application data, code 102 */ std::list<std::list<DRW_Variant> > appData; /*!< list of application data, code 102 */
duint32 parentHandle; /*!< Soft-pointer ID/handle to owner BLOCK_RECORD object, code 330 */ duint32 parentHandle; /*!< Soft-pointer ID/handle to owner BLOCK_RECORD object, code 330 */
@ -203,7 +203,7 @@ public:
UTF8STRING lineType; /*!< line type, code 6 */ UTF8STRING lineType; /*!< line type, code 6 */
duint32 material; /*!< hard pointer id to material object, code 347 */ duint32 material; /*!< hard pointer id to material object, code 347 */
int color; /*!< entity color, code 62 */ int color; /*!< entity color, code 62 */
enum DRW_LW_Conv::lineWidth lWeight; /*!< entity lineweight, code 370 */ DRW_LW_Conv::lineWidth lWeight; /*!< entity lineweight, code 370 */
double ltypeScale; /*!< linetype scale, code 48 */ double ltypeScale; /*!< linetype scale, code 48 */
bool visible; /*!< entity visibility, code 60 */ bool visible; /*!< entity visibility, code 60 */
int numProxyGraph; /*!< Number of bytes in proxy graphics, code 92 */ int numProxyGraph; /*!< Number of bytes in proxy graphics, code 92 */
@ -709,8 +709,8 @@ public:
double oblique; /*!< oblique angle, code 51 */ double oblique; /*!< oblique angle, code 51 */
UTF8STRING style; /*!< style name, code 7 */ UTF8STRING style; /*!< style name, code 7 */
int textgen; /*!< text generation, code 71 */ int textgen; /*!< text generation, code 71 */
enum HAlign alignH; /*!< horizontal align, code 72 */ HAlign alignH; /*!< horizontal align, code 72 */
enum VAlign alignV; /*!< vertical align, code 73 */ VAlign alignV; /*!< vertical align, code 73 */
}; };
//! Class to handle insert entries //! Class to handle insert entries

View File

@ -104,7 +104,7 @@ protected:
} }
public: public:
enum DRW::TTYPE tType {DRW::UNKNOWNT}; /*!< enum: entity type, code 0 */ DRW::TTYPE tType {DRW::UNKNOWNT}; /*!< enum: entity type, code 0 */
duint32 handle {0}; /*!< entity identifier, code 5 */ duint32 handle {0}; /*!< entity identifier, code 5 */
int parentHandle {0}; /*!< Soft-pointer ID/handle to owner object, code 330 */ int parentHandle {0}; /*!< Soft-pointer ID/handle to owner object, code 330 */
UTF8STRING name{}; /*!< entry name, code 2 */ UTF8STRING name{}; /*!< entry name, code 2 */
@ -381,7 +381,7 @@ public:
int color; /*!< layer color, code 62 */ int color; /*!< layer color, code 62 */
int color24; /*!< 24-bit color, code 420 */ int color24; /*!< 24-bit color, code 420 */
bool plotF; /*!< Plot flag, code 290 */ bool plotF; /*!< Plot flag, code 290 */
enum DRW_LW_Conv::lineWidth lWeight; /*!< layer lineweight, code 370 */ DRW_LW_Conv::lineWidth lWeight; /*!< layer lineweight, code 370 */
std::string handlePlotS; /*!< Hard-pointer ID/handle of plotstyle, code 390 */ std::string handlePlotS; /*!< Hard-pointer ID/handle of plotstyle, code 390 */
std::string handleMaterialS; /*!< Hard-pointer ID/handle of materialstyle, code 347 */ std::string handleMaterialS; /*!< Hard-pointer ID/handle of materialstyle, code 347 */
}; };

View File

@ -26,7 +26,7 @@ public:
BOOL, BOOL,
INVALID INVALID
}; };
enum TYPE type; TYPE type;
public: public:
explicit dxfReader(std::istream *stream) explicit dxfReader(std::istream *stream)
: type(INVALID), : type(INVALID),

View File

@ -71,10 +71,10 @@ struct point2d_s;
#define EPSILON (REAL_ONE / TOLERANCE) #define EPSILON (REAL_ONE / TOLERANCE)
typedef struct point2d_s point2d_t; typedef point2d_s point2d_t;
typedef struct face_s face_t; typedef face_s face_t;
typedef struct halfedge_s halfedge_t; typedef halfedge_s halfedge_t;
typedef struct delaunay_s delaunay_t; typedef delaunay_s delaunay_t;
typedef real mat3_t[3][3]; typedef real mat3_t[3][3];
struct point2d_s struct point2d_s