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 9b967c1135cf96bb5f04343c0dfd170210aa3e93..959110c3747d30ee193d78acc231b8edfd48306c 100644 (file)
--- 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;
     }