[dia/cairo-port: 160/165] Remove libart renderer

[Zander <zbrown src gnome org>]

commit a593a05497746292269c4204f5ad8390e9106f94
Author: Zander Brown <zbrown gnome org>
Date:   Fri Dec 7 04:12:28 2018 +0000

    Remove libart renderer
    
    Only benefit to libart was antialiasing with is now provided by cairo

 app/app_procs.c                     |   23 +-
 app/display.c                       |   70 +-
 config.h.win32                      |    4 -
 plug-ins/libart/dialibart.c         |   71 --
 plug-ins/libart/dialibartrenderer.c | 1417 -----------------------------------
 plug-ins/libart/dialibartrenderer.h |   62 --
 plug-ins/libart/export_png.c        |  391 ----------
 plug-ins/libart/render_libart.c     |  510 -------------
 plug-ins/libart/render_libart.h     |   26 -
 plug-ins/shape/shape-export.c       |    6 +-
 po/POTFILES.in                      |    4 -
 11 files changed, 20 insertions(+), 2564 deletions(-)
---
diff --git a/app/app_procs.c b/app/app_procs.c
index 49dc6517..590c3fb5 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -327,13 +327,9 @@ do_convert(const char *infname,
    * are quite some filter selecting their output format by it. --hb
    */
   if (size) {
-    if (ef == filter_export_get_by_name ("png-libart")) /* the warning we get is appropriate, don't cast */
-      ef->export_func(diagdata, ctx, outfname, infname, size);
-    else {
-      g_warning ("--size parameter unsupported for %s filter", 
-                 ef->unique_name ? ef->unique_name : "selected");
-      ef->export_func(diagdata, ctx, outfname, infname, ef->user_data);
-    }
+    g_warning ("--size parameter unsupported for %s filter", 
+                ef->unique_name ? ef->unique_name : "selected");
+    ef->export_func(diagdata, ctx, outfname, infname, ef->user_data);
   }
   else
     ef->export_func(diagdata, ctx, outfname, infname, ef->user_data);
@@ -370,9 +366,6 @@ dump_dependencies(void)
   "threads "
 #endif
   "cairo "
-#ifdef HAVE_LIBART
-  "libart "
-#endif
   "pangocairo "
   "\n");
 
