Changeset 2902 for libpipiTweet

Timestamp:

Oct 8, 2008, 2:14:57 AM (12 years ago)

Author:

Sam Hocevar

Message:

Support C99 types on Win32 through the same hacks as in libcaca.

Location:

libpipi/trunk

Files:

• Makefile.am (modified) (1 diff)
• common.h (deleted)
• configure.ac (modified) (2 diffs)
• examples/bezier.c (modified) (1 diff)
• examples/edd.c (modified) (1 diff)
• examples/floodfill.c (modified) (1 diff)
• examples/histogram.c (modified) (1 diff)
• examples/img2rubik.c (modified) (1 diff)
• examples/line.c (modified) (1 diff)
• examples/sharpen.c (modified) (1 diff)
• genethumb/genethumb.c (modified) (1 diff)
• pipi (modified) (1 prop)
• pipi/Makefile.am (modified) (3 diffs)
• pipi/accessors.c (modified) (1 diff)
• pipi/codec.c (modified) (1 diff)
• pipi/codec/coreimage.h (modified) (1 diff)
• pipi/codec/gdi.c (modified) (1 diff)
• pipi/codec/imlib.c (modified) (1 diff)
• pipi/codec/opencv.c (modified) (1 diff)
• pipi/codec/oric.c (modified) (1 diff)
• pipi/codec/sdl.c (modified) (1 diff)
• pipi/colorstring.c (modified) (2 diffs)
• pipi/combine/mean.c (modified) (1 diff)
• pipi/combine/minmax.c (modified) (1 diff)
• pipi/combine/mulscreen.c (modified) (1 diff)
• pipi/combine/rgb.c (modified) (1 diff)
• pipi/combine/subadd.c (modified) (1 diff)
• pipi/context.c (modified) (1 diff)
• pipi/dither.c (modified) (1 diff)
• pipi/dither/dbs.c (modified) (1 diff)
• pipi/dither/ediff.c (modified) (1 diff)
• pipi/dither/ordered.c (modified) (1 diff)
• pipi/dither/ostromoukhov.c (modified) (1 diff)
• pipi/dither/random.c (modified) (1 diff)
• pipi/filter/autocontrast.c (modified) (1 diff)
• pipi/filter/blur.c (modified) (1 diff)
• pipi/filter/color.c (modified) (1 diff)
• pipi/filter/convolution.c (modified) (1 diff)
• pipi/filter/dilate.c (modified) (1 diff)
• pipi/filter/median.c (modified) (1 diff)
• pipi/filter/transform.c (modified) (1 diff)
• pipi/histogram/histogram.c (modified) (1 diff)
• pipi/measure.c (modified) (1 diff)
• pipi/paint/bezier.c (modified) (1 diff)
• pipi/paint/floodfill.c (modified) (1 diff)
• pipi/paint/line.c (modified) (1 diff)
• pipi/paint/tile.c (modified) (1 diff)
• pipi/pipi.c (modified) (1 diff)
• pipi/pipi.h (modified) (2 diffs)
• pipi/pipi_internals.h (modified) (1 diff)
• pipi/pipi_stubs.h (added)
• pipi/pipi_types.h.in (added)
• pipi/pixels.c (modified) (1 diff)
• pipi/quantize/reduce.c (modified) (1 diff)
• pipi/render/noise.c (modified) (1 diff)
• pipi/render/screen.c (modified) (1 diff)
• pipi/resize.c (modified) (1 diff)
• pipi/stock.c (modified) (1 diff)
• src/pipi.c (modified) (1 diff)
• test/u8tof32tou8.c (modified) (1 diff)
• win32/Makefile.am (modified) (1 diff)
• win32/pipi_types.h (added)

libpipi/trunk/Makefile.am

@@ -4 +4 @@
 DIST_SUBDIRS = $(SUBDIRS) win32
 
-EXTRA_DIST = bootstrap build-win32 common.h NOTES
+EXTRA_DIST = bootstrap build-win32 NOTES
 AUTOMAKE_OPTIONS = dist-bzip2
 

libpipi/trunk/configure.ac

@@ -67 +67 @@
 AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no")
 AC_SUBST(GETOPT_LIBS)
+
+# How to get the C99 types. See pipi/pipi_types.h.in for details about
+# the PIPI_TYPES variable
+if test "${ac_cv_my_have_vga}" = "yes"; then
+  PIPI_TYPES=0
+else
+  AC_CHECK_HEADERS(stdint.h,
+    [PIPI_TYPES=1],
+    [AC_CHECK_HEADERS(inttypes.h,
+      [PIPI_TYPES=2],
+      [AC_CHECK_HEADERS(windows.h,
+        [PIPI_TYPES=3],
+        [PIPI_TYPES=0])])])
+fi
+AC_SUBST(PIPI_TYPES)
 
 # Optimizations
