Merge pull request #1927 from KLayout/bugfix/issue-1925

Fixed issue #1925 (MAGIC import fails)
KLayout · Nov 28, 2024 · 1a5e8c9 · 1a5e8c9
2 parents 926dac9 + 85caa4b
commit 1a5e8c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc
@@ -531,6 +531,9 @@ MAGReader::read_rlabel (tl::Extractor &ex, Layout &layout, cell_index_type cell_
   std::string lname;
   ex.read (lname);
 
+  //  skip sticky flag (optional)
+  ex.test ("s");
+
   double l, b, r, t;
   ex.read (l);
   ex.read (b);

diff --git a/src/plugins/streamers/magic/unit_tests/dbMAGReader.cc b/src/plugins/streamers/magic/unit_tests/dbMAGReader.cc
@@ -156,3 +156,8 @@ TEST(3)
   run_test (_this, tl::testdata (), "ringo/RINGO.mag", "ringo_au.cif.gz");
 }
 
+TEST(4)
+{
+  run_test (_this, tl::testdata (), "issue_1925/redux.mag", "redux_au.cif.gz");
+}
+
diff --git a/testdata/magic/issue_1925/redux.mag b/testdata/magic/issue_1925/redux.mag
@@ -0,0 +1,9 @@
+magic
+tech sky130A
+timestamp 1731684784
+<< metal4 >>
+rect 0 0 10000 100
+<< labels >>
+rlabel metal4 s 10500 -9100 10600 12800 6 vccd1
+port 1 nsew power input
+<< end >>
diff --git a/testdata/magic/redux_au.cif.gz b/testdata/magic/redux_au.cif.gz
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,3 +156,8 @@ TEST(3) @@
       run_test (_this, tl::testdata (), "ringo/RINGO.mag", "ringo_au.cif.gz");
     }
+    TEST(4)
+    {
+      run_test (_this, tl::testdata (), "issue_1925/redux.mag", "redux_au.cif.gz");
+    }