Changeset 2605 for libpipi/trunk/pipi/resize.cTweet

Timestamp:

Jul 29, 2008, 1:01:29 AM (12 years ago)

Author:

Sam Hocevar

Message:

• Big API reorganisation. Now libpipi can transparently convert between colour spaces for a given image. For instance, if pipi_gaussian_blur is applied to a 32-bpp image, it is automatically converted to gamma-corrected 32-bit floats beforehands, then converted back to normal.
• TODO: clipping, regions of interest, more formats, getpixel macros...

File:

• libpipi/trunk/pipi/resize.c (modified) (5 diffs)

libpipi/trunk/pipi/resize.c

@@ -26 +26 @@
 #include "pipi_internals.h"
 
-pipi_image_t *pipi_resize(pipi_image_t const *src, int w, int h)
+pipi_image_t *pipi_resize(pipi_image_t *src, int w, int h)
 {
-    double *aline, *line;
+    float *srcdata, *dstdata, *aline, *line;
     pipi_image_t *dst;
+    pipi_pixels_t *srcp, *dstp;
     int x, y, x0, y0, sw, dw, sh, dh, remy;
 
+    srcp = pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
+    srcdata = (float *)srcp->pixels;
+
     dst = pipi_new(w, h);
+    dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
+    dstdata = (float *)dstp->pixels;
 
-    sw = src->width; sh = src->height;
-    dw = dst->width; dh = dst->height;
+    sw = src->w; sh = src->h;
+    dw = dst->w; dh = dst->h;
 
-    aline = malloc(3 * dw * sizeof(double));
-    line = malloc(3 * dw * sizeof(double));
+    aline = malloc(3 * dw * sizeof(float));
+    line = malloc(3 * dw * sizeof(float));
 
-    memset(line, 0, 3 * dw * sizeof(double));
+    memset(line, 0, 3 * dw * sizeof(float));
     remy = 0;
 
-    for(y = 0, y0 = 0; y < dst->height; y++)
+    for(y = 0, y0 = 0; y < dh; y++)
     {
         int toty = 0, ny;
 
-        memset(aline, 0, 3 * dw * sizeof(double));
+        memset(aline, 0, 3 * dw * sizeof(float));
 
         while(toty < sh)
@@ -53 +59 @@
             if(remy == 0)
             {
-                double r = 0, g = 0, b = 0;
+                float r = 0, g = 0, b = 0;
                 int remx = 0;
 
-                for(x = 0, x0 = 0; x < dst->width; x++)
+                for(x = 0, x0 = 0; x < dw; x++)
                 {
-                    double ar = 0, ag = 0, ab = 0;
+                    float ar = 0, ag = 0, ab = 0;
                     int totx = 0, nx;
 
@@ -65 +71 @@
                         if(remx == 0)
                         {
-                            pipi_getpixel(src, x0, y0, &r, &g, &b);
+                            r = srcdata[(y0 * sw + x0) * 4];
+                            g = srcdata[(y0 * sw + x0) * 4 + 1];
+                            b = srcdata[(y0 * sw + x0) * 4 + 2];
                             x0++;
                             remx = dw;
@@ -86 +94 @@
 
             ny = (toty + remy <= sh) ? remy : sh - toty;
-            for(x = 0; x < dst->width; x++)
+            for(x = 0; x < dw; x++)
             {
                 aline[3 * x] += ny * line[3 * x];
@@ -96 +104 @@
         }
 
-        for(x = 0; x < dst->width; x++)
-            pipi_setpixel(dst, x, y,
-                          aline[3 * x] / (sw * sh),
-                          aline[3 * x + 1] / (sw * sh),
-                          aline[3 * x + 2] / (sw * sh));
+        for(x = 0; x < dw; x++)
+        {
+            dstdata[(y * dw + x) * 4] = aline[3 * x] / (sw * sh);
+            dstdata[(y * dw + x) * 4 + 1] = aline[3 * x + 1] / (sw * sh);
+            dstdata[(y * dw + x) * 4 + 2] = aline[3 * x + 2] / (sw * sh);
+        }
     }