[gegl] bin: init call before parsing args (fixes segfault in --list-all)



commit 7f44c8e60fcdb18a9a7b8b49e0160822a7c9b037
Author: Øyvind Kolås <pippin gimp org>
Date:   Fri Dec 4 18:42:17 2015 +0100

    bin: init call before parsing args (fixes segfault in --list-all)

 bin/gegl.c   |    2 +-
 bin/mrg-ui.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/bin/gegl.c b/bin/gegl.c
index 1448879..2fea7aa 100644
--- a/bin/gegl.c
+++ b/bin/gegl.c
@@ -92,8 +92,8 @@ main (gint    argc,
                 "application-license", "GPL3",
                 NULL);
 
-  o = gegl_options_parse (argc, argv);
   gegl_init (&argc, &argv);
+  o = gegl_options_parse (argc, argv);
 #ifdef HAVE_SPIRO
   gegl_path_spiro_init ();
 #endif
diff --git a/bin/mrg-ui.c b/bin/mrg-ui.c
index 8c321fa..888c7b9 100644
--- a/bin/mrg-ui.c
+++ b/bin/mrg-ui.c
@@ -1237,7 +1237,7 @@ static void mrg_gegl_blit (Mrg *mrg,
 foo++;
     if (!fmt) fmt = babl_format ("cairo-RGB24");
     gegl_node_blit (node, scale / fake_factor, &roi, fmt, buf, width * 4, 
-         GEGL_BLIT_DEFAULT);
+         GEGL_BLIT_DEFAULT|(1<<20));
   surface = cairo_image_surface_create_for_data (buf, CAIRO_FORMAT_RGB24, width, height, width * 4);
   }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]