Merge branch 'master' into bplane

Pulled change to GDS read from master branch.
This commit is contained in:
Tim Edwards 2020-03-25 12:01:46 -04:00
commit 6a3c8c2fb6
1 changed files with 7 additions and 1 deletions

View File

@ -979,13 +979,19 @@ calmaElementText()
/* No port information can be encoded in the GDS file, so */ /* No port information can be encoded in the GDS file, so */
/* assume defaults, and assume that the port order is the */ /* assume defaults, and assume that the port order is the */
/* order in which labels arrive in the GDS stream. */ /* order in which labels arrive in the GDS stream. If */
/* ports have the same text, then give them the same index. */
i = -1; i = -1;
for (sl = cifReadCellDef->cd_labels; sl != NULL; sl = sl->lab_next) for (sl = cifReadCellDef->cd_labels; sl != NULL; sl = sl->lab_next)
{ {
idx = sl->lab_flags & PORT_NUM_MASK; idx = sl->lab_flags & PORT_NUM_MASK;
if (idx > i) i = idx; if (idx > i) i = idx;
if (!strcmp(sl->lab_text, textbody))
{
i = (sl->lab_flags & PORT_NUM_MASK) - 1;
break;
}
} }
i++; i++;
lab->lab_flags |= (PORT_NUM_MASK & i); lab->lab_flags |= (PORT_NUM_MASK & i);