Changeset 2809 for libpipiTweet

Timestamp:

Aug 30, 2008, 12:03:33 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Preliminary image histogram routines and example

Location:

libpipi/trunk

Files:

• examples/Makefile.am (modified) (2 diffs)
• examples/histogram.c (added)
• pipi/Makefile.am (modified) (2 diffs)
• pipi/histogram (added)
• pipi/histogram/histogram.c (added)
• pipi/pipi.h (modified) (3 diffs)
• pipi/pipi_internals.h (modified) (1 diff)

libpipi/trunk/examples/Makefile.am

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

libpipi/trunk/pipi/Makefile.am

@@ -32 +32 @@
         $(quantize_sources) \
         $(dither_sources) \
+        $(histogram_sources) \
         $(NULL)
 libpipi_la_CFLAGS = $(codec_cflags)
@@ -80 +81 @@
         dither/random.c
 
+histogram_sources = \
+        histogram/histogram.c
+
 if USE_SDL
 codec_cflags += `sdl-config --cflags`

libpipi/trunk/pipi/pipi.h

@@ -55 +55 @@
 pipi_format_t;
 
+
+typedef enum
+{
+    PIPI_COLOR_R = 1,
+    PIPI_COLOR_G = 2,
+    PIPI_COLOR_B = 4,
+    PIPI_COLOR_A = 8,
+    PIPI_COLOR_Y = 16
+}
+pipi_color_flag_t;
+
 struct pixel_u32
 {
@@ -89 +100 @@
 typedef struct pipi_context pipi_context_t;
 
+/* pipi_histogram_t: the histogram type */
+typedef struct pipi_histogram pipi_histogram_t;
 
 extern pipi_context_t *pipi_create_context(void);
@@ -171 +184 @@
 extern void pipi_dither_24to16(pipi_image_t *);
 
+extern pipi_histogram_t* pipi_new_histogram(void);
+extern int pipi_get_image_histogram(pipi_image_t *, pipi_histogram_t *, int);
+extern int pipi_free_histogram(pipi_histogram_t*);
+extern int pipi_render_histogram(pipi_image_t *, pipi_histogram_t*, int);
+
 
 #ifdef __cplusplus

libpipi/trunk/pipi/pipi_internals.h

@@ -23 +23 @@
 #define SET_FLAG_WRAP 0x00000002
 #define SET_FLAG_8BIT 0x00000004
+
+struct pipi_histogram
+{
+    int r_present, g_present, b_present, y_present;
+    unsigned int a[256];
+    unsigned int r[256];
+    unsigned int g[256];
+    unsigned int b[256];
+    unsigned int y[256];
+};
+
 
 /* pipi_image_t: the image structure. This is probably going to be the most