@@ -175 +190 @@
 ])
 AC_CONFIG_FILES([
+  pipi/pipi_types.h
   pipi/pipi.pc
   pipi-sharp/pipi-sharp.pc

libpipi/trunk/examples/bezier.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/examples/edd.c

@@ -24 +24 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/examples/floodfill.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/examples/histogram.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/examples/img2rubik.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/examples/line.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/examples/sharpen.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/genethumb/genethumb.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #if !defined HAVE_GETOPT_LONG

libpipi/trunk/pipi

@@ -5 +5 @@
 *.a
 pipi.pc
+pipi_types.h

@@ -5 +5 @@
 *.a
 pipi.pc
+pipi_types.h

libpipi/trunk/pipi/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-EXTRA_DIST = pipi.pc.in
+EXTRA_DIST = pipi_types.h.in pipi.pc.in
 DISTCLEANFILES = pipi.pc
 
@@ -9 +9 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
-include_HEADERS = pipi.h
+include_HEADERS = pipi.h pipi_types.h
 
 # The main library
@@ -16 +16 @@
         pipi.c \
         pipi.h \
+        pipi_types.h \
         pipi_internals.h \
+        pipi_stubs.h \
         pipi_template.h \
         context.c \

libpipi/trunk/pipi/accessors.c

@@ -19 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/codec.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/codec/coreimage.h

@@ -21 +21 @@
 #ifdef USE_COCOA
 
-#include "common.h"
-
 #include <stdio.h>
 #include <stdlib.h>

libpipi/trunk/pipi/codec/gdi.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/codec/imlib.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/codec/opencv.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/codec/oric.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/codec/sdl.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/colorstring.c

@@ -1 @@
-/*
- *  libpipi       Pathetic image processing interface library
- *  Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
- *                2008 Jean-Yves Lamoureux <jylam@lnxscene.org
- *                All Rights Reserved
- *
- *  $Id$
- *
- *  This library is free software. It comes without any warranty, to
- *  the extent permitted by applicable law. You can redistribute it
- *  and/or modify it under the terms of the Do What The Fuck You Want
- *  To Public License, Version 2, as published by Sam Hocevar. See
- *  http://sam.zoy.org/wtfpl/COPYING for more details.
- */
-
-/*
- * color.c: color parsing functions
- */
-
-#include "config.h"
-#include "common.h"
-
 /*
  *  libpipi       Pathetic image processing interface library
@@ -41 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <string.h>
 

libpipi/trunk/pipi/combine/mean.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/combine/minmax.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/combine/mulscreen.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/combine/rgb.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/combine/subadd.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <math.h>

libpipi/trunk/pipi/context.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/dither.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/dither/dbs.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <string.h>

libpipi/trunk/pipi/dither/ediff.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/dither/ordered.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/dither/ostromoukhov.c

@@ -26 +26 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/dither/random.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include "pipi.h"

libpipi/trunk/pipi/filter/autocontrast.c

@@ -20 +20 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/filter/blur.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/filter/color.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/filter/convolution.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/filter/dilate.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/filter/median.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/filter/transform.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/histogram/histogram.c

@@ -19 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/measure.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <math.h>

libpipi/trunk/pipi/paint/bezier.c

@@ -19 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/paint/floodfill.c

@@ -19 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/paint/line.c

@@ -19 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/paint/tile.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
-#include <strings.h>
+#include <string.h>
 
 #include "pipi.h"

libpipi/trunk/pipi/pipi.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/pipi.h

@@ -21 +21 @@
 #define __PIPI_H__
 
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
+#include <pipi_types.h>
+
+#undef __extern
+#if defined(_DOXYGEN_SKIP_ME)
+#elif defined(_WIN32) && defined(__LIBPIPI__)
+#   define __extern extern __declspec(dllexport)
+#else
+#   define __extern extern
+#endif
 
 #ifdef __cplusplus
@@ -113 +119 @@
 pipi_command_t;
 
-extern pipi_pixel_t *pipi_get_color_from_string(const char* s);
+__extern pipi_pixel_t *pipi_get_color_from_string(const char* s);
 
 char const * pipi_get_version(void);
 
-extern pipi_context_t *pipi_create_context(void);
-extern void pipi_destroy_context(pipi_context_t *);
-extern pipi_command_t const *pipi_get_command_list(void);
-extern int pipi_command(pipi_context_t *, char const *, ...);
-
-extern pipi_image_t *pipi_load(char const *);
-extern pipi_image_t *pipi_load_stock(char const *);
-extern pipi_image_t *pipi_new(int, int);
-extern pipi_image_t *pipi_copy(pipi_image_t *);
-extern void pipi_free(pipi_image_t *);
-extern int pipi_save(pipi_image_t *, const char *);
-
-extern void pipi_set_gamma(double);
-extern pipi_pixels_t *pipi_getpixels(pipi_image_t *, pipi_format_t);
-extern int pipi_get_image_width(pipi_image_t *img);
-extern int pipi_get_image_height(pipi_image_t *img);
-extern int pipi_get_image_pitch(pipi_image_t *img);
-extern int pipi_get_image_last_modified(pipi_image_t *img);
-extern const char* pipi_get_format_name(int format);
-
-
-extern double pipi_measure_msd(pipi_image_t *, pipi_image_t *);
-extern double pipi_measure_rmsd(pipi_image_t *, pipi_image_t *);
-
-extern pipi_image_t *pipi_resize(pipi_image_t *, int, int);
-
-extern pipi_image_t *pipi_render_random(int, int);
-extern pipi_image_t *pipi_render_bayer(int, int);
-extern pipi_image_t *pipi_render_halftone(int, int);
-
-extern pipi_image_t *pipi_rgb(pipi_image_t *, pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_red(pipi_image_t *);
-extern pipi_image_t *pipi_green(pipi_image_t *);
-extern pipi_image_t *pipi_blue(pipi_image_t *);
-extern pipi_image_t *pipi_mean(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_min(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_max(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_add(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_sub(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_difference(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_multiply(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_divide(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_screen(pipi_image_t *, pipi_image_t *);
-extern pipi_image_t *pipi_overlay(pipi_image_t *, pipi_image_t *);
-
-extern pipi_image_t *pipi_convolution(pipi_image_t *, int, int, double[]);
-extern pipi_image_t *pipi_gaussian_blur(pipi_image_t *, float);
-extern pipi_image_t *pipi_gaussian_blur_ext(pipi_image_t *,
+__extern pipi_context_t *pipi_create_context(void);
+__extern void pipi_destroy_context(pipi_context_t *);
+__extern pipi_command_t const *pipi_get_command_list(void);
+__extern int pipi_command(pipi_context_t *, char const *, ...);
+
+__extern pipi_image_t *pipi_load(char const *);
+__extern pipi_image_t *pipi_load_stock(char const *);
+__extern pipi_image_t *pipi_new(int, int);
+__extern pipi_image_t *pipi_copy(pipi_image_t *);
+__extern void pipi_free(pipi_image_t *);
+__extern int pipi_save(pipi_image_t *, const char *);
+
+__extern void pipi_set_gamma(double);
+__extern pipi_pixels_t *pipi_getpixels(pipi_image_t *, pipi_format_t);
+__extern int pipi_get_image_width(pipi_image_t *img);
+__extern int pipi_get_image_height(pipi_image_t *img);
+__extern int pipi_get_image_pitch(pipi_image_t *img);
+__extern int pipi_get_image_last_modified(pipi_image_t *img);
+__extern const char* pipi_get_format_name(int format);
+
+
+__extern double pipi_measure_msd(pipi_image_t *, pipi_image_t *);
+__extern double pipi_measure_rmsd(pipi_image_t *, pipi_image_t *);
+
+__extern pipi_image_t *pipi_resize(pipi_image_t *, int, int);
+
+__extern pipi_image_t *pipi_render_random(int, int);
+__extern pipi_image_t *pipi_render_bayer(int, int);
+__extern pipi_image_t *pipi_render_halftone(int, int);
+
+__extern pipi_image_t *pipi_rgb(pipi_image_t *, pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_red(pipi_image_t *);
+__extern pipi_image_t *pipi_green(pipi_image_t *);
+__extern pipi_image_t *pipi_blue(pipi_image_t *);
+__extern pipi_image_t *pipi_mean(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_min(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_max(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_add(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_sub(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_difference(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_multiply(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_divide(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_screen(pipi_image_t *, pipi_image_t *);
+__extern pipi_image_t *pipi_overlay(pipi_image_t *, pipi_image_t *);
+
+__extern pipi_image_t *pipi_convolution(pipi_image_t *, int, int, double[]);
+__extern pipi_image_t *pipi_gaussian_blur(pipi_image_t *, float);
+__extern pipi_image_t *pipi_gaussian_blur_ext(pipi_image_t *,
                                             float, float, float, float, float);
-extern pipi_image_t *pipi_box_blur(pipi_image_t *, int);
-extern pipi_image_t *pipi_box_blur_ext(pipi_image_t *, int, int);
-extern pipi_image_t *pipi_brightness(pipi_image_t *, double);
-extern pipi_image_t *pipi_contrast(pipi_image_t *, double);
-extern pipi_image_t *pipi_autocontrast(pipi_image_t *);
-extern pipi_image_t *pipi_invert(pipi_image_t *);
-extern pipi_image_t *pipi_threshold(pipi_image_t *, double);
-extern pipi_image_t *pipi_hflip(pipi_image_t *);
-extern pipi_image_t *pipi_vflip(pipi_image_t *);
-extern pipi_image_t *pipi_rotate90(pipi_image_t *);
-extern pipi_image_t *pipi_rotate180(pipi_image_t *);
-extern pipi_image_t *pipi_rotate270(pipi_image_t *);
-extern pipi_image_t *pipi_median(pipi_image_t *, int);
-extern pipi_image_t *pipi_median_ext(pipi_image_t *, int, int);
-extern pipi_image_t *pipi_dilate(pipi_image_t *);
-extern pipi_image_t *pipi_erode(pipi_image_t *);
-
-extern pipi_image_t *pipi_order(pipi_image_t *);
-
-extern pipi_image_t *pipi_tile(pipi_image_t *, int, int);
-extern int pipi_flood_fill(pipi_image_t *,
+__extern pipi_image_t *pipi_box_blur(pipi_image_t *, int);
+__extern pipi_image_t *pipi_box_blur_ext(pipi_image_t *, int, int);
+__extern pipi_image_t *pipi_brightness(pipi_image_t *, double);
+__extern pipi_image_t *pipi_contrast(pipi_image_t *, double);
+__extern pipi_image_t *pipi_autocontrast(pipi_image_t *);
+__extern pipi_image_t *pipi_invert(pipi_image_t *);
+__extern pipi_image_t *pipi_threshold(pipi_image_t *, double);
+__extern pipi_image_t *pipi_hflip(pipi_image_t *);
+__extern pipi_image_t *pipi_vflip(pipi_image_t *);
+__extern pipi_image_t *pipi_rotate90(pipi_image_t *);
+__extern pipi_image_t *pipi_rotate180(pipi_image_t *);
+__extern pipi_image_t *pipi_rotate270(pipi_image_t *);
+__extern pipi_image_t *pipi_median(pipi_image_t *, int);
+__extern pipi_image_t *pipi_median_ext(pipi_image_t *, int, int);
+__extern pipi_image_t *pipi_dilate(pipi_image_t *);
+__extern pipi_image_t *pipi_erode(pipi_image_t *);
+
+__extern pipi_image_t *pipi_order(pipi_image_t *);
+
+__extern pipi_image_t *pipi_tile(pipi_image_t *, int, int);
+__extern int pipi_flood_fill(pipi_image_t *,
                            int, int, float, float, float, float);
-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[],
+__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);
-extern int pipi_draw_bezier4(pipi_image_t *,int, int, int, int, int, int, int, int, uint32_t, int, int);
-extern pipi_image_t *pipi_reduce(pipi_image_t *, int, double const *);
-
-extern pipi_image_t *pipi_dither_ediff(pipi_image_t *, pipi_image_t *,
+__extern int pipi_draw_bezier4(pipi_image_t *,int, int, int, int, int, int, int, int, uint32_t, int, int);
+__extern pipi_image_t *pipi_reduce(pipi_image_t *, int, double const *);
+
+__extern pipi_image_t *pipi_dither_ediff(pipi_image_t *, pipi_image_t *,
                                        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 *,
+__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, double);
-extern pipi_image_t *pipi_dither_halftone(pipi_image_t *, double, double);
-extern pipi_image_t *pipi_dither_random(pipi_image_t *);
-extern pipi_image_t *pipi_dither_ostromoukhov(pipi_image_t *, pipi_scan_t);
-extern pipi_image_t *pipi_dither_dbs(pipi_image_t *);
-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);
-
+__extern pipi_image_t *pipi_dither_halftone(pipi_image_t *, double, double);
+__extern pipi_image_t *pipi_dither_random(pipi_image_t *);
+__extern pipi_image_t *pipi_dither_ostromoukhov(pipi_image_t *, pipi_scan_t);
+__extern pipi_image_t *pipi_dither_dbs(pipi_image_t *);
+__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

@@ -19 +19 @@
 #ifndef __PIPI_INTERNALS_H__
 #define __PIPI_INTERNALS_H__
+
+#include "pipi_stubs.h"
 
 #define SET_FLAG_GRAY 0x00000001

libpipi/trunk/pipi/pixels.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/quantize/reduce.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/render/noise.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/render/screen.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/pipi/resize.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdlib.h>

libpipi/trunk/pipi/stock.c

@@ -18 +18 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/src/pipi.c

@@ -1 +1 @@
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/test/u8tof32tou8.c

@@ -19 +19 @@
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>

libpipi/trunk/win32/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-EXTRA_DIST = config.h
+EXTRA_DIST = config.h pipi_types.h
 

@@ -5 +5 @@
 *.a
 pipi.pc
+pipi_types.h