fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 06:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Allow static builds of cairo-sphinx"

Browse source 
This reverts commit dfc15dd2e5.

The code in fdr.c is supposed to interpose function calls into cairo.
I.e., instead of calling cairo_create(), the application would call into
fdr.c, this call would be recorded, and then the call is forwarded to
the real cairo_create().

The commit that is being reverted here just completely broke this by
renaming the functions. Thus, no more interposition would happen.
This commit is contained in:
Uli Schlachter 2023-09-03 17:25:00 +02:00
parent 7a06f65d9b
commit e453962981
1 changed files with 21 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
util/cairo-sphinx/fdr.c
View file

@ -31,16 +31,16 @@
static void *_dlhandle = RTLD_NEXT;
#define DLCALL(name, args...) ({ \
static typeof (&name) fdr_##name##_real; \
if (fdr_##name##_real == NULL) { \
fdr_##name##_real = dlsym (_dlhandle, #name); \
if (fdr_##name##_real == NULL && _dlhandle == RTLD_NEXT) { \
static typeof (&name) name##_real; \
if (name##_real == NULL) { \
name##_real = dlsym (_dlhandle, #name); \
if (name##_real == NULL && _dlhandle == RTLD_NEXT) { \
_dlhandle = dlopen ("libcairo.so", RTLD_LAZY); \
fdr_##name##_real = dlsym (_dlhandle, #name); \
assert (fdr_##name##_real != NULL); \
name##_real = dlsym (_dlhandle, #name); \
assert (name##_real != NULL); \
} \
} \
(* fdr_##name##_real) (args); \
(*name##_real) (args); \
})
static cairo_device_t *fdr_context;
@ -109,13 +109,8 @@ fdr_write (void *closure, const unsigned char *data, unsigned int len)
return CAIRO_STATUS_SUCCESS;
}
#define cairo_create(s) fdr_cairo_create(s)
cairo_t *
fdr_cairo_create (cairo_surface_t *surface);
cairo_t *
fdr_cairo_create (cairo_surface_t *surface)
cairo_create (cairo_surface_t *surface)
{
cairo_surface_t *tee;
@ -155,13 +150,8 @@ fdr_remove_tee (cairo_surface_t *surface)
fdr_surface_destroy (surface);
}
#define cairo_destroy(cr) fdr_cairo_destroy(cr)
void
fdr_cairo_destroy (cairo_t *cr);
void
fdr_cairo_destroy (cairo_t *cr)
cairo_destroy (cairo_t *cr)
{
cairo_surface_t *tee;
@ -172,13 +162,8 @@ fdr_cairo_destroy (cairo_t *cr)
fdr_remove_tee (fdr_tee_surface_index (tee, 0));
}
#define cairo_pattern_destroy(p) fdr_cairo_pattern_destroy(p)
void
fdr_cairo_pattern_destroy (cairo_pattern_t *pattern);
void
fdr_cairo_pattern_destroy (cairo_pattern_t *pattern)
cairo_pattern_destroy (cairo_pattern_t *pattern)
{
if (DLCALL (cairo_pattern_get_type, pattern) == CAIRO_PATTERN_TYPE_SURFACE) {
cairo_surface_t *surface;
@ -194,13 +179,8 @@ fdr_cairo_pattern_destroy (cairo_pattern_t *pattern)
DLCALL (cairo_pattern_destroy, pattern);
}
#define cairo_get_target(cr) fdr_cairo_get_target(cr)
cairo_surface_t *
fdr_cairo_get_target (cairo_t *cr);
cairo_surface_t *
fdr_cairo_get_target (cairo_t *cr)
cairo_get_target (cairo_t *cr)
{
cairo_surface_t *tee;
@ -208,13 +188,8 @@ fdr_cairo_get_target (cairo_t *cr)
return fdr_tee_surface_index (tee, 0);
}
#define cairo_get_group_target(cr) fdr_cairo_get_group_target(cr)
cairo_surface_t *
fdr_cairo_get_group_target (cairo_t *cr);
cairo_surface_t *
fdr_cairo_get_group_target (cairo_t *cr)
cairo_get_group_target (cairo_t *cr)
{
cairo_surface_t *tee;
@ -222,13 +197,8 @@ fdr_cairo_get_group_target (cairo_t *cr)
return fdr_tee_surface_index (tee, 0);
}
#define cairo_pattern_create_for_surface(s) fdr_cairo_pattern_create_for_surface(s)
cairo_pattern_t *
fdr_cairo_pattern_create_for_surface (cairo_surface_t *surface);
cairo_pattern_t *
fdr_cairo_pattern_create_for_surface (cairo_surface_t *surface)
cairo_pattern_create_for_surface (cairo_surface_t *surface)
{
cairo_surface_t *tee;
@ -239,15 +209,9 @@ fdr_cairo_pattern_create_for_surface (cairo_surface_t *surface)
return DLCALL (cairo_pattern_create_for_surface, surface);
}
#define cairo_pattern_get_surface(p,s) fdr_cairo_pattern_get_surface(p,s)
cairo_status_t
fdr_cairo_pattern_get_surface (cairo_pattern_t *pattern,
cairo_surface_t **surface);
cairo_status_t
fdr_cairo_pattern_get_surface (cairo_pattern_t *pattern,
cairo_surface_t **surface)
cairo_pattern_get_surface (cairo_pattern_t *pattern,
cairo_surface_t **surface)
{
cairo_status_t status;
cairo_surface_t *tee;
@ -263,17 +227,10 @@ fdr_cairo_pattern_get_surface (cairo_pattern_t *pattern,
return CAIRO_STATUS_SUCCESS;
}
#define cairo_set_source_surface(cr,s,x,y) fdr_cairo_set_source_surface(cr,s,x,y)
void
fdr_cairo_set_source_surface (cairo_t *cr,
cairo_surface_t *surface,
double x, double y);
void
fdr_cairo_set_source_surface (cairo_t *cr,
cairo_surface_t *surface,
double x, double y)
cairo_set_source_surface (cairo_t *cr,
cairo_surface_t *surface,
double x, double y)
{
cairo_surface_t *tee;
@ -284,17 +241,10 @@ fdr_cairo_set_source_surface (cairo_t *cr,
DLCALL (cairo_set_source_surface, cr, surface, x, y);
}
#define cairo_surface_create_similar(s,c,w,h) fdr_cairo_surface_create_similar(s,c,w,h)
cairo_surface_t *
fdr_cairo_surface_create_similar (cairo_surface_t *surface,
cairo_content_t content,
int width, int height);
cairo_surface_t *
fdr_cairo_surface_create_similar (cairo_surface_t *surface,
cairo_content_t content,
int width, int height)
cairo_surface_create_similar (cairo_surface_t *surface,
cairo_content_t content,
int width, int height)
{
cairo_surface_t *tee;