diff --git a/src/ext/ext/extGerberImporter.cc b/src/ext/ext/extGerberImporter.cc index f161ffa6a..9f0c29a0f 100644 --- a/src/ext/ext/extGerberImporter.cc +++ b/src/ext/ext/extGerberImporter.cc @@ -263,7 +263,6 @@ GerberFileReader::read_coord (tl::Extractor &ex) void GerberFileReader::swap_graphics_state (GraphicsState &state) { - std::swap (m_merge, state.merge); std::swap (m_inverse, state.inverse); std::swap (m_global_trans, state.global_trans); std::swap (m_s, state.m_s); diff --git a/src/ext/ext/extGerberImporter.h b/src/ext/ext/extGerberImporter.h index 57d915bf2..19db6207a 100644 --- a/src/ext/ext/extGerberImporter.h +++ b/src/ext/ext/extGerberImporter.h @@ -153,14 +153,13 @@ struct GerberMetaData struct GraphicsState { GraphicsState () - : merge (false), inverse (false), + : inverse (false), m_rot (0.0), m_s (1.0), m_ox (false), m_oy (false), m_mx (false), m_my (false), m_orot (0.0), m_os (1.0), m_omx (false), m_omy (false) { displacements.push_back (db::DVector ()); } - bool merge; bool inverse; db::DCplxTrans global_trans; double m_rot; diff --git a/src/ext/unit_tests/extGerberImport.cc b/src/ext/unit_tests/extGerberImport.cc index c7f5d1cf0..e35d90dc6 100644 --- a/src/ext/unit_tests/extGerberImport.cc +++ b/src/ext/unit_tests/extGerberImport.cc @@ -362,3 +362,13 @@ TEST(X2_4) { run_test (_this, "x2-4"); } + +TEST(X2_5a) +{ + run_test (_this, "x2-5a"); +} + +TEST(X2_5b) +{ + run_test (_this, "x2-5b"); +}