babl: clean up compiler warnings

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index e99cddd2a7a8b61380c966c88d8b0d234d11503f..d1c754f6d5b61dbc434d9075224d51246c1d2b3c 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -118,7 +118,7 @@ static float timings[256] = {0,};
 static inline void _do_lut (uint32_t *lut,
                            int   source_bpp,
                            int   dest_bpp,
-                           void *__restrict__ source,
+                           const void *__restrict__ source,
                            void *__restrict__ destination,
                            long n)
 {
@@ -224,12 +224,19 @@ static inline void _do_lut (uint32_t *lut,
         }
 }
 
-void do_lut (uint32_t *lut,
-                           int   source_bpp,
-                           int   dest_bpp,
-                           void *__restrict__ source,
-                           void *__restrict__ dest,
-                           long count)
+
+void babl_test_lut (uint32_t *lut,
+             int   source_bpp,
+             int   dest_bpp,
+             void *__restrict__ source,
+             void *__restrict__ dest,
+             long count);
+void babl_test_lut (uint32_t *lut,
+             int   source_bpp,
+             int   dest_bpp,
+             void *__restrict__ source,
+             void *__restrict__ dest,
+             long count)
 {
    _do_lut (lut, source_bpp, dest_bpp, source, dest, count);
 }
@@ -268,7 +275,7 @@ static void measure_timings(void)
      int dest_bpp = pairs[p][1];
      long start,end;
      start = babl_ticks ();
-     _do_lut (lut, source_bpp, dest_bpp, src, dst, num_pixels);
+     babl_test_lut (lut, source_bpp, dest_bpp, src, dst, num_pixels);
 
      end = babl_ticks ();
      timings[source_bpp * 16 + dest_bpp] = (end-start)/1000.0;
@@ -289,11 +296,11 @@ process_conversion_path (BablList   *path,
                          int         dest_bpp,
                          long        n);
 
-static int babl_fish_lut_process_maybe (const Babl *babl,
-                                        const char *source,
-                                        const char *destination,
-                                        long        n,
-                                        void       *data)
+static inline int babl_fish_lut_process_maybe (const Babl *babl,
+                                               const char *source,
+                                               char *destination,
+                                               long        n,
+                                               void       *data)
 {
      int source_bpp = babl->fish_path.source_bpp;
      int dest_bpp = babl->fish_path.dest_bpp;
@@ -331,10 +338,10 @@ static int babl_fish_lut_process_maybe (const Babl *babl,
        }
        else if (source_bpp == 3 && dest_bpp == 3)
        {
-         lut = malloc (256 * 256 * 256 * 4);
          uint8_t *temp_lut = malloc (256 * 256 * 256 * 3);
          uint8_t *temp_lut2 = malloc (256 * 256 * 256 * 3);
          int o = 0;
+         lut = malloc (256 * 256 * 256 * 4);
          for (int r = 0; r < 256; r++)
          for (int g = 0; g < 256; g++)
          for (int b = 0; b < 256; b++, o++)
@@ -356,9 +363,9 @@ static int babl_fish_lut_process_maybe (const Babl *babl,
        }
        else if (source_bpp == 3 && dest_bpp == 4)
        {
-         lut = malloc (256 * 256 * 256 * 4);
          uint8_t *temp_lut = malloc (256 * 256 * 256 * 3);
          int o = 0;
+         lut = malloc (256 * 256 * 256 * 4);
          for (int r = 0; r < 256; r++)
          for (int g = 0; g < 256; g++)
          for (int b = 0; b < 256; b++, o++)
@@ -377,8 +384,8 @@ static int babl_fish_lut_process_maybe (const Babl *babl,
        }
        else if (source_bpp == 2 && dest_bpp == 2)
        {
-         lut = malloc (256 * 256 * 4);
          uint16_t *temp_lut = malloc (256 * 256 * 2);
+         lut = malloc (256 * 256 * 4);
          for (int o = 0; o < 256*256; o++)
          {
            temp_lut[o]=o;
@@ -391,8 +398,8 @@ static int babl_fish_lut_process_maybe (const Babl *babl,
        }
        else if (source_bpp == 2 && dest_bpp == 4)
        {
-         lut = malloc (256 * 256 * 4);
          uint16_t *temp_lut = malloc (256 * 256 * 2);
+         lut = malloc (256 * 256 * 4);
          for (int o = 0; o < 256*256; o++)
          {
            temp_lut[o]=o;
@@ -421,8 +428,8 @@ static int babl_fish_lut_process_maybe (const Babl *babl,
        }
        else if (source_bpp == 1 && dest_bpp == 4)
        {
-         lut = malloc (256 * 4);
          uint8_t *temp_lut = malloc (256);
+         lut = malloc (256 * 4);
          for (int o = 0; o < 256; o++)
          {
            temp_lut[o]=o;
@@ -454,7 +461,7 @@ static int babl_fish_lut_process_maybe (const Babl *babl,
      }
      if (lut)
      {
-        do_lut (lut, source_bpp, dest_bpp, source, destination, n);
+        _do_lut (lut, source_bpp, dest_bpp, source, destination, n);
         BABL(babl)->fish_path.last_lut_use = babl_ticks ();
      }
      return 0;

diff --git a/babl/babl.h b/babl/babl.h
index 04bc00a0ca9c93b6740ed092424ae775dbb05dec..36681b83e47454f692f8ddfff501b040d777db3d 100644 (file)
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -715,7 +715,7 @@ int babl_space_is_gray (const Babl *space);
 
 typedef void (*BablFishProcess) (const Babl *babl, const char *src, char *dst, long n, void *data);
 /**
- * babl_fish_get_dispatch: (skip)
+ * babl_fish_get_process: (skip)
  *
  * get the dispatch function of a fish, this allows faster use of a fish
  * in a loop than the more indirect method of babl_process, this also avoids

diff --git a/tools/babl-benchmark.c b/tools/babl-benchmark.c
index ee1df459ee716c5fab68203370b8e23e7175897a..0ead0cbda5060ab85c25be6f5fa0d5bbd05436ec 100644 (file)
--- a/tools/babl-benchmark.c
+++ b/tools/babl-benchmark.c
@@ -203,10 +203,10 @@ test (int set_no)
   int set_iter = 0;
   int first_run = 1;
   float max_throughput = 0;
+  double max = 0.0;
 
   if (set_no > n_sets-1) set_no = n_sets-1;
 
-  double max = 0.0;
   while (set_iter < n_sets)
   {
   double sum = 0;
@@ -271,12 +271,15 @@ test (int set_no)
 
   fprintf (stdout, "                                                       \r");
 
+  {
   float throughput  = sum / n;
-  if (throughput > max_throughput) max_throughput = throughput;
+  if (throughput > max_throughput)
+     max_throughput = throughput;
   fprintf (stdout, "%s %03.3f mp/s\tWorkflow: %s to %s\n\n",
                       unicode_hbar(BAR_WIDTH, throughput / max_throughput), throughput,
                       babl_get_name (formats[0]),
                       babl_get_name (formats[n_formats-1]));
+  }
 
       if (mbps[n] > max && first_run)
         max = mbps[n];