Changeset 2810Tweet

Timestamp:

08/30/08 13:29:54 (5 years ago)

Author:

jylam

Message:

• Preliminary support for a string to color routine (rgb(), argb() frgb(), fargb()) as well as named colors

Location:

libpipi/trunk

Files:

• examples/Makefile.am (modified) (2 diffs)
• examples/colorstring.c (added)
• pipi/Makefile.am (modified) (1 diff)
• pipi/colorstring.c (added)
• pipi/paint/line.c (modified) (1 diff)
• pipi/pipi.h (modified) (4 diffs)

libpipi/trunk/examples/Makefile.am

@@ -3 +3 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/pipi
 
-bin_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram
+bin_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram colorstring
 
 edd_SOURCES = edd.c
@@ -25 +25 @@
 histogram_SOURCES = histogram.c
 histogram_LDADD = ../pipi/libpipi.la
+
+colorstring_SOURCES = colorstring.c
+colorstring_LDADD = ../pipi/libpipi.la

libpipi/trunk/pipi/Makefile.am

@@ -22 +22 @@
         codec.c \
         stock.c \
+        colorstring.c \
         resize.c \
         dither.c \

libpipi/trunk/pipi/paint/line.c

@@ -73 +73 @@
     s.x2 = x2;
     s.y2 = y2;
+
 
     /* No Transparency routine for u32 yet, fallback to float version */

libpipi/trunk/pipi/pipi.h

@@ -2 +2 @@
  *  libpipi       Proper image processing implementation library
  *  Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
+ *                2008 Jean-Yves Lamoureux <jylam@lnxscene.org
  *                All Rights Reserved
  *
@@ -22 +23 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
@@ -79 +81 @@
     union
     {
+        struct pixel_float pixel_float;
         struct pixel_u32   pixel_u32;
-        struct pixel_float pixel_float;
     };
 }
@@ -102 +104 @@
 /* pipi_histogram_t: the histogram type */
 typedef struct pipi_histogram pipi_histogram_t;
+
+extern pipi_pixel_t *pipi_get_color_from_string(const char* s);
+
 
 extern pipi_context_t *pipi_create_context(void);