]> granicus.if.org Git - graphviz/commitdiff
rsvg plugin: remove disabled 'g_type_term' code
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Fri, 4 Mar 2022 16:11:34 +0000 (08:11 -0800)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 6 Mar 2022 02:12:52 +0000 (18:12 -0800)
The build system does not check for `g_type_term` so this code is always
disabled. More importantly though, I cannot locate any reference to a
`g_type_term` function that has ever existed anywhere except the Graphviz code
base. That is, it appears this has never been a librsvg or Glib function. The
commit message of its introduction in 9f4cb1fcb745b9b71c937980ef6b0d08552ead0f
also offers no enlightenment, only suggesting this was somehow related to Fedora
20.

plugin/rsvg/gvloadimage_rsvg.c

index ffe707d022e2e47a4c8bd05ce171c2df171578be..4ca56310c76395cc806ae18fc51931e6951ef8ce 100644 (file)
@@ -78,12 +78,8 @@ static RsvgHandle* gvloadimage_rsvg_load(GVJ_t * job, usershape_t *us)
                
                if (rsvgh == NULL) {
                        fprintf(stderr, "rsvg_handle_new_from_file returned an error: %s\n", err->message);
-#if HAVE_G_TYPE_TERM
-                       g_type_term();
-#else
 #ifndef HAVE_SVG_2_36
                        rsvg_term();
-#endif
 #endif
                        return NULL;
                } 
@@ -100,12 +96,8 @@ static RsvgHandle* gvloadimage_rsvg_load(GVJ_t * job, usershape_t *us)
 #else
                        rsvg_handle_free(rsvgh);
 #endif
-#if HAVE_G_TYPE_TERM
-                       g_type_term();
-#else
 #ifndef HAVE_SVG_2_36
                         rsvg_term();
-#endif
 #endif
                        return NULL;
                }
@@ -119,12 +111,8 @@ static RsvgHandle* gvloadimage_rsvg_load(GVJ_t * job, usershape_t *us)
 #else
                        rsvg_handle_free(rsvgh);
 #endif
-#if HAVE_G_TYPE_TERM
-                       g_type_term();
-#else
 #ifndef HAVE_SVG_2_36
                         rsvg_term();
-#endif
 #endif
                        return NULL;
                }
@@ -137,12 +125,8 @@ static RsvgHandle* gvloadimage_rsvg_load(GVJ_t * job, usershape_t *us)
 #else
                        rsvg_handle_free(rsvgh);
 #endif
-#if HAVE_G_TYPE_TERM
-                       g_type_term();
-#else
 #ifndef HAVE_SVG_2_36
                         rsvg_term();
-#endif
 #endif
                        return NULL;
                }