GNOME.org
 

[gegl] Remove all references to g_thread_init ()

commit eb7513d8290dd6c77a0481696b2a88626a2d89fe
Author: Michael Henning <drawoc darkrefraction com>
Date:   Sat Mar 30 19:25:39 2013 -0400

    Remove all references to g_thread_init ()
    
    It was deprecated in glib 2.32

 bin/gegl-tester.c                         |    2 --
 bin/gegl.c                                |    1 -
 examples/csugar.c                         |    1 -
 examples/hello-world.c                    |    1 -
 gegl/gegl.h                               |    7 ++-----
 perf/tests/bblur.c                        |    1 -
 perf/tests/bcontrast-minichunk.c          |    1 -
 perf/tests/bcontrast.c                    |    1 -
 perf/tests/blur.c                         |    1 -
 perf/tests/cc.cc                          |    1 -
 perf/tests/comp.c                         |    1 -
 perf/tests/passthrough.c                  |    1 -
 perf/tests/rotate.c                       |    1 -
 perf/tests/test-gegl-buffer-access.c      |    1 -
 perf/tests/unsharpmask.c                  |    1 -
 tests/buffer/buffer-test.c                |    1 -
 tests/simple/test-change-processor-rect.c |    1 -
 tests/simple/test-color-op.c              |    1 -
 tests/simple/test-proxynop-processing.c   |    1 -
 tools/exp_combine.cpp                     |    1 -
 tools/img_cmp.c                           |    1 -
 tools/introspect.c                        |    1 -
 22 files changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/bin/gegl-tester.c b/bin/gegl-tester.c
