From 583aaa10074661ce1d467539b833ef97c7fe78e7 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Mon, 19 Dec 2022 11:52:38 -0500 Subject: [PATCH] Added code to avoid making a call to get a default layer width on an invalid type. This prevents magic from generating unneeded error messages about default layer widths on GDS read-in. --- calma/CalmaRdpt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/calma/CalmaRdpt.c b/calma/CalmaRdpt.c index 697eb165..5219e671 100644 --- a/calma/CalmaRdpt.c +++ b/calma/CalmaRdpt.c @@ -736,11 +736,15 @@ calmaElementText() * as the default text size, or 1um, whichever is smaller. Account * for the 8/10 difference encoded in the rendered font height. */ - size = DRCGetDefaultLayerWidth(type); - if (size > 0) + size = 0; + if (type > 0) { - size *= (calmaReadScale2 * cifCurReadStyle->crs_multiplier * 8); - size /= (calmaReadScale1 * cifCurReadStyle->crs_scaleFactor * 10); + size = DRCGetDefaultLayerWidth(type); + if (size > 0) + { + size *= (calmaReadScale2 * cifCurReadStyle->crs_multiplier * 8); + size /= (calmaReadScale1 * cifCurReadStyle->crs_scaleFactor * 10); + } } /* Default or maximum size is 1um */