[gegl] gegl-binary: make ops chain pass to mrg ui



commit c5a11735e45712bb9f3882520df648ca648f5ad4
Author: Øyvind Kolås <pippin gimp org>
Date:   Fri Mar 4 23:04:40 2016 +0100

    gegl-binary: make ops chain pass to mrg ui

 bin/gegl-options.c |    2 +-
 bin/gegl.c         |    2 +-
 bin/mrg-ui.c       |   15 +--------------
 3 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/bin/gegl-options.c b/bin/gegl-options.c
index d6db180..871de4e 100644
--- a/bin/gegl-options.c
+++ b/bin/gegl-options.c
@@ -325,7 +325,7 @@ parse_args (int    argc,
         }
 
         else if (match ("--")) {
-            o->rest = curr;
+            o->rest = curr + 1;
             break;
         }
 
diff --git a/bin/gegl.c b/bin/gegl.c
index ffa0917..becb288 100644
--- a/bin/gegl.c
+++ b/bin/gegl.c
@@ -92,7 +92,7 @@ main (gint    argc,
                 "application-license", "GPL3",
                 NULL);
 
-  gegl_init (&argc, &argv);
+  gegl_init (NULL, NULL);
   o = gegl_options_parse (argc, argv);
 #ifdef HAVE_SPIRO
   gegl_path_spiro_init ();
diff --git a/bin/mrg-ui.c b/bin/mrg-ui.c
index 8c321fa..2c7270c 100644
--- a/bin/mrg-ui.c
+++ b/bin/mrg-ui.c
@@ -387,20 +387,7 @@ int mrg_ui_main (int argc, char **argv, char **ops)
 /* we want to see the speed gotten if the fastest babl conversions we have were more accurate */
   g_setenv ("BABL_TOLERANCE", "0.1", TRUE);
   
-  if(ops)
-    o.ops = ops;
-  else
-  {
-    int i;
-    for (i = 0; argv[i]; i++)
-    {
-      if (!strcmp (argv[i], "--"))
-      {
-        o.ops = &argv[i];
-        break;
-      }
-    }
-  }
+  o.ops = ops;
 
   gegl_init (&argc, &argv);
   o.gegl            = gegl_node_new (); // so that we have an object to unref


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