index d30af73..8a2df13 100644
--- a/bin/gegl-tester.c
+++ b/bin/gegl-tester.c
@@ -313,8 +313,6 @@ main (gint    argc,
   GError         *error = NULL;
   GOptionContext *context;
 
-  g_thread_init (NULL);
-
   context = g_option_context_new (NULL);
   g_option_context_add_main_entries (context, options, NULL);
   g_option_context_add_group (context, gegl_get_option_group ());
diff --git a/bin/gegl.c b/bin/gegl.c
index 25174ef..9e49028 100644
--- a/bin/gegl.c
+++ b/bin/gegl.c
@@ -86,7 +86,6 @@ main (gint    argc,
   GError      *err       = NULL;
   gchar       *path_root = NULL;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 #ifdef HAVE_SPIRO
   gegl_path_spiro_init ();
diff --git a/examples/csugar.c b/examples/csugar.c
index 7fc6847..dce1521 100644
--- a/examples/csugar.c
+++ b/examples/csugar.c
@@ -16,7 +16,6 @@ main (gint argc,
       return -1;
     }
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   gegl =
diff --git a/examples/hello-world.c b/examples/hello-world.c
index 32f8da1..6427947 100644
--- a/examples/hello-world.c
+++ b/examples/hello-world.c
@@ -6,7 +6,6 @@ gint
 main (gint    argc,
       gchar **argv)
 {
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);  /* initialize the GEGL library */
 
   {
diff --git a/gegl/gegl.h b/gegl/gegl.h
index d70fb3c..4eac884 100644
--- a/gegl/gegl.h
+++ b/gegl/gegl.h
@@ -86,14 +86,11 @@ G_BEGIN_DECLS
  * initialize everything needed to operate GEGL and parses some
  * standard command line options.  @argc and @argv are adjusted
  * accordingly so your own code will never see those standard
- * arguments. gegl_init() will call g_thread_init(), unless you, or
- * some other code already has initialized gthread.
+ * arguments.
  *
  * Note that there is an alternative way to initialize GEGL: if you
  * are calling g_option_context_parse() with the option group returned
- * by #gegl_get_option_group(), you don't have to call #gegl_init() but
- * you have to call g_thread_init() before any glib or glib dependant code
- * yourself.
+ * by #gegl_get_option_group(), you don't have to call #gegl_init().
  **/
 void           gegl_init                 (gint          *argc,
                                           gchar       ***argv);
diff --git a/perf/tests/bblur.c b/perf/tests/bblur.c
index 633da3b..5e56608 100644
--- a/perf/tests/bblur.c
+++ b/perf/tests/bblur.c
@@ -7,7 +7,6 @@ main (gint    argc,
   GeglBuffer *buffer, *buffer2;
   GeglNode   *gegl, *sink;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/perf/tests/bcontrast-minichunk.c b/perf/tests/bcontrast-minichunk.c
index c14a8a3..d8b925d 100644
--- a/perf/tests/bcontrast-minichunk.c
+++ b/perf/tests/bcontrast-minichunk.c
@@ -8,7 +8,6 @@ main (gint    argc,
   GeglNode   *gegl, *sink;
   gint i;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   g_object_set (gegl_config (), "chunk-size", 128 * 128, NULL);
diff --git a/perf/tests/bcontrast.c b/perf/tests/bcontrast.c
index 0d682a8..295267d 100644
--- a/perf/tests/bcontrast.c
+++ b/perf/tests/bcontrast.c
@@ -8,7 +8,6 @@ main (gint    argc,
   GeglNode   *gegl, *sink;
   gint i;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/perf/tests/blur.c b/perf/tests/blur.c
index 0376038..80144ca 100644
--- a/perf/tests/blur.c
+++ b/perf/tests/blur.c
@@ -7,7 +7,6 @@ main (gint    argc,
   GeglBuffer *buffer, *buffer2;
   GeglNode   *gegl, *sink;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/perf/tests/cc.cc b/perf/tests/cc.cc
index e6e97d7..8c7df65 100644
--- a/perf/tests/cc.cc
+++ b/perf/tests/cc.cc
@@ -15,7 +15,6 @@ main (gint    argc,
   gchar *infile;
   gchar *infileB;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   infile = "/home/pippin/images/movie_narrative_charts_large.png";
diff --git a/perf/tests/comp.c b/perf/tests/comp.c
index db70419..7ade6cd 100644
--- a/perf/tests/comp.c
+++ b/perf/tests/comp.c
@@ -9,7 +9,6 @@ main (gint    argc,
   GeglNode   *gegl, *sink;
   gint i;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   bufferB = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/perf/tests/passthrough.c b/perf/tests/passthrough.c
index 0d88b2d..8f0f989 100644
--- a/perf/tests/passthrough.c
+++ b/perf/tests/passthrough.c
@@ -8,7 +8,6 @@ main (gint    argc,
   GeglNode   *gegl, *sink;
   gint i;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/perf/tests/rotate.c b/perf/tests/rotate.c
index 6be989e..22579d8 100644
--- a/perf/tests/rotate.c
+++ b/perf/tests/rotate.c
@@ -7,7 +7,6 @@ main (gint    argc,
   GeglBuffer *buffer, *buffer2;
   GeglNode   *gegl, *sink;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/perf/tests/test-gegl-buffer-access.c b/perf/tests/test-gegl-buffer-access.c
index 2eb1fe5..d2da382 100644
--- a/perf/tests/test-gegl-buffer-access.c
+++ b/perf/tests/test-gegl-buffer-access.c
@@ -9,7 +9,6 @@ main (gint    argc,
   gchar *buf;
   gint i;
 
-  g_thread_init (NULL);
   gegl_init (NULL, NULL);
   buffer = gegl_buffer_new (&bound, babl_format ("RGBA float"));
   buf = g_malloc0 (bound.width * bound.height * 16);
diff --git a/perf/tests/unsharpmask.c b/perf/tests/unsharpmask.c
index 936f1d4..defe854 100644
--- a/perf/tests/unsharpmask.c
+++ b/perf/tests/unsharpmask.c
@@ -7,7 +7,6 @@ main (gint    argc,
   GeglBuffer *buffer, *buffer2;
   GeglNode   *gegl, *sink;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
diff --git a/tests/buffer/buffer-test.c b/tests/buffer/buffer-test.c
index a09536e..a0c6c85 100644
--- a/tests/buffer/buffer-test.c
+++ b/tests/buffer/buffer-test.c
@@ -297,7 +297,6 @@ void rectangle (GeglBuffer *buffer,
 gint main (gint argc, gchar **argv)
 {
   gint i;
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   for (i=0; i < G_N_ELEMENTS (tests); i++)
diff --git a/tests/simple/test-change-processor-rect.c b/tests/simple/test-change-processor-rect.c
index 1c11bb1..02a3f41 100644
--- a/tests/simple/test-change-processor-rect.c
+++ b/tests/simple/test-change-processor-rect.c
@@ -86,7 +86,6 @@ int main(int argc, char *argv[])
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
    */
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   common_color = gegl_color_new ("rgb(1.0, 1.0, 1.0)");
diff --git a/tests/simple/test-color-op.c b/tests/simple/test-color-op.c
index 403d626..540f022 100644
--- a/tests/simple/test-color-op.c
+++ b/tests/simple/test-color-op.c
@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
                                               { G_MAXINT / 2 - 1, G_MAXINT / 2 - 1, 1, 1 } };
 
   /* Init */
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
   colors[0] = gegl_color_new ("rgb(1.0, 0.0, 0.0)");
   colors[1] = gegl_color_new ("rgb(0.0, 1.0, 0.0)");
diff --git a/tests/simple/test-proxynop-processing.c b/tests/simple/test-proxynop-processing.c
index 8108ead..9b420a5 100644
--- a/tests/simple/test-proxynop-processing.c
+++ b/tests/simple/test-proxynop-processing.c
@@ -41,7 +41,6 @@ int main(int argc, char *argv[])
   GeglColor    *color2             = NULL;
 
   /* Init */
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   color1 = gegl_color_new ("rgb(1.0, 0.0, 1.0)");
diff --git a/tools/exp_combine.cpp b/tools/exp_combine.cpp
index efd8e3c..6b772d3 100644
--- a/tools/exp_combine.cpp
+++ b/tools/exp_combine.cpp
@@ -103,7 +103,6 @@ main (int    argc,
   GeglNode *gegl, *combiner, *sink;
   gchar    *all_evs = g_strdup ("");
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
   check_usage (argc, argv);
 
diff --git a/tools/img_cmp.c b/tools/img_cmp.c
index 705a1ad..701d4b2 100644
--- a/tools/img_cmp.c
+++ b/tools/img_cmp.c
@@ -13,7 +13,6 @@ main (gint    argc,
   gdouble        max_diff, avg_diff_wrong, avg_diff_total;
   gint           wrong_pixels, total_pixels;
 
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
 
   if (argc != 3)
diff --git a/tools/introspect.c b/tools/introspect.c
index 55ffdd7..218b24c 100644
--- a/tools/introspect.c
+++ b/tools/introspect.c
@@ -456,7 +456,6 @@ gint
 stuff (gint    argc,
       gchar **argv)
 {
-  g_thread_init (NULL);
   gegl_init (&argc, &argv);
   
     {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]