From: Emden R. Gansner <erg@research.att.com>
Date: Tue, 25 Mar 2014 13:42:05 +0000 (-0400)
Subject: Fix for bug 2425 is incorrect. First, the users' graph should never cause
X-Git-Tag: 2.38.0~2^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26f8a5e0878a2e9afbb696fe3469b5625b2c9ccf;p=graphviz

Fix for bug 2425 is incorrect. First, the users' graph should never cause
the code to enter the if (ND_shape(n)->usershape) {} block, as the nodes
just use the image attribute. Second, the logic fails to handle the case
of postscript library shapes.
---

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index 9b967c113..959110c37 100644
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -2885,9 +2885,11 @@ static void poly_gencode(GVJ_t * job, node_t * n)
     usershape_p = FALSE;
     if (ND_shape(n)->usershape) {
 	name = ND_shape(n)->name;
-	if (streq(name, "custom"))
+	if (streq(name, "custom")) {
 	    if ((name = agget(n, "shapefile")) && name[0])
 		usershape_p = TRUE;
+	} else
+	    usershape_p = TRUE;
     } else if ((name = agget(n, "image")) && name[0]) {
 	usershape_p = TRUE;
     }