Changeset 2765 for libpipiTweet

Timestamp:

Aug 25, 2008, 9:13:40 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Put the random and Bayer stock image generation into pipi/render/*.

Location:

libpipi/trunk/pipi

Files:

• Makefile.am (modified) (2 diffs)
• pipi.h (modified) (1 diff)
• render (added)
• render/noise.c (added)
• render/screen.c (added)
• stock.c (modified) (4 diffs)

libpipi/trunk/pipi/Makefile.am

@@ -26 +26 @@
         $(codec_sources) \
         $(paint_sources) \
+        $(render_sources) \
         $(combine_sources) \
         $(filter_sources) \
@@ -44 +45 @@
         paint/floodfill.c \
         paint/tile.c
+
+render_sources = \
+        render/noise.c \
+        render/screen.c
 
 combine_sources = \

libpipi/trunk/pipi/pipi.h

@@ -106 +106 @@
 extern pipi_image_t *pipi_resize(pipi_image_t *, int, int);
 
+extern pipi_image_t *pipi_render_random(int, int);
+extern pipi_image_t *pipi_render_bayer(int, int);
+
 extern pipi_image_t *pipi_rgb(pipi_image_t *, pipi_image_t *, pipi_image_t *);
 extern pipi_image_t *pipi_red(pipi_image_t *);

libpipi/trunk/pipi/stock.c

@@ -36 +36 @@
     if(!strncmp(name, "bayer:", 6))
     {
-        int i, j, w, h, n;
+        int w, h;
 
         w = atoi(name + 6);
@@ -43 +43 @@
             return NULL;
         h = atoi(name + 1);
-        if(w <= 0 || h <= 0)
-            return NULL;
 
-        for(n = 1; n < w || n < h; n *= 2)
-            ;
-
-        ret = pipi_new(w, h);
-        pix = pipi_getpixels(ret, PIPI_PIXELS_Y_F);
-        data = (float *)pix->pixels;
-
-        for(j = 0; j < h; j++)
-            for(i = 0; i < w; i++)
-            {
-                int k, l, x = 0;
-
-                for(k = 1, l = n * n / 4; k < n; k *= 2, l /= 4)
-                {
-                    if((i & k) && (j & k))
-                        x += l;
-                    else if(i & k)
-                        x += 3 * l;
-                    else if(j & k)
-                        x += 2 * l;
-                }
-
-                data[j * w + i] = (double)(x + 1) / (n * n + 1);
-            }
-
-        return ret;
+        return pipi_render_bayer(w, h);
     }
 
@@ -196 +169 @@
     if(!strncmp(name, "random:", 7))
     {
-        unsigned int ctx = 1;
-        int x, y, t, w, h;
+        int w, h;
 
         w = atoi(name + 7);
@@ -207 +179 @@
             return NULL;
 
-        ret = pipi_new(w, h);
-        pix = pipi_getpixels(ret, PIPI_PIXELS_RGBA_F);
-        data = (float *)pix->pixels;
-
-        for(y = 0; y < h; y++)
-            for(x = 0; x < w; x++)
-            {
-                for(t = 0; t < 3; t++)
-                {
-                    long hi, lo;
-
-                    hi = ctx / 12773L;
-                    lo = ctx % 12773L;
-                    ctx = 16807L * lo - 2836L * hi;
-                    if(ctx <= 0)
-                        ctx += 0x7fffffffL;
-
-                    data[4 * (y * w + x) + t]
-                        = (double)((ctx % 65536) / 65535.);
-                }
-                data[4 * (y * w + x) + 3] = 1.0;
-            }
-
-        return ret;
+        return pipi_render_random(w, h);
     }