From e7366c97c998679efa80cf61c88e64a11a3d3c33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksvg/impl/libs/art_support/art_misc.c | 54 +++++++++++----------- ksvg/impl/libs/art_support/art_misc.h | 4 +- ksvg/impl/libs/art_support/art_rgba_svp.c | 26 +++++------ ksvg/impl/libs/art_support/art_rgba_svp.h | 6 +-- .../libs/xrgbrender/gdk-pixbuf-xlib-drawable.c | 8 ++-- ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h | 2 +- 6 files changed, 50 insertions(+), 50 deletions(-) (limited to 'ksvg/impl/libs') diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c index bcf9ec46..69b45306 100644 --- a/ksvg/impl/libs/art_support/art_misc.c +++ b/ksvg/impl/libs/art_support/art_misc.c @@ -464,7 +464,7 @@ struct _ksvgArtRgbAffineClipAlphaData int src_width; int src_height; int src_rowstride; - const art_u8 *tqmask; + const art_u8 *mask; int y0; }; @@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y, } static -void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -626,7 +626,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int srcAlpha = alpha * src_p[3] + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; - srcAlpha = (srcAlpha * *tqmask++) + 0x80; + srcAlpha = (srcAlpha * *mask++) + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; d = *dst_p; @@ -656,7 +656,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int else { dst_p += 3; - tqmask++; + mask++; } } } @@ -680,7 +680,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, x1 = data->x1; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -853,7 +853,7 @@ ksvg_art_rgba_affine_clip_callback (void *callback_data, int y, } static -void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -887,7 +887,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int srcAlpha = alpha * src_p[3] + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; - srcAlpha = (srcAlpha * *tqmask++) + 0x80; + srcAlpha = (srcAlpha * *mask++) + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; d = *dst_p; @@ -924,7 +924,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int else { dst_p += 4; - tqmask++; + mask++; } } } @@ -948,7 +948,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, x1 = data->x1; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1030,7 +1030,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in const art_u8 *src, int src_width, int src_height, int src_rowstride, const double affine[6], - int alpha, const art_u8 *tqmask) + int alpha, const art_u8 *mask) { ksvgArtRgbAffineClipAlphaData data; int i; @@ -1052,7 +1052,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in data.x0 = x0; data.x1 = x1; data.y0 = y0; - data.tqmask = tqmask; + data.mask = mask; art_affine_invert(data.inv, affine); @@ -1063,14 +1063,14 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in if(dst_channels == 3) { - if(tqmask) + if(mask) art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data); else art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data); } else { - if(tqmask) + if(mask) art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_callback, &data); else art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_callback, &data); @@ -1228,7 +1228,7 @@ ksvg_art_rgb_texture_callback (void *callback_data, int y, } static -void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -1277,11 +1277,11 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, /* Pattern source is in RGBA format, premultiplied. * alpha represents fill/stroke/group opacity. * - * Multiply source alpha by 'alpha' and tqmask value then composite over. - * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d). + * Multiply source alpha by 'alpha' and mask value then composite over. + * For each channel, d = d + alpha * mask * (s - srcAlpha * d). */ - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; srcAlpha = src_p[3]; @@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1545,7 +1545,7 @@ ksvg_art_rgba_texture_callback (void *callback_data, int y, } static -void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -1594,11 +1594,11 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, /* Pattern source is in RGBA format, premultiplied. * alpha represents fill/stroke/group opacity. * - * Multiply source alpha by 'alpha' and tqmask value then composite over. - * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d). + * Multiply source alpha by 'alpha' and mask value then composite over. + * For each channel, d = d + alpha * mask * (s - srcAlpha * d). */ - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; srcAlpha = src_p[3]; @@ -1636,7 +1636,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, *dst_p++ = d + tmp2; - /* dstAlpha = dstAlpha + srcAlpha * alpha * tqmask * (1 - dstAlpha) */ + /* dstAlpha = dstAlpha + srcAlpha * alpha * mask * (1 - dstAlpha) */ d = *dst_p; tmp = srcAlpha * am + 0x80; @@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1756,7 +1756,7 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1 ArtFilterLevel level, ArtAlphaGamma *alphaGamma, int alpha, - const art_u8 *tqmask) + const art_u8 *mask) { ksvgArtRgbAffineClipAlphaData data; int i; @@ -1790,10 +1790,10 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1 data.src_height = src_height; data.src_rowstride = src_rowstride; - data.tqmask = tqmask; + data.mask = mask; data.y0 = y0; - if(tqmask) + if(mask) { if(dst_channels == 3) art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data); diff --git a/ksvg/impl/libs/art_support/art_misc.h b/ksvg/impl/libs/art_support/art_misc.h index 7311d4b7..52f09a63 100644 --- a/ksvg/impl/libs/art_support/art_misc.h +++ b/ksvg/impl/libs/art_support/art_misc.h @@ -58,7 +58,7 @@ extern "C" { const art_u8 *src, int src_width, int src_height, int src_rowstride, const double affine[6], - int alpha, const art_u8 *tqmask); + int alpha, const art_u8 *mask); void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1, int y1, int dst_rowstride, int dst_channels, @@ -68,7 +68,7 @@ extern "C" { ArtFilterLevel level, ArtAlphaGamma *alphaGamma, int alpha, - const art_u8 *tqmask); + const art_u8 *mask); void ksvg_art_svp_move(ArtSVP *svp, int dx, int dy); diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c index 0c552c42..04ea81fc 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.c +++ b/ksvg/impl/libs/art_support/art_rgba_svp.c @@ -37,7 +37,7 @@ struct _ArtKSVGRgbaSVPAlphaData { art_u8 r, g, b, alpha; art_u32 rgba; art_u8 *buf; - art_u8 *tqmask; + art_u8 *mask; int rowstride; int x0, x1; int y0; @@ -124,7 +124,7 @@ art_ksvg_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, i } static void -art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) +art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) { int i; int v; @@ -136,7 +136,7 @@ art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, a for(i = 0; i < n; i++) { - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; v = *buf; @@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, b = data->b; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0); + maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0); if(n_steps > 0) { @@ -436,7 +436,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask) + art_u8 *mask) { ArtKSVGRgbaSVPAlphaData data; int r, g, b; @@ -454,7 +454,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, data.b = b; data.alpha = alpha; data.rgba = rgba; - data.tqmask = tqmask; + data.mask = mask; a = 0x8000; da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */ @@ -471,7 +471,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, data.x1 = x1; data.y0 = y0; - if(tqmask) + if(mask) art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_callback, &data); else { @@ -485,7 +485,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, /* RGB renderers */ static void -art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) +art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) { int i; int v; @@ -497,7 +497,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art for(i = 0; i < n; i++) { - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; v = *buf; @@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, b = data->b; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0); + maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0); if(n_steps > 0) { @@ -616,12 +616,12 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, * @alphagamma is NULL. **/ void -art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, +art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, int x0, int y0, int x1, int y1, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask) + art_u8 *mask) { ArtKSVGRgbaSVPAlphaData data; int r, g, b, alpha; @@ -637,7 +637,7 @@ art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, data.g = g; data.b = b; data.alpha = alpha; - data.tqmask = tqmask; + data.mask = mask; a = 0x8000; da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */ diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.h b/ksvg/impl/libs/art_support/art_rgba_svp.h index 860eabcc..b59096d4 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.h +++ b/ksvg/impl/libs/art_support/art_rgba_svp.h @@ -40,15 +40,15 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask); + art_u8 *mask); void -art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, +art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, int x0, int y0, int x1, int y1, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask); + art_u8 *mask); #ifdef __cplusplus } diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c index 522480f1..70c00262 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c @@ -1103,7 +1103,7 @@ xlib_window_is_viewable (Window w) XWindowAttributes wa; while (w != 0) { - Window tqparent, root, *tqchildren; + Window parent, root, *tqchildren; int ntqchildren; XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa); @@ -1111,16 +1111,16 @@ xlib_window_is_viewable (Window w) return 0; if (!XQueryTree (gdk_pixbuf_dpy, w, &root, - &tqparent, &tqchildren, &ntqchildren)) + &parent, &tqchildren, &ntqchildren)) return 0; if (ntqchildren > 0) XFree (tqchildren); - if (tqparent == root) + if (parent == root) return 1; - w = tqparent; + w = parent; } return 0; diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h index 7d359b61..aa94c7c6 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h @@ -61,7 +61,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, XlibRgbDither dither, int x_dither, int y_dither); -void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf, +void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf, Pixmap *pixmap_return, Pixmap *mask_return, int alpha_threshold); -- cgit v1.2.3