Changeset 2655 for libpipi/trunk/pipi/pixels.c

Timestamp:

08/03/08 13:47:11 (5 years ago)

Author:

sam

Message:

• pixels.c: support more conversion combinations.

File:

• libpipi/trunk/pipi/pixels.c (modified) (1 diff)

libpipi/trunk/pipi/pixels.c

@@ -49 +49 @@
         return &img->p[type];
 
+    /* Preliminary conversions */
+    if(img->last_modified == PIPI_PIXELS_RGBA32
+                  && type == PIPI_PIXELS_Y_F)
+        pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
+    else if(img->last_modified == PIPI_PIXELS_BGR24
+                       && type == PIPI_PIXELS_Y_F)
+        pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
+    else if(img->last_modified == PIPI_PIXELS_Y_F
+                       && type == PIPI_PIXELS_RGBA32)
+        pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
+    else if(img->last_modified == PIPI_PIXELS_Y_F
+                       && type == PIPI_PIXELS_BGR24)
+        pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
+
     /* Allocate pixels if necessary */
     if(!img->p[type].pixels)