[cairo-commit] cairo/src cairo_font.c, 1.28, 1.29 cairo_ft_font.c,
1.27, 1.28 cairo_wideint.h, 1.1, 1.2 cairo_xlib_surface.c,
1.30, 1.31 cairoint.h, 1.76, 1.77
Carl Worth
commit at pdx.freedesktop.org
Tue Dec 21 13:14:48 PST 2004
Committed by: cworth
Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv28399/src
Modified Files:
cairo_font.c cairo_ft_font.c cairo_wideint.h
cairo_xlib_surface.c cairoint.h
Log Message:
With thanks to Kristian Høgsberg <krh at bitplanet.net>:
* src/cairoint.h:
* src/cairo_wideint.h: Tag a few private functions/data that were
missing __internal_linkage.
* src/cairo_xlib_surface.c:
* src/cairo_ft_font.c:
* src/cairo_font.c: Mark cache backends as static.
Index: cairo_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_font.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cairo_font.c 12 Nov 2004 14:12:20 -0000 1.28
+++ cairo_font.c 21 Dec 2004 21:14:46 -0000 1.29
@@ -144,7 +144,7 @@
free (cache);
}
-const struct cairo_cache_backend cairo_font_cache_backend = {
+static const struct cairo_cache_backend cairo_font_cache_backend = {
_font_cache_hash,
_font_cache_keys_equal,
_font_cache_create_entry,
@@ -152,7 +152,6 @@
_font_cache_destroy_cache
};
-
static void
_lock_global_font_cache (void)
{
@@ -475,7 +474,7 @@
free (cache);
}
-const cairo_cache_backend_t cairo_image_cache_backend = {
+static const cairo_cache_backend_t cairo_image_cache_backend = {
_cairo_glyph_cache_hash,
_cairo_glyph_cache_keys_equal,
_image_glyph_cache_create_entry,
@@ -483,7 +482,6 @@
_image_glyph_cache_destroy_cache
};
-
void
_cairo_lock_global_image_glyph_cache()
{
Index: cairo_ft_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_ft_font.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cairo_ft_font.c 12 Nov 2004 14:12:20 -0000 1.27
+++ cairo_ft_font.c 21 Dec 2004 21:14:46 -0000 1.28
@@ -246,7 +246,7 @@
free (fc);
}
-const struct cairo_cache_backend _ft_font_cache_backend = {
+static const struct cairo_cache_backend _ft_font_cache_backend = {
_ft_font_cache_hash,
_ft_font_cache_keys_equal,
_ft_font_cache_create_entry,
@@ -254,7 +254,6 @@
_ft_font_cache_destroy_cache
};
-
static ft_cache_t *_global_ft_cache = NULL;
static void
Index: cairo_wideint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_wideint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo_wideint.h 28 May 2004 19:37:15 -0000 1.1
+++ cairo_wideint.h 21 Dec 2004 21:14:46 -0000 1.2
@@ -50,8 +50,8 @@
const cairo_uint64_t I _cairo_uint64_lsl (cairo_uint64_t a, int shift);
const cairo_uint64_t I _cairo_uint64_rsl (cairo_uint64_t a, int shift);
const cairo_uint64_t I _cairo_uint64_rsa (cairo_uint64_t a, int shift);
-const int _cairo_uint64_lt (cairo_uint64_t a, cairo_uint64_t b);
-const int _cairo_uint64_eq (cairo_uint64_t a, cairo_uint64_t b);
+const int I _cairo_uint64_lt (cairo_uint64_t a, cairo_uint64_t b);
+const int I _cairo_uint64_eq (cairo_uint64_t a, cairo_uint64_t b);
const cairo_uint64_t I _cairo_uint64_negate (cairo_uint64_t a);
#define _cairo_uint64_negative(a) (((int32_t) ((a).hi)) < 0)
const cairo_uint64_t I _cairo_uint64_not (cairo_uint64_t a);
@@ -59,13 +59,13 @@
#define _cairo_uint64_to_int64(i) (i)
#define _cairo_int64_to_uint64(i) (i)
-const cairo_int64_t I _cairo_int32_to_int64(int32_t i);
+const cairo_int64_t I _cairo_int32_to_int64(int32_t i);
#define _cairo_int64_to_int32(a) ((int32_t) _cairo_uint64_to_uint32(a))
#define _cairo_int64_add(a,b) _cairo_uint64_add (a,b)
#define _cairo_int64_sub(a,b) _cairo_uint64_sub (a,b)
#define _cairo_int64_mul(a,b) _cairo_uint64_mul (a,b)
#define _cairo_int32x32_64_mul(a,b) _cairo_uint32x32_64_mul ((uint32_t) (a), (uint32_t) (b)))
-const int _cairo_int64_lt (cairo_uint64_t a, cairo_uint64_t b);
+const int I _cairo_int64_lt (cairo_uint64_t a, cairo_uint64_t b);
#define _cairo_int64_eq(a,b) _cairo_uint64_eq (a,b)
#define _cairo_int64_lsl(a,b) _cairo_uint64_lsl (a,b)
#define _cairo_int64_rsl(a,b) _cairo_uint64_rsl (a,b)
@@ -171,8 +171,8 @@
const cairo_uint128_t I _cairo_uint128_lsl (cairo_uint128_t a, int shift);
const cairo_uint128_t I _cairo_uint128_rsl (cairo_uint128_t a, int shift);
const cairo_uint128_t I _cairo_uint128_rsa (cairo_uint128_t a, int shift);
-const int _cairo_uint128_lt (cairo_uint128_t a, cairo_uint128_t b);
-const int _cairo_uint128_eq (cairo_uint128_t a, cairo_uint128_t b);
+const int I _cairo_uint128_lt (cairo_uint128_t a, cairo_uint128_t b);
+const int I _cairo_uint128_eq (cairo_uint128_t a, cairo_uint128_t b);
const cairo_uint128_t I _cairo_uint128_negate (cairo_uint128_t a);
#define _cairo_uint128_negative(a) (_cairo_uint64_negative(a.hi))
const cairo_uint128_t I _cairo_uint128_not (cairo_uint128_t a);
@@ -180,8 +180,8 @@
#define _cairo_uint128_to_int128_(i) (i)
#define _cairo_int128_to_uint128(i) (i)
-const cairo_int128_t I _cairo_int32_to_int128 (int32_t i);
-const cairo_int128_t I _cairo_int64_to_int128 (cairo_int64_t i);
+const cairo_int128_t I _cairo_int32_to_int128 (int32_t i);
+const cairo_int128_t I _cairo_int64_to_int128 (cairo_int64_t i);
#define _cairo_int128_to_int64(a) ((cairo_int64_t) (a).lo);
#define _cairo_int128_to_int32(a) _cairo_int64_to_int32(_cairo_int128_to_int64(a))
#define _cairo_int128_add(a,b) _cairo_uint128_add(a,b)
@@ -191,7 +191,7 @@
#define _cairo_int128_lsl(a,b) _cairo_uint128_lsl(a,b)
#define _cairo_int128_rsl(a,b) _cairo_uint128_rsl(a,b)
#define _cairo_int128_rsa(a,b) _cairo_uint128_rsa(a,b)
-const int _cairo_int128_lt (cairo_int128_t a, cairo_int128_t b);
+const int I _cairo_int128_lt (cairo_int128_t a, cairo_int128_t b);
#define _cairo_int128_eq(a,b) _cairo_uint128_eq (a,b)
#define _cairo_int128_negate(a) _cairo_uint128_negate(a)
#define _cairo_int128_negative(a) (_cairo_uint128_negative(a))
Index: cairo_xlib_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_xlib_surface.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- cairo_xlib_surface.c 20 Dec 2004 20:22:51 -0000 1.30
+++ cairo_xlib_surface.c 21 Dec 2004 21:14:46 -0000 1.31
@@ -944,7 +944,7 @@
free (v);
}
-const cairo_cache_backend_t _xlib_glyphset_cache_backend = {
+static const cairo_cache_backend_t _xlib_glyphset_cache_backend = {
_cairo_glyph_cache_hash,
_cairo_glyph_cache_keys_equal,
_xlib_glyphset_cache_create_entry,
Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- cairoint.h 20 Dec 2004 17:53:06 -0000 1.76
+++ cairoint.h 21 Dec 2004 21:14:46 -0000 1.77
@@ -467,8 +467,7 @@
} cairo_font_backend_t;
/* concrete font backends */
-extern const struct cairo_font_backend cairo_ft_font_backend;
-
+extern const __internal_linkage struct cairo_font_backend cairo_ft_font_backend;
typedef struct cairo_surface_backend {
cairo_surface_t *
@@ -790,13 +789,13 @@
extern cairo_fixed_t __internal_linkage
_cairo_fixed_from_int (int i);
-extern cairo_fixed_t
+extern cairo_fixed_t __internal_linkage
_cairo_fixed_from_double (double d);
-cairo_fixed_t
+cairo_fixed_t __internal_linkage
_cairo_fixed_from_26_6 (uint32_t i);
-extern double
+extern double __internal_linkage
_cairo_fixed_to_double (cairo_fixed_t f);
extern int __internal_linkage
@@ -1197,7 +1196,7 @@
cairo_path_t *path);
/* cairo_hull.c */
-extern cairo_status_t
+extern cairo_status_t __internal_linkage
_cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices);
/* cairo_path.c */
More information about the cairo-commit
mailing list