Changeset 2633

Timestamp:

08/02/08 02:01:08 (5 years ago)

Author:

sam

Message:

• pixels.c: start supporting grayscale images.

Location:

libpipi/trunk/pipi

Files:

• pipi.h (modified) (1 diff)
• pixels.c (modified) (2 diffs)

libpipi/trunk/pipi/pipi.h

@@ -35 +35 @@
     PIPI_PIXELS_BGR24 = 1,
     PIPI_PIXELS_RGBA_F = 2,
+    PIPI_PIXELS_Y_F = 3,
 
-    PIPI_PIXELS_MAX = 3
+    PIPI_PIXELS_MAX = 4
 }
 pipi_format_t;

libpipi/trunk/pipi/pixels.c

@@ -63 +63 @@
             bytes = img->w * img->h * 4 * sizeof(float);
             break;
+        case PIPI_PIXELS_Y_F:
+            bytes = img->w * img->h * sizeof(float);
+            break;
         default:
             return NULL;
@@ -177 +180 @@
                 }
     }
+    else if(img->last_modified == PIPI_PIXELS_Y_F
+                       && type == PIPI_PIXELS_RGBA_F)
+    {
+        float *src = (float *)img->p[PIPI_PIXELS_Y_F].pixels;
+        float *dest = (float *)img->p[PIPI_PIXELS_RGBA_F].pixels;
+
+        init_tables();
+
+        for(y = 0; y < img->h; y++)
+            for(x = 0; x < img->w; x++)
+            {
+                float p = src[y * img->w + x];
+                dest[4 * (y * img->w + x)] = p;
+                dest[4 * (y * img->w + x) + 1] = p;
+                dest[4 * (y * img->w + x) + 2] = p;
+                dest[4 * (y * img->w + x) + 3] = 1.0;
+            }
+    }
+    else if(img->last_modified == PIPI_PIXELS_RGBA_F
+                       && type == PIPI_PIXELS_Y_F)
+    {
+        float *src = (float *)img->p[PIPI_PIXELS_RGBA_F].pixels;
+        float *dest = (float *)img->p[PIPI_PIXELS_Y_F].pixels;
+
+        init_tables();
+
+        for(y = 0; y < img->h; y++)
+            for(x = 0; x < img->w; x++)
+            {
+                float p = 0.;
+                p += 0.299 * src[4 * (y * img->w + x)];
+                p += 0.587 * src[4 * (y * img->w + x) + 1];
+                p += 0.114 * src[4 * (y * img->w + x) + 2];
+                dest[y * img->w + x] = p;
+            }
+    }
     else
     {