Changeset 2778 for libpipiTweet

Timestamp:

Aug 27, 2008, 1:28:48 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Moved *line_template.c to .h files to avoid problems with autotools (sam)
• Added antialiasing support to polylines
• Ho, and previous commit (r2777) contains width/height/pitch accessors to pipi_image_t, too. LOL.

Location:

libpipi/trunk/pipi

Files:

• paint/aline_template.h (moved) (moved from libpipi/trunk/pipi/paint/aline_template.c)
• paint/line.c (modified) (8 diffs)
• paint/line_template.h (moved) (moved from libpipi/trunk/pipi/paint/line_template.c)
• pipi.h (modified) (1 diff)

libpipi/trunk/pipi/paint/line.c

@@ -109 +109 @@
 
 int pipi_draw_polyline(pipi_image_t *img, int const x[], int const y[],
-                       int n, uint32_t c)
+                       int n, uint32_t c, int aa)
 {
     int i;
@@ -116 +116 @@
     if(img->last_modified == PIPI_PIXELS_RGBA_C)
     {
-        uint32_t  *dstdata;
-        dstdata = (uint32_t *)pipi_getpixels(img, PIPI_PIXELS_RGBA_C)->pixels;
-        s.color32 = c;
-        s.buf_u32 = dstdata;
-        s.draw = draw_aliased_line_u32;
+        if(!aa)
+        {
+            uint32_t  *dstdata;
+            dstdata = (uint32_t *)pipi_getpixels(img, PIPI_PIXELS_RGBA_C)->pixels;
+            s.color32 = c;
+            s.buf_u32 = dstdata;
+            s.draw = draw_aliased_line_u32;
+        }
+        else
+        {
+            float  *dstdata;
+            dstdata = (float *)pipi_getpixels(img, PIPI_PIXELS_RGBA_F)->pixels;
+            s.colorf[2] = ((c&0x00FF0000)>>16)/255.0f; /* XXX FIXME */
+            s.colorf[1] = ((c&0x0000FF00)>>8)/255.0f;  /* XXX FIXME */
+            s.colorf[0] = (c&0x000000FF)/255.0f;       /* XXX FIXME */
+            s.buf_f = dstdata;
+            s.draw = draw_antialiased_line_float;
+        }
+    }
+    else if(img->last_modified == PIPI_PIXELS_Y_F)
+    {
+        float  *dstdata;
+        dstdata = (float *)pipi_getpixels(img, PIPI_PIXELS_Y_F)->pixels;
+        s.colorf[0] = c/255.0f; /* XXX FIXME */
+        s.buf_f = dstdata;
+        s.draw = aa==0?draw_aliased_line_gray:draw_antialiased_line_gray;
     }
     else
@@ -130 +151 @@
         s.colorf[2] = (c&0x000000FF)/255.0f; /* XXX FIXME */
         s.buf_f = dstdata;
-        s.draw = draw_aliased_line_float;
+        s.draw = aa==0?draw_aliased_line_float:draw_antialiased_line_float;
         img->last_modified = PIPI_PIXELS_RGBA_F;
     }
@@ -229 +250 @@
 #undef  ASSIGN
 #define ASSIGN(x, y, w) s->buf_u32[x+y*w] = s->color32;
-#include "line_template.c"
+#include "line_template.h"
 }
 static void draw_aliased_line_float(pipi_image_t *img, struct line* s)
@@ -237 +258 @@
                          s->buf_f[1 + (x*4)+y*(w*4)] = s->colorf[1]; \
                          s->buf_f[2 + (x*4)+y*(w*4)] = s->colorf[2];
-#include "line_template.c"
+#include "line_template.h"
 }
 static void draw_aliased_line_gray(pipi_image_t *img, struct line* s)
@@ -243 +264 @@
 #undef  ASSIGN
 #define ASSIGN(x, y, w) s->buf_f[x+y*w]     = s->colorf[0];
-#include "line_template.c"
+#include "line_template.h"
 }
 
@@ -266 +287 @@
     s->buf_f[(2+((int)(x)*4))+((int)(y))*(img->w*4)] = \
         (c*s->colorf[2]) + (1-c) * s->buf_f[(2+((int)(x)*4))+((int)(y))*(img->w*4)];
-#include "aline_template.c"
+#include "aline_template.h"
 }
 
@@ -275 +296 @@
 #define PLOT(x, y, c) s->buf_f[((int)(x))+((int)(y))*img->w] =  \
     (c*s->colorf[0]) + (1-c) * s->buf_f[((int)(x))+((int)(y))*img->w];
-#include "aline_template.c"
-}
+#include "aline_template.h"
+}

libpipi/trunk/pipi/pipi.h

@@ -156 +156 @@
 extern int pipi_draw_line(pipi_image_t *, int, int, int, int, uint32_t, int);
 extern int pipi_draw_polyline(pipi_image_t *, int const[], int const[],
-                              int , uint32_t);
+                              int , uint32_t, int);
 extern pipi_image_t *pipi_reduce(pipi_image_t *, int, double const *);