Changeset 2260Tweet

Timestamp:

Mar 11, 2008, 3:56:27 PM (15 years ago)

Author:

Sam Hocevar

Message:

• getpixel/setpixel functions use doubles instead of ints for now.

Location:

libpipi/trunk/pipi

Files:

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

libpipi/trunk/pipi/pipi.h

@@ -35 +35 @@
 extern int pipi_getgray(pipi_image_t const *img, int x, int y, int *g);
 extern int pipi_getpixel(pipi_image_t const *img,
-                         int x, int y, int *r, int *g, int *b);
-extern int pipi_setpixel(pipi_image_t *img, int x, int y, int r, int g, int b);
+                         int x, int y, double *r, double *g, double *b);
+extern int pipi_setpixel(pipi_image_t *img, int x, int y,
+                         double r, double g, double b);
 
 extern pipi_image_t *pipi_resize(pipi_image_t const *, int, int);

libpipi/trunk/pipi/pixels.c

@@ -26 +26 @@
 #include <math.h>
 
+#include "pipi.h"
 #include "pipi_internals.h"
-#include "pipi.h"
 
-#define C2I(p) ((int)255.999*pow(((double)p)/255., 2.2))
-#define I2C(p) ((int)255.999*pow(((double)p)/255., 1./2.2))
+#define C2I(p) (pow(((double)p)/255., 2.2))
+#define I2C(p) ((int)255.999*pow(((double)p), 1./2.2))
 
 int pipi_getgray(pipi_image_t const *img, int x, int y, int *g)
@@ -46 +46 @@
 
 int pipi_getpixel(pipi_image_t const *img,
-                  int x, int y, int *r, int *g, int *b)
+                  int x, int y, double *r, double *g, double *b)
 {
     uint8_t *pixel;
@@ -52 +52 @@
     if(x < 0 || y < 0 || x >= img->width || y >= img->height)
     {
-        *r = 255;
-        *g = 255;
-        *b = 255;
+        *r = *g = *b = 1.;
         return -1;
     }
@@ -67 +65 @@
 }
 
-int pipi_setpixel(pipi_image_t *img, int x, int y, int r, int g, int b)
+int pipi_setpixel(pipi_image_t *img, int x, int y, double r, double g, double b)
 {
     uint8_t *pixel;

libpipi/trunk/pipi/resize.c

@@ -23 +23 @@
 #include <string.h>
 
+#include "pipi.h"
 #include "pipi_internals.h"
-#include "pipi.h"
 
 pipi_image_t *pipi_resize(pipi_image_t const *src, int w, int h)
 {
-    int *aline, *line;
+    double *aline, *line;
     pipi_image_t *dst;
     int x, y, x0, y0, sw, dw, sh, dh, remy;
@@ -37 +37 @@
     dw = dst->width; dh = dst->height;
 
-    aline = malloc(3 * dw * sizeof(int));
-    line = malloc(3 * dw * sizeof(int));
+    aline = malloc(3 * dw * sizeof(double));
+    line = malloc(3 * dw * sizeof(double));
 
-    memset(line, 0, 3 * dw * sizeof(int));
+    memset(line, 0, 3 * dw * sizeof(double));
     remy = 0;
 
@@ -47 +47 @@
         int toty = 0, ny;
 
-        memset(aline, 0, 3 * dw * sizeof(int));
+        memset(aline, 0, 3 * dw * sizeof(double));
 
         while(toty < sh)
@@ -53 +53 @@
             if(remy == 0)
             {
-                int r = 0, g = 0, b = 0;
+                double r = 0, g = 0, b = 0;
                 int remx = 0;
 
                 for(x = 0, x0 = 0; x < dst->width; x++)
                 {
-                    int ar = 0, ag = 0, ab = 0;
+                    double ar = 0, ag = 0, ab = 0;
                     int totx = 0, nx;