babl: properly cache runtime inserted conversions

The old behavior of avoiding colliding names used in the conversion database
is still used during loading of extension permitting multiple conversions
to be registered for runtime profiling.

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index a7f7eba2dbeae92af4f370bce33b2b6e14e7f9b7..011765c53b722ca156bf4b0a46306ef0ae884c2b 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -235,7 +235,7 @@ _conversion_new (const char    *name,
         BABL (babl->conversion.destination),
         babl_type_from_id (BABL_DOUBLE));
 
-      {
+      if(0){
         const Babl *fish = babl_conversion_find (src_format, dst_format);
         if (fish)
           return fish;
@@ -284,6 +284,8 @@ create_name (Babl *source, Babl *destination, int type)
 const char *
 babl_conversion_create_name (Babl *source, Babl *destination, int type);
 
+int _babl_loaded = 0;
+
 const char *
 babl_conversion_create_name (Babl *source, Babl *destination, int type)
 {
@@ -292,6 +294,9 @@ babl_conversion_create_name (Babl *source, Babl *destination, int type)
   int id = 0;
   collisions = 0;
   name = create_name (source, destination, type);
+
+  if (!_babl_loaded)
+  {
   babl = babl_db_exist (db, id, name);
   while (babl)
     {
@@ -302,6 +307,7 @@ babl_conversion_create_name (Babl *source, Babl *destination, int type)
       name = create_name (source, destination, type);
       babl = babl_db_exist (db, id, name);
     }
+  }
   return name;
 }
 

diff --git a/babl/babl.c b/babl/babl.c
index 4479f68619bb7ab8702ab0763dcb675fa40b5574..ef2cfb7d0154402d51618513854f0828bdda3ec5 100644 (file)
--- a/babl/babl.c
+++ b/babl/babl.c
@@ -125,6 +125,8 @@ babl_dir_list (void)
   return ret;
 }
 
+extern int _babl_loaded;
+
 void
 babl_init (void)
 {
@@ -133,6 +135,7 @@ babl_init (void)
   if (ref_count++ == 0)
     {
       char * dir_list;
+      _babl_loaded = 0;
 
       babl_internal_init ();
       babl_sampling_class_init ();
@@ -155,6 +158,7 @@ babl_init (void)
       babl_free (dir_list);
 
       babl_init_db ();
+      _babl_loaded = 1;
     }
 }