@@ -481,11 +474,7 @@ handle_initial_diagram(const char *in_file_name,
     /* First try guessing based on extension */
     export_file_name = build_output_file_name(in_file_name, export_file_format, outdir);
 
-    /* to make the --size hack even uglier but work again for the only filter supporting it */
-    if (   size && strcmp(export_file_format, "png") == 0)
-      ef = filter_export_get_by_name ("png-libart");
-    if (!ef)
-      ef = filter_guess_export_filter(export_file_name);
+    ef = filter_guess_export_filter(export_file_name);
     if (ef == NULL) {
       ef = filter_export_get_by_name(export_file_format);
       if (ef == NULL) {
@@ -501,10 +490,6 @@ handle_initial_diagram(const char *in_file_name,
     g_free(export_file_name);
   } else if (out_file_name) {
     DiaExportFilter *ef = NULL;
-
-    /* if this looks like an ugly hack to you, agreed ;)  */
-    if (size && strstr(out_file_name, ".png"))
-      ef = filter_export_get_by_name ("png-libart");
     
     made_conversions |= do_convert(in_file_name, out_file_name, ef,
                                   size, show_layers);
diff --git a/app/display.c b/app/display.c
index a2c543e2..62c89064 100644
--- a/app/display.c
+++ b/app/display.c
@@ -1091,44 +1091,6 @@ ddisplay_get_clicked_position(DDisplay *ddisp)
   return ddisp->clicked_position;
 }
 
-
-/**
- * Kind of dirty way to initialize an anti-aliased renderer, maybe there
- * should be some plug-in interface to do this.
- * With the Libart renderer being a deprecated plug-in and the cairo renderer
- * offering a lot of features including proper highlighting it seems reasonable
- * to have default at cairo, although you loose a lot when it is switched off ;)
- */
-static DiaRenderer *
-new_aa_renderer (DDisplay *ddisp)
-{
-  GType renderer_type;
-
-  renderer_type = g_type_from_name ("DiaCairoInteractiveRenderer");
-  if (renderer_type) {
-    DiaRenderer *renderer = g_object_new(renderer_type, NULL);
-    g_object_set (renderer,
-                  "zoom", &ddisp->zoom_factor,
-                 "rect", &ddisp->visible,
-                 NULL);
-    return renderer;
-  }
-
-  renderer_type = g_type_from_name ("DiaLibartRenderer");
-  if (renderer_type) {
-    DiaRenderer *renderer = g_object_new(renderer_type, NULL);
-    g_object_set (renderer,
-                  "transform", dia_transform_new (&ddisp->visible, &ddisp->zoom_factor),
-                 NULL);
-    return renderer;
-  } 
-
-  /* we really should not come here but instead disable the menu command earlier */
-  message_warning (_("No antialiased renderer found"));
-  /* fallback: built-in libart renderer */
-  return dia_cairo_interactive_renderer_new (); 
-}
-
 void
 ddisplay_set_renderer(DDisplay *ddisp, int aa_renderer)
 {
@@ -1149,15 +1111,14 @@ ddisplay_set_renderer(DDisplay *ddisp, int aa_renderer)
   width = ddisp->canvas->allocation.width;
   height = ddisp->canvas->allocation.height;
 
-  if (ddisp->aa_renderer){
-    ddisp->renderer = new_aa_renderer (ddisp);
-  } else {
-    ddisp->renderer = dia_cairo_interactive_renderer_new();
-    g_object_set (ddisp->renderer,
-                  "zoom", &ddisp->zoom_factor,
-                  "rect", &ddisp->visible,
-                  NULL);
+  if (!ddisp->aa_renderer){
+    g_message ("Only antialias renderers supported");
   }
+  ddisp->renderer = dia_cairo_interactive_renderer_new ();
+  g_object_set (ddisp->renderer,
+                "zoom", &ddisp->zoom_factor,
+                "rect", &ddisp->visible,
+                NULL);
 
   if (window)
     dia_renderer_set_size(ddisp->renderer, window, width, height);
@@ -1168,15 +1129,14 @@ ddisplay_resize_canvas(DDisplay *ddisp,
                       int width,  int height)
 {
   if (ddisp->renderer==NULL) {
-    if (ddisp->aa_renderer) {
-      ddisp->renderer = new_aa_renderer (ddisp);
-    } else {
-      ddisp->renderer = dia_cairo_interactive_renderer_new();
-      g_object_set (ddisp->renderer,
-                    "zoom", &ddisp->zoom_factor,
-                    "rect", &ddisp->visible,
-                    NULL);
+    if (!ddisp->aa_renderer){
+      g_message ("Only antialias renderers supported");
     }
+    ddisp->renderer = dia_cairo_interactive_renderer_new ();
+    g_object_set (ddisp->renderer,
+                  "zoom", &ddisp->zoom_factor,
+                  "rect", &ddisp->visible,
+                  NULL);
   }
 
   dia_renderer_set_size(ddisp->renderer, gtk_widget_get_window(ddisp->canvas), width, height);
@@ -1343,7 +1303,7 @@ display_update_menu_state(DDisplay *ddisp)
   antialiased  = GTK_TOGGLE_ACTION (menus_get_action ("ViewAntialiased"));
 
   gtk_action_set_sensitive (menus_get_action ("ViewAntialiased"), 
-                           g_type_from_name ("DiaCairoInteractiveRenderer") != 0 || g_type_from_name 
("DiaLibartRenderer") != 0);
+                           g_type_from_name ("DiaCairoInteractiveRenderer") != 0);
 
   ddisplay_do_update_menu_sensitivity (ddisp);
 
diff --git a/config.h.win32 b/config.h.win32
index 89801cbf..c9996d1d 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -16,10 +16,6 @@
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
 /* some non critical defines */
-#if 0
-#define HAVE_LIBART
-#define HAVE_LIBPNG
-#endif
 #define HAVE_LIBZ
 
 #define VERSION "0.97+git"
diff --git a/plug-ins/shape/shape-export.c b/plug-ins/shape/shape-export.c
index e99ae053..ffd64ceb 100644
--- a/plug-ins/shape/shape-export.c
+++ b/plug-ins/shape/shape-export.c
@@ -626,11 +626,7 @@ export_shape(DiagramData *data, DiaContext *ctx,
     point = g_strndup(filename, i);
     png_filename = g_strdup_printf("%s.png",point);
     g_free(point);
-    /* we are especially requesting the libart/png cause it is the only one with the size-hack */
-    exportfilter = filter_export_get_by_name ("png-libart");
-    /* ... but the code below does not use the size-hack anymore ... */
-    if (!exportfilter)
-      exportfilter = filter_guess_export_filter(png_filename);
+    exportfilter = filter_guess_export_filter(png_filename);
 
     if (!exportfilter) {
       dia_context_add_message(ctx, _("Can't export PNG icon without export plugin!"));
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9eda3013..136add3c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -206,10 +206,6 @@ plug-ins/dxf/dxf-export.c
 plug-ins/dxf/dxf-import.c
 plug-ins/hpgl/hpgl.c
 plug-ins/layout/layout.cpp
-plug-ins/libart/dialibart.c
-plug-ins/libart/dialibartrenderer.c
-plug-ins/libart/export_png.c
-plug-ins/libart/render_libart.c
 plug-ins/metapost/metapost.c
 plug-ins/metapost/render_metapost.c
 plug-ins/pdf/pdf.c