Changeset 2609Tweet

Timestamp:

07/30/08 00:17:43 (5 years ago)

Author:

sam

Message:

• pixels.c: speed up the RGBA32 -> float32 conversion, using a simple LUT.

File:

• libpipi/trunk/pipi/pixels.c (modified) (4 diffs)

libpipi/trunk/pipi/pixels.c

@@ -29 +29 @@
 #include "pipi_internals.h"
 
-#define C2I(p) (pow(((double)p)/255., 2.2))
-#define I2C(p) ((int)255.999*pow(((double)p), 1./2.2))
+static void init_tables(void);
+
+static float u8tof32_table[256];
+static inline float u8tof32(uint8_t p) { return u8tof32_table[(int)p]; }
+
 
 /* Return a direct pointer to an image's pixels. */
@@ -69 +72 @@
         float *dest = (float *)img->p[type].pixels;
 
+        init_tables();
+
         for(y = 0; y < img->h; y++)
             for(x = 0; x < img->w; x++)
                 for(i = 0; i < 4; i++)
                     dest[4 * (y * img->w + x) + i]
-                        = C2I(src[4 * (y * img->w + x) + i]);
+                        = u8tof32(src[4 * (y * img->w + x) + i]);
     }
     else if(img->last_modified == PIPI_PIXELS_RGBA_F
@@ -84 +89 @@
             for(x = 0; x < img->w; x++)
                 for(i = 0; i < 4; i++)
+                {
+                    double p = src[4 * (y * img->w + x) + i];
                     dest[4 * (y * img->w + x) + i]
-                        = I2C(src[4 * (y * img->w + x) + i]);
+                        = (int)(255.999 * pow(p, 1. / 2.2));
+                }
     }
     else
@@ -97 +105 @@
 }
 
+
+static void init_tables(void)
+{
+    static int done = 0;
+    int i;
+
+    if(done)
+        return;
+
+    for(i = 0; i < 256; i++)
+        u8tof32_table[i] = pow((double)i / 255., 2.2);
+
+    done = 1;
+}
+