Changeset 2811 for libpipiTweet

Timestamp:

Sep 1, 2008, 1:05:50 AM (14 years ago)

Author:

Sam Hocevar

Message:

• ordered.c: allow to rotate the dither pattern, using nearest-neighbour rotation interpolation.

Location:

libpipi/trunk/pipi

Files:

• context.c (modified) (1 diff)
• dither/ordered.c (modified) (4 diffs)
• pipi.h (modified) (1 diff)

libpipi/trunk/pipi/context.c

@@ -105 +105 @@
             ctx->nimages--;
         }
-        else if(!strcmp(method, "ordered"))
+        else if(!strncmp(method, "ordered", 7))
         {
+            double angle = .0;
+            method = strchr(method, ':');
+            if(method)
+                angle = atof(method + 1);
             if(ctx->nimages < 2)
                 return -1;
-            dst = pipi_dither_ordered(ctx->images[ctx->nimages - 2], src);
+            dst = pipi_dither_ordered_ext(ctx->images[ctx->nimages - 2], src,
+                                          angle);
             pipi_free(ctx->images[ctx->nimages - 2]);
             ctx->nimages--;

libpipi/trunk/pipi/dither/ordered.c

@@ -21 +21 @@
 
 #include <stdlib.h>
+#include <math.h>
 
 #include "pipi.h"
@@ -27 +28 @@
 pipi_image_t *pipi_dither_ordered(pipi_image_t *img, pipi_image_t *kernel)
 {
+    return pipi_dither_ordered_ext(img, kernel, 0.0);
+}
+
+pipi_image_t *pipi_dither_ordered_ext(pipi_image_t *img, pipi_image_t *kernel,
+                                      double angle)
+{
+    double sint, cost;
     pipi_image_t *dst;
     pipi_pixels_t *dstp, *kernelp;
     float *dstdata, *kerneldata;
-    int x, y, w, h, kw, kh;
+    int x, y, w, h, kx, ky, kw, kh;
 
     w = img->w;
@@ -36 +44 @@
     kw = kernel->w;
     kh = kernel->h;
+
+    cost = cos(angle * (M_PI / 180));
+    sint = sin(angle * (M_PI / 180));
 
     dst = pipi_copy(img);
@@ -50 +61 @@
             float p, q;
 
+            kx = (int)(cost * x - sint * y + 2 * w * h) % kw;
+            ky = (int)(cost * y + sint * x + 2 * w * h) % kh;
+
             p = dstdata[y * w + x];
-            q = p > kerneldata[(y % kh) * kw + (x % kw)] ? 1. : 0.;
+            q = p > kerneldata[ky * kw + kx] ? 1. : 0.;
             dstdata[y * w + x] = q;
         }

libpipi/trunk/pipi/pipi.h

@@ -183 +183 @@
                                        pipi_scan_t);
 extern pipi_image_t *pipi_dither_ordered(pipi_image_t *, pipi_image_t *);
+extern pipi_image_t *pipi_dither_ordered_ext(pipi_image_t *, pipi_image_t *,
+                                             double);
 extern pipi_image_t *pipi_dither_halftone(pipi_image_t *, double, double);
 extern pipi_image_t *pipi_dither_random(pipi_image_t *);