From 3d1714cd1f8ae7d47ad5f01a1140133ae71a00e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 20 Sep 2009 16:50:37 -0400 Subject: [PATCH] Hide PIXMAN_OP_NONE and PIXMAN_N_OPERATORS behind PIXMAN_INTERNAL_API. These cannot sanely be used by applications since they may change in new versions. --- configure.ac | 2 ++ pixman/Makefile.am | 1 - pixman/pixman-implementation.c | 2 +- pixman/pixman-mmx.c | 6 +++--- pixman/pixman-private.h | 8 ++++---- pixman/pixman.h | 26 ++++++++++++++------------ 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index f09006f..c548174 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,8 @@ then CFLAGS="-O -g" fi +CFLAGS="$CFLAGS -DPIXMAN_DISABLE_DEPRECATED -DPIXMAN_INTERNAL_API" + # # We ignore pixman_major in the version here because the major version should # always be encoded in the actual library name. Ie., the soname is: diff --git a/pixman/Makefile.am b/pixman/Makefile.am index 4aeb032..6020623 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am @@ -1,7 +1,6 @@ lib_LTLIBRARIES = libpixman-1.la libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined libpixman_1_la_LIBADD = @DEP_LIBS@ -lm -libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED libpixman_1_la_SOURCES = \ pixman.h \ pixman-accessor.h \ diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c index bcda9fe..6488332 100644 --- a/pixman/pixman-implementation.c +++ b/pixman/pixman-implementation.c @@ -156,7 +156,7 @@ _pixman_implementation_create (pixman_implementation_t *delegate) imp->blt = delegate_blt; imp->fill = delegate_fill; - for (i = 0; i < PIXMAN_OP_LAST; ++i) + for (i = 0; i < PIXMAN_N_OPERATORS; ++i) { imp->combine_32[i] = delegate_combine_32; imp->combine_64[i] = delegate_combine_64; diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index 7dcc1dc..3595742 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -3168,9 +3168,9 @@ mmx_composite_over_x888_8_8888 (pixman_implementation_t *imp, int32_t width, int32_t height) { - uint32_t *src, *src_line; - uint32_t *dst, *dst_line; - uint8_t *mask, *mask_line; + uint32_t *src, *src_line; + uint32_t *dst, *dst_line; + uint8_t *mask, *mask_line; int src_stride, mask_stride, dst_stride; uint16_t w; diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index ff7a65f..c5b44bc 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -437,10 +437,10 @@ struct pixman_implementation_t pixman_blt_func_t blt; pixman_fill_func_t fill; - pixman_combine_32_func_t combine_32[PIXMAN_OP_LAST]; - pixman_combine_32_func_t combine_32_ca[PIXMAN_OP_LAST]; - pixman_combine_64_func_t combine_64[PIXMAN_OP_LAST]; - pixman_combine_64_func_t combine_64_ca[PIXMAN_OP_LAST]; + pixman_combine_32_func_t combine_32[PIXMAN_N_OPERATORS]; + pixman_combine_32_func_t combine_32_ca[PIXMAN_N_OPERATORS]; + pixman_combine_64_func_t combine_64[PIXMAN_N_OPERATORS]; + pixman_combine_64_func_t combine_64_ca[PIXMAN_N_OPERATORS]; }; pixman_implementation_t * diff --git a/pixman/pixman.h b/pixman/pixman.h index 5b90a0c..35a5eb7 100644 --- a/pixman/pixman.h +++ b/pixman/pixman.h @@ -333,8 +333,10 @@ typedef enum PIXMAN_OP_HSL_COLOR = 0x3d, PIXMAN_OP_HSL_LUMINOSITY = 0x3e, - PIXMAN_OP_NONE, - PIXMAN_OP_LAST = PIXMAN_OP_NONE +#ifdef PIXMAN_INTERNAL_API + PIXMAN_N_OPERATORS, + PIXMAN_OP_NONE = PIXMAN_N_OPERATORS +#endif } pixman_op_t; /* @@ -637,11 +639,11 @@ typedef enum { /* 24bpp formats */ PIXMAN_r8g8b8 = PIXMAN_FORMAT(24,PIXMAN_TYPE_ARGB,0,8,8,8), PIXMAN_b8g8r8 = PIXMAN_FORMAT(24,PIXMAN_TYPE_ABGR,0,8,8,8), - + /* 16bpp formats */ PIXMAN_r5g6b5 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,5,6,5), PIXMAN_b5g6r5 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,0,5,6,5), - + PIXMAN_a1r5g5b5 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,1,5,5,5), PIXMAN_x1r5g5b5 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,5,5,5), PIXMAN_a1b5g5r5 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,1,5,5,5), @@ -650,35 +652,35 @@ typedef enum { PIXMAN_x4r4g4b4 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,4,4,4), PIXMAN_a4b4g4r4 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,4,4,4,4), PIXMAN_x4b4g4r4 = PIXMAN_FORMAT(16,PIXMAN_TYPE_ABGR,0,4,4,4), - + /* 8bpp formats */ PIXMAN_a8 = PIXMAN_FORMAT(8,PIXMAN_TYPE_A,8,0,0,0), PIXMAN_r3g3b2 = PIXMAN_FORMAT(8,PIXMAN_TYPE_ARGB,0,3,3,2), PIXMAN_b2g3r3 = PIXMAN_FORMAT(8,PIXMAN_TYPE_ABGR,0,3,3,2), PIXMAN_a2r2g2b2 = PIXMAN_FORMAT(8,PIXMAN_TYPE_ARGB,2,2,2,2), PIXMAN_a2b2g2r2 = PIXMAN_FORMAT(8,PIXMAN_TYPE_ABGR,2,2,2,2), - + PIXMAN_c8 = PIXMAN_FORMAT(8,PIXMAN_TYPE_COLOR,0,0,0,0), PIXMAN_g8 = PIXMAN_FORMAT(8,PIXMAN_TYPE_GRAY,0,0,0,0), - + PIXMAN_x4a4 = PIXMAN_FORMAT(8,PIXMAN_TYPE_A,4,0,0,0), - + PIXMAN_x4c4 = PIXMAN_FORMAT(8,PIXMAN_TYPE_COLOR,0,0,0,0), PIXMAN_x4g4 = PIXMAN_FORMAT(8,PIXMAN_TYPE_GRAY,0,0,0,0), - + /* 4bpp formats */ PIXMAN_a4 = PIXMAN_FORMAT(4,PIXMAN_TYPE_A,4,0,0,0), PIXMAN_r1g2b1 = PIXMAN_FORMAT(4,PIXMAN_TYPE_ARGB,0,1,2,1), PIXMAN_b1g2r1 = PIXMAN_FORMAT(4,PIXMAN_TYPE_ABGR,0,1,2,1), PIXMAN_a1r1g1b1 = PIXMAN_FORMAT(4,PIXMAN_TYPE_ARGB,1,1,1,1), PIXMAN_a1b1g1r1 = PIXMAN_FORMAT(4,PIXMAN_TYPE_ABGR,1,1,1,1), - + PIXMAN_c4 = PIXMAN_FORMAT(4,PIXMAN_TYPE_COLOR,0,0,0,0), PIXMAN_g4 = PIXMAN_FORMAT(4,PIXMAN_TYPE_GRAY,0,0,0,0), - + /* 1bpp formats */ PIXMAN_a1 = PIXMAN_FORMAT(1,PIXMAN_TYPE_A,1,0,0,0), - + PIXMAN_g1 = PIXMAN_FORMAT(1,PIXMAN_TYPE_GRAY,0,0,0,0), /* YUV formats */ -- 2.7.4