diff options
Diffstat (limited to 'src/blend.c')
| -rw-r--r-- | src/blend.c | 1185 |
1 files changed, 537 insertions, 648 deletions
diff --git a/src/blend.c b/src/blend.c index 4aae7ab..b1b5bff 100644 --- a/src/blend.c +++ b/src/blend.c @@ -48,7 +48,7 @@ #define LOOP_START_3 \ DATA8 aa, na; \ LOOP_START_2 - + #define LOOP_END \ } \ p1 += srcw - w; \ @@ -62,119 +62,101 @@ /* COPY OPS */ -int pow_lut_initialized = 0; -DATA8 pow_lut[256][256]; +int pow_lut_initialized = 0; +DATA8 pow_lut[256][256]; void __imlib_build_pow_lut(void) { - int i, j; - - if (pow_lut_initialized) return; + int i, j; + + if (pow_lut_initialized) + return; pow_lut_initialized = 1; for (i = 0; i < 256; i++) { - for (j = 0; j < 256; j++) + for (j = 0; j < 256; j++) /* pow_lut[i][j] = 255 * pow((double)i / 255, (double)j / 255);*/ - { - int divisor; - - divisor = (i + (j * (255 - i)) / 255); - if (divisor > 0) pow_lut[i][j] = (i * 255) / divisor; - else pow_lut[i][j] = 0; - } + { + int divisor; + + divisor = (i + (j * (255 - i)) / 255); + if (divisor > 0) + pow_lut[i][j] = (i * 255) / divisor; + else + pow_lut[i][j] = 0; + } } } static void -__imlib_BlendRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_BlendRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_VAL(p1); + LOOP_START_2 a = A_VAL(p1); BLEND_COLOR(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); BLEND_COLOR(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); BLEND_COLOR(a, B_VAL(p2), B_VAL(p1), B_VAL(p2)); - - LOOP_END_WITH_INCREMENT -} + +LOOP_END_WITH_INCREMENT} static void -__imlib_BlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_BlendRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - a = pow_lut[A_VAL(p1)][A_VAL(p2)]; - + LOOP_START_3 a = pow_lut[A_VAL(p1)][A_VAL(p2)]; + BLEND_COLOR(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); BLEND_COLOR(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); BLEND_COLOR(a, B_VAL(p2), B_VAL(p1), B_VAL(p2)); - + A_VAL(p2) = A_VAL(p2) + ((A_VAL(p1) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT - -} +LOOP_END_WITH_INCREMENT} static void -__imlib_CopyRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_CopyRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START - - *p2 = (*p2 & 0xff000000) | (*p1 & 0x00ffffff); + LOOP_START * p2 = (*p2 & 0xff000000) | (*p1 & 0x00ffffff); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_CopyRGBToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_CopyRGBToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START + LOOP_START * p2 = 0xff000000 | (*p1 & 0x00ffffff); - *p2 = 0xff000000 | (*p1 & 0x00ffffff); - - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_CopyRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_CopyRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { /* FIXME: This could be a memcpy operation. */ - LOOP_START + LOOP_START * p2 = *p1; - *p2 = *p1; - - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} /* ADD OPS */ static void -__imlib_AddBlendRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddBlendRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_VAL(p1); + LOOP_START_2 a = A_VAL(p1); ADD_COLOR_WITH_ALPHA(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, B_VAL(p2), B_VAL(p1), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddBlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddBlendRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - a = pow_lut[A_VAL(p1)][A_VAL(p2)]; + LOOP_START_3 a = pow_lut[A_VAL(p1)][A_VAL(p2)]; ADD_COLOR_WITH_ALPHA(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); @@ -182,74 +164,59 @@ __imlib_AddBlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_VAL(p1) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddCopyRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddCopyRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_1 - - ADD_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_1 ADD_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); ADD_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); ADD_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddCopyRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddCopyRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - ADD_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_3 ADD_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); ADD_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); ADD_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_VAL(p1) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddCopyRGBToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddCopyRGBToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - ADD_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_3 ADD_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); ADD_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); ADD_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); A_VAL(p2) = 0xff; - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} /* SUBTRACT OPS */ static void -__imlib_SubBlendRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubBlendRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - SATURATE_UPPER(a, A_VAL(p1) + (255 - A_VAL(p2))); + LOOP_START_2 SATURATE_UPPER(a, A_VAL(p1) + (255 - A_VAL(p2))); SUB_COLOR_WITH_ALPHA(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, B_VAL(p2), B_VAL(p1), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_VAL(p1) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubBlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubBlendRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - a = pow_lut[A_VAL(p1)][A_VAL(p2)]; + LOOP_START_3 a = pow_lut[A_VAL(p1)][A_VAL(p2)]; SUB_COLOR_WITH_ALPHA(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); @@ -257,75 +224,59 @@ __imlib_SubBlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_VAL(p1) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubCopyRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubCopyRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_1 - - SUB_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_1 SUB_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); SUB_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); SUB_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubCopyRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubCopyRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SUB_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_3 SUB_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); SUB_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); SUB_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_VAL(p1) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubCopyRGBToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubCopyRGBToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SUB_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_3 SUB_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); SUB_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); SUB_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); A_VAL(p2) = 0xff; - LOOP_END_WITH_INCREMENT -} - +LOOP_END_WITH_INCREMENT} /* RESHADE OPS */ static void -__imlib_ReBlendRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReBlendRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_VAL(p1); + LOOP_START_2 a = A_VAL(p1); RESHADE_COLOR_WITH_ALPHA(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, B_VAL(p2), B_VAL(p1), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReBlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReBlendRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - a = pow_lut[A_VAL(p1)][A_VAL(p2)]; + LOOP_START_3 a = pow_lut[A_VAL(p1)][A_VAL(p2)]; RESHADE_COLOR_WITH_ALPHA(a, R_VAL(p2), R_VAL(p1), R_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, G_VAL(p2), G_VAL(p1), G_VAL(p2)); @@ -333,91 +284,63 @@ __imlib_ReBlendRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_VAL(p1) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReCopyRGBAToRGB(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReCopyRGBAToRGB(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_1 - - RESHADE_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_1 RESHADE_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); RESHADE_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); RESHADE_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReCopyRGBAToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReCopyRGBAToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - RESHADE_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_3 RESHADE_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); RESHADE_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); RESHADE_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_VAL(p1) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReCopyRGBToRGBA(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReCopyRGBToRGBA(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - RESHADE_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); + LOOP_START_3 RESHADE_COLOR(R_VAL(p2), R_VAL(p1), R_VAL(p2)); RESHADE_COLOR(G_VAL(p2), G_VAL(p1), G_VAL(p2)); RESHADE_COLOR(B_VAL(p2), B_VAL(p1), B_VAL(p2)); A_VAL(p2) = 0xff; - LOOP_END_WITH_INCREMENT -} - - - - - - - - - - - - - - - - - +LOOP_END_WITH_INCREMENT} /* WITH COLOMOD */ /* COPY OPS */ static void -__imlib_BlendRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_BlendRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_CMOD(cm, A_VAL(p1)); + LOOP_START_2 a = A_CMOD(cm, A_VAL(p1)); BLEND_COLOR(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); BLEND_COLOR(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); BLEND_COLOR(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_BlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_BlendRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); + SATURATE_UPPER(a, + A_CMOD(cm, + A_VAL(p1)) + + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); BLEND_COLOR(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); BLEND_COLOR(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); @@ -425,102 +348,85 @@ __imlib_BlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_CMOD(cm, A_VAL(p1)) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_BlendRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_BlendRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, 0xff) + (255 - A_VAL(p2))); + LOOP_START_3 SATURATE_UPPER(a, A_CMOD(cm, 0xff) + (255 - A_VAL(p2))); BLEND_COLOR(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); BLEND_COLOR(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); BLEND_COLOR(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, 0xff) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_BlendRGBToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_BlendRGBToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - a = A_CMOD(cm, 0xff); + LOOP_START_3 a = A_CMOD(cm, 0xff); BLEND_COLOR(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); BLEND_COLOR(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); BLEND_COLOR(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_CopyRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_CopyRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START - - R_VAL(p2) = R_CMOD(cm, R_VAL(p1)); + LOOP_START R_VAL(p2) = R_CMOD(cm, R_VAL(p1)); G_VAL(p2) = G_CMOD(cm, G_VAL(p1)); B_VAL(p2) = B_CMOD(cm, B_VAL(p1)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_CopyRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_CopyRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START - - R_VAL(p2) = R_CMOD(cm, R_VAL(p1)); + LOOP_START R_VAL(p2) = R_CMOD(cm, R_VAL(p1)); G_VAL(p2) = G_CMOD(cm, G_VAL(p1)); B_VAL(p2) = B_CMOD(cm, B_VAL(p1)); A_VAL(p2) = A_CMOD(cm, 0xff); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_CopyRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_CopyRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START - - R_VAL(p2) = R_CMOD(cm, R_VAL(p1)); + LOOP_START R_VAL(p2) = R_CMOD(cm, R_VAL(p1)); G_VAL(p2) = G_CMOD(cm, G_VAL(p1)); B_VAL(p2) = B_CMOD(cm, B_VAL(p1)); A_VAL(p2) = A_CMOD(cm, A_VAL(p1)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} /* ADD OPS */ static void -__imlib_AddBlendRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddBlendRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (255 - A_VAL(p2))); + LOOP_START_2 SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (255 - A_VAL(p2))); ADD_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddBlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddBlendRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); + SATURATE_UPPER(a, + A_CMOD(cm, + A_VAL(p1)) + + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); ADD_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); @@ -528,103 +434,86 @@ __imlib_AddBlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_CMOD(cm, A_VAL(p1)) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddBlendRGBToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddBlendRGBToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - a = A_CMOD(cm, 0xff); + LOOP_START_3 a = A_CMOD(cm, 0xff); ADD_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddBlendRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddBlendRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, 0xff) + (255 - A_VAL(p2))); + LOOP_START_3 SATURATE_UPPER(a, A_CMOD(cm, 0xff) + (255 - A_VAL(p2))); ADD_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); ADD_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, A_VAL(p1)) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddCopyRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddCopyRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_1 - - ADD_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_1 ADD_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); ADD_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddCopyRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddCopyRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - ADD_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_3 ADD_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); ADD_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, A_VAL(p1)) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_AddCopyRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_AddCopyRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - ADD_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_3 ADD_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); ADD_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); ADD_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, 0xff) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} /* SUBTRACT OPS */ static void -__imlib_SubBlendRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubBlendRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_CMOD(cm, A_VAL(p1)); + LOOP_START_2 a = A_CMOD(cm, A_VAL(p1)); SUB_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubBlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubBlendRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); + SATURATE_UPPER(a, + A_CMOD(cm, + A_VAL(p1)) + + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); SUB_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); @@ -632,105 +521,87 @@ __imlib_SubBlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_CMOD(cm, A_VAL(p1)) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubBlendRGBToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubBlendRGBToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_CMOD(cm, 0xff); + LOOP_START_2 a = A_CMOD(cm, 0xff); SUB_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubBlendRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubBlendRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, 0xff) + (255 - A_VAL(p2))); + LOOP_START_3 SATURATE_UPPER(a, A_CMOD(cm, 0xff) + (255 - A_VAL(p2))); SUB_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); SUB_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, 0xff) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubCopyRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubCopyRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_1 - - SUB_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_1 SUB_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); SUB_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubCopyRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubCopyRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SUB_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_3 SUB_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); SUB_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, A_VAL(p1)) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_SubCopyRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_SubCopyRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SUB_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_3 SUB_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); SUB_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); SUB_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, 0xff) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} - +LOOP_END_WITH_INCREMENT} /* RESHADE OPS */ static void -__imlib_ReBlendRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReBlendRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_CMOD(cm, A_VAL(p1)); + LOOP_START_2 a = A_CMOD(cm, A_VAL(p1)); RESHADE_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReBlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReBlendRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); + SATURATE_UPPER(a, + A_CMOD(cm, + A_VAL(p1)) + + (((255 - A_VAL(p2)) * (A_CMOD(cm, A_VAL(p1)))) / 255)); RESHADE_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); @@ -738,83 +609,63 @@ __imlib_ReBlendRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, A_VAL(p2) = A_VAL(p2) + ((A_CMOD(cm, A_VAL(p1)) * (255 - A_VAL(p2))) / 255); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReBlendRGBToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReBlendRGBToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_2 - - a = A_CMOD(cm, 0xff); + LOOP_START_2 a = A_CMOD(cm, 0xff); RESHADE_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReBlendRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReBlendRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (255 - A_VAL(p2))); + LOOP_START_3 SATURATE_UPPER(a, A_CMOD(cm, A_VAL(p1)) + (255 - A_VAL(p2))); RESHADE_COLOR_WITH_ALPHA(a, R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); RESHADE_COLOR_WITH_ALPHA(a, B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, 0xff) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReCopyRGBAToRGBCmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReCopyRGBAToRGBCmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_1 - - RESHADE_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_1 RESHADE_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); RESHADE_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReCopyRGBAToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReCopyRGBAToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - RESHADE_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_3 RESHADE_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); RESHADE_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, A_VAL(p1)) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} +LOOP_END_WITH_INCREMENT} static void -__imlib_ReCopyRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, - int w, int h, ImlibColorModifier *cm) +__imlib_ReCopyRGBToRGBACmod(DATA32 * src, int srcw, DATA32 * dst, int dstw, + int w, int h, ImlibColorModifier * cm) { - LOOP_START_3 - - RESHADE_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); + LOOP_START_3 RESHADE_COLOR(R_VAL(p2), R_CMOD(cm, R_VAL(p1)), R_VAL(p2)); RESHADE_COLOR(G_VAL(p2), G_CMOD(cm, G_VAL(p1)), G_VAL(p2)); RESHADE_COLOR(B_VAL(p2), B_CMOD(cm, B_VAL(p1)), B_VAL(p2)); SATURATE_UPPER(A_VAL(p2), A_CMOD(cm, 0xff) + A_VAL(p2)); - LOOP_END_WITH_INCREMENT -} - - - - +LOOP_END_WITH_INCREMENT} /*\ Equivalent functions \*/ @@ -858,102 +709,135 @@ __imlib_ReCopyRGBToRGBACmod(DATA32 *src, int srcw, DATA32 *dst, int dstw, ImlibBlendFunction __imlib_GetBlendFunction(ImlibOp op, char blend, char merge_alpha, char rgb_src, - ImlibColorModifier * cm) + ImlibColorModifier * cm) { - /*\ [ mmx ][ operation ][ cmod ][ merge_alpha ][ rgb_src ][ blend ] \*/ + /*\ [ mmx ][ operation ][ cmod ][ merge_alpha ][ rgb_src ][ blend ] \ */ static ImlibBlendFunction ibfuncs[][4][2][2][2][2] = { - /*\ OP_COPY \*/ - {{{{{ __imlib_CopyRGBAToRGB, __imlib_BlendRGBAToRGB }, - { __imlib_CopyRGBToRGB, __imlib_BlendRGBToRGB } }, - {{ __imlib_CopyRGBAToRGBA, __imlib_BlendRGBAToRGBA }, - { __imlib_CopyRGBToRGBA, __imlib_BlendRGBToRGBA } } }, - - {{{ __imlib_CopyRGBAToRGBCmod, __imlib_BlendRGBAToRGBCmod }, - { __imlib_CopyRGBToRGBCmod, __imlib_BlendRGBToRGBCmod } }, - {{ __imlib_CopyRGBAToRGBACmod, __imlib_BlendRGBAToRGBACmod }, - { __imlib_CopyRGBToRGBACmod, __imlib_BlendRGBToRGBACmod } } } }, - /*\ OP_ADD \*/ - {{{{ __imlib_AddCopyRGBAToRGB, __imlib_AddBlendRGBAToRGB }, - { __imlib_AddCopyRGBToRGB, __imlib_AddBlendRGBToRGB } }, - {{ __imlib_AddCopyRGBAToRGBA, __imlib_AddBlendRGBAToRGBA }, - { __imlib_AddCopyRGBToRGBA, __imlib_AddBlendRGBToRGBA } } }, - - {{{ __imlib_AddCopyRGBAToRGBCmod, __imlib_AddBlendRGBAToRGBCmod }, - { __imlib_AddCopyRGBToRGBCmod, __imlib_AddBlendRGBToRGBCmod } }, - {{ __imlib_AddCopyRGBAToRGBACmod, __imlib_AddBlendRGBAToRGBACmod }, - { __imlib_AddCopyRGBToRGBACmod, __imlib_AddBlendRGBToRGBACmod } } } }, - /*\ OP_SUBTRACT \*/ - {{{{ __imlib_SubCopyRGBAToRGB, __imlib_SubBlendRGBAToRGB }, - { __imlib_SubCopyRGBToRGB, __imlib_SubBlendRGBToRGB } }, - {{ __imlib_SubCopyRGBAToRGBA, __imlib_SubBlendRGBAToRGBA }, - { __imlib_SubCopyRGBToRGBA, __imlib_SubBlendRGBToRGBA } } }, - - {{{ __imlib_SubCopyRGBAToRGBCmod, __imlib_SubBlendRGBAToRGBCmod }, - { __imlib_SubCopyRGBToRGBCmod, __imlib_SubBlendRGBToRGBCmod } }, - {{ __imlib_SubCopyRGBAToRGBACmod, __imlib_SubBlendRGBAToRGBACmod }, - { __imlib_SubCopyRGBToRGBACmod, __imlib_SubBlendRGBToRGBACmod } } } }, - /*\ OP_RESHADE \*/ - {{{{ __imlib_ReCopyRGBAToRGB, __imlib_ReBlendRGBAToRGB }, - { __imlib_ReCopyRGBToRGB, __imlib_ReBlendRGBToRGB } }, - {{ __imlib_ReCopyRGBAToRGBA, __imlib_ReBlendRGBAToRGBA }, - { __imlib_ReCopyRGBToRGBA, __imlib_ReBlendRGBToRGBA } } }, - - {{{ __imlib_ReCopyRGBAToRGBCmod, __imlib_ReBlendRGBAToRGBCmod }, - { __imlib_ReCopyRGBToRGBCmod, __imlib_ReBlendRGBToRGBCmod } }, - {{ __imlib_ReCopyRGBAToRGBACmod, __imlib_ReBlendRGBAToRGBACmod }, - { __imlib_ReCopyRGBToRGBACmod, __imlib_ReBlendRGBToRGBACmod } } } } }, + /*\ OP_COPY \ */ + {{{{{__imlib_CopyRGBAToRGB, __imlib_BlendRGBAToRGB}, + {__imlib_CopyRGBToRGB, __imlib_BlendRGBToRGB}}, + {{__imlib_CopyRGBAToRGBA, __imlib_BlendRGBAToRGBA}, + {__imlib_CopyRGBToRGBA, __imlib_BlendRGBToRGBA}}}, + + {{{__imlib_CopyRGBAToRGBCmod, __imlib_BlendRGBAToRGBCmod}, + {__imlib_CopyRGBToRGBCmod, __imlib_BlendRGBToRGBCmod}}, + {{__imlib_CopyRGBAToRGBACmod, __imlib_BlendRGBAToRGBACmod}, + {__imlib_CopyRGBToRGBACmod, __imlib_BlendRGBToRGBACmod}}}}, + /*\ OP_ADD \ */ + {{{{__imlib_AddCopyRGBAToRGB, __imlib_AddBlendRGBAToRGB}, + {__imlib_AddCopyRGBToRGB, __imlib_AddBlendRGBToRGB}}, + {{__imlib_AddCopyRGBAToRGBA, __imlib_AddBlendRGBAToRGBA}, + {__imlib_AddCopyRGBToRGBA, __imlib_AddBlendRGBToRGBA}}}, + + {{{__imlib_AddCopyRGBAToRGBCmod, __imlib_AddBlendRGBAToRGBCmod}, + {__imlib_AddCopyRGBToRGBCmod, __imlib_AddBlendRGBToRGBCmod}}, + {{__imlib_AddCopyRGBAToRGBACmod, __imlib_AddBlendRGBAToRGBACmod}, + {__imlib_AddCopyRGBToRGBACmod, __imlib_AddBlendRGBToRGBACmod}}}}, + /*\ OP_SUBTRACT \ */ + {{{{__imlib_SubCopyRGBAToRGB, __imlib_SubBlendRGBAToRGB}, + {__imlib_SubCopyRGBToRGB, __imlib_SubBlendRGBToRGB}}, + {{__imlib_SubCopyRGBAToRGBA, __imlib_SubBlendRGBAToRGBA}, + {__imlib_SubCopyRGBToRGBA, __imlib_SubBlendRGBToRGBA}}}, + + {{{__imlib_SubCopyRGBAToRGBCmod, __imlib_SubBlendRGBAToRGBCmod}, + {__imlib_SubCopyRGBToRGBCmod, __imlib_SubBlendRGBToRGBCmod}}, + {{__imlib_SubCopyRGBAToRGBACmod, __imlib_SubBlendRGBAToRGBACmod}, + {__imlib_SubCopyRGBToRGBACmod, __imlib_SubBlendRGBToRGBACmod}}}}, + /*\ OP_RESHADE \ */ + {{{{__imlib_ReCopyRGBAToRGB, __imlib_ReBlendRGBAToRGB}, + {__imlib_ReCopyRGBToRGB, __imlib_ReBlendRGBToRGB}}, + {{__imlib_ReCopyRGBAToRGBA, __imlib_ReBlendRGBAToRGBA}, + {__imlib_ReCopyRGBToRGBA, __imlib_ReBlendRGBToRGBA}}}, + + {{{__imlib_ReCopyRGBAToRGBCmod, __imlib_ReBlendRGBAToRGBCmod}, + {__imlib_ReCopyRGBToRGBCmod, __imlib_ReBlendRGBToRGBCmod}}, + {{__imlib_ReCopyRGBAToRGBACmod, __imlib_ReBlendRGBAToRGBACmod}, + {__imlib_ReCopyRGBToRGBACmod, __imlib_ReBlendRGBToRGBACmod}}}}}, #ifdef DO_MMX_ASM - /*\ OP_COPY \*/ - {{{{{ __imlib_mmx_copy_rgba_to_rgb, __imlib_mmx_blend_rgba_to_rgb}, - { __imlib_mmx_copy_rgb_to_rgb, __imlib_mmx_blend_rgb_to_rgb } }, - {{ __imlib_mmx_copy_rgba_to_rgba, __imlib_BlendRGBAToRGBA/*__imlib_mmx_blend_rgba_to_rgba*/ }, - { __imlib_mmx_copy_rgb_to_rgba, __imlib_mmx_blend_rgb_to_rgba } } }, - - {{{ __imlib_mmx_copy_rgba_to_rgb_cmod, __imlib_mmx_blend_rgba_to_rgb_cmod }, - { __imlib_mmx_copy_rgb_to_rgb_cmod, __imlib_mmx_blend_rgb_to_rgb_cmod } }, - {{ __imlib_mmx_copy_rgba_to_rgba_cmod, __imlib_BlendRGBAToRGBACmod/*__imlib_mmx_blend_rgba_to_rgba_cmod*/ }, - { __imlib_mmx_copy_rgb_to_rgba_cmod, __imlib_mmx_blend_rgb_to_rgba_cmod } } } }, - /*\ OP_ADD \*/ - {{{{ __imlib_mmx_add_copy_rgba_to_rgb, __imlib_mmx_add_blend_rgba_to_rgb }, - { __imlib_mmx_add_copy_rgb_to_rgb, __imlib_mmx_add_blend_rgb_to_rgb } }, - {{ __imlib_mmx_add_copy_rgba_to_rgba, __imlib_AddBlendRGBAToRGBA/*__imlib_mmx_add_blend_rgba_to_rgba*/ }, - { __imlib_mmx_add_copy_rgb_to_rgba, __imlib_mmx_add_blend_rgb_to_rgba } } }, - - {{{ __imlib_mmx_add_copy_rgba_to_rgb_cmod, __imlib_mmx_add_blend_rgba_to_rgb_cmod }, - { __imlib_mmx_add_copy_rgb_to_rgb_cmod, __imlib_mmx_add_blend_rgb_to_rgb_cmod } }, - {{ __imlib_mmx_add_copy_rgba_to_rgba_cmod, __imlib_AddBlendRGBAToRGBACmod/*__imlib_mmx_add_blend_rgba_to_rgba_cmod*/ }, - { __imlib_mmx_add_copy_rgb_to_rgba_cmod, __imlib_mmx_add_blend_rgb_to_rgba_cmod } } } }, - /*\ OP_SUBTRACT \*/ - {{{{ __imlib_mmx_subtract_copy_rgba_to_rgb, __imlib_mmx_subtract_blend_rgba_to_rgb }, - { __imlib_mmx_subtract_copy_rgb_to_rgb, __imlib_mmx_subtract_blend_rgb_to_rgb } }, - {{ __imlib_mmx_subtract_copy_rgba_to_rgba, __imlib_SubBlendRGBAToRGBA/*__imlib_mmx_subtract_blend_rgba_to_rgba*/ }, - { __imlib_mmx_subtract_copy_rgb_to_rgba, __imlib_mmx_subtract_blend_rgb_to_rgba } } }, - - {{{ __imlib_mmx_subtract_copy_rgba_to_rgb_cmod, __imlib_mmx_subtract_blend_rgba_to_rgb_cmod }, - { __imlib_mmx_subtract_copy_rgb_to_rgb_cmod, __imlib_mmx_subtract_blend_rgb_to_rgb_cmod } }, - {{ __imlib_mmx_subtract_copy_rgba_to_rgba_cmod, __imlib_SubBlendRGBAToRGBACmod/*__imlib_mmx_subtract_blend_rgba_to_rgba_cmod*/ }, - { __imlib_mmx_subtract_copy_rgb_to_rgba_cmod, __imlib_mmx_subtract_blend_rgb_to_rgba_cmod } } } }, - /*\ OP_RESHADE \*/ - {{{{ __imlib_mmx_reshade_copy_rgba_to_rgb, __imlib_mmx_reshade_blend_rgba_to_rgb }, - { __imlib_mmx_reshade_copy_rgb_to_rgb, __imlib_mmx_reshade_blend_rgb_to_rgb } }, - {{ __imlib_mmx_reshade_copy_rgba_to_rgba, __imlib_ReBlendRGBAToRGBA/*__imlib_mmx_reshade_blend_rgba_to_rgba*/ }, - { __imlib_mmx_reshade_copy_rgb_to_rgba, __imlib_mmx_reshade_blend_rgb_to_rgba } } }, - - {{{ __imlib_mmx_reshade_copy_rgba_to_rgb_cmod, __imlib_mmx_reshade_blend_rgba_to_rgb_cmod }, - { __imlib_mmx_reshade_copy_rgb_to_rgb_cmod, __imlib_mmx_reshade_blend_rgb_to_rgb_cmod } }, - {{ __imlib_mmx_reshade_copy_rgba_to_rgba_cmod, __imlib_ReBlendRGBAToRGBACmod/*__imlib_mmx_reshade_blend_rgba_to_rgba_cmod*/ }, - { __imlib_mmx_reshade_copy_rgb_to_rgba_cmod, __imlib_mmx_reshade_blend_rgb_to_rgba_cmod } } } } }, + /*\ OP_COPY \ */ + {{{{{__imlib_mmx_copy_rgba_to_rgb, __imlib_mmx_blend_rgba_to_rgb}, + {__imlib_mmx_copy_rgb_to_rgb, __imlib_mmx_blend_rgb_to_rgb}}, + {{__imlib_mmx_copy_rgba_to_rgba, + __imlib_BlendRGBAToRGBA /*__imlib_mmx_blend_rgba_to_rgba*/ }, + {__imlib_mmx_copy_rgb_to_rgba, __imlib_mmx_blend_rgb_to_rgba}}}, + + {{{__imlib_mmx_copy_rgba_to_rgb_cmod, + __imlib_mmx_blend_rgba_to_rgb_cmod}, + {__imlib_mmx_copy_rgb_to_rgb_cmod, + __imlib_mmx_blend_rgb_to_rgb_cmod}}, + {{__imlib_mmx_copy_rgba_to_rgba_cmod, + __imlib_BlendRGBAToRGBACmod /*__imlib_mmx_blend_rgba_to_rgba_cmod*/ + }, + {__imlib_mmx_copy_rgb_to_rgba_cmod, + __imlib_mmx_blend_rgb_to_rgba_cmod}}}}, + /*\ OP_ADD \ */ + {{{{__imlib_mmx_add_copy_rgba_to_rgb, __imlib_mmx_add_blend_rgba_to_rgb}, + {__imlib_mmx_add_copy_rgb_to_rgb, __imlib_mmx_add_blend_rgb_to_rgb}}, + {{__imlib_mmx_add_copy_rgba_to_rgba, + __imlib_AddBlendRGBAToRGBA /*__imlib_mmx_add_blend_rgba_to_rgba*/ }, + {__imlib_mmx_add_copy_rgb_to_rgba, + __imlib_mmx_add_blend_rgb_to_rgba}}}, + + {{{__imlib_mmx_add_copy_rgba_to_rgb_cmod, + __imlib_mmx_add_blend_rgba_to_rgb_cmod}, + {__imlib_mmx_add_copy_rgb_to_rgb_cmod, + __imlib_mmx_add_blend_rgb_to_rgb_cmod}}, + {{__imlib_mmx_add_copy_rgba_to_rgba_cmod, + __imlib_AddBlendRGBAToRGBACmod + /*__imlib_mmx_add_blend_rgba_to_rgba_cmod*/ }, + {__imlib_mmx_add_copy_rgb_to_rgba_cmod, + __imlib_mmx_add_blend_rgb_to_rgba_cmod}}}}, + /*\ OP_SUBTRACT \ */ + {{{{__imlib_mmx_subtract_copy_rgba_to_rgb, + __imlib_mmx_subtract_blend_rgba_to_rgb}, + {__imlib_mmx_subtract_copy_rgb_to_rgb, + __imlib_mmx_subtract_blend_rgb_to_rgb}}, + {{__imlib_mmx_subtract_copy_rgba_to_rgba, + __imlib_SubBlendRGBAToRGBA + /*__imlib_mmx_subtract_blend_rgba_to_rgba*/ }, + {__imlib_mmx_subtract_copy_rgb_to_rgba, + __imlib_mmx_subtract_blend_rgb_to_rgba}}}, + + {{{__imlib_mmx_subtract_copy_rgba_to_rgb_cmod, + __imlib_mmx_subtract_blend_rgba_to_rgb_cmod}, + {__imlib_mmx_subtract_copy_rgb_to_rgb_cmod, + __imlib_mmx_subtract_blend_rgb_to_rgb_cmod}}, + {{__imlib_mmx_subtract_copy_rgba_to_rgba_cmod, + __imlib_SubBlendRGBAToRGBACmod + /*__imlib_mmx_subtract_blend_rgba_to_rgba_cmod*/ }, + {__imlib_mmx_subtract_copy_rgb_to_rgba_cmod, + __imlib_mmx_subtract_blend_rgb_to_rgba_cmod}}}}, + /*\ OP_RESHADE \ */ + {{{{__imlib_mmx_reshade_copy_rgba_to_rgb, + __imlib_mmx_reshade_blend_rgba_to_rgb}, + {__imlib_mmx_reshade_copy_rgb_to_rgb, + __imlib_mmx_reshade_blend_rgb_to_rgb}}, + {{__imlib_mmx_reshade_copy_rgba_to_rgba, + __imlib_ReBlendRGBAToRGBA /*__imlib_mmx_reshade_blend_rgba_to_rgba*/ + }, + {__imlib_mmx_reshade_copy_rgb_to_rgba, + __imlib_mmx_reshade_blend_rgb_to_rgba}}}, + + {{{__imlib_mmx_reshade_copy_rgba_to_rgb_cmod, + __imlib_mmx_reshade_blend_rgba_to_rgb_cmod}, + {__imlib_mmx_reshade_copy_rgb_to_rgb_cmod, + __imlib_mmx_reshade_blend_rgb_to_rgb_cmod}}, + {{__imlib_mmx_reshade_copy_rgba_to_rgba_cmod, + __imlib_ReBlendRGBAToRGBACmod + /*__imlib_mmx_reshade_blend_rgba_to_rgba_cmod*/ }, + {__imlib_mmx_reshade_copy_rgb_to_rgba_cmod, + __imlib_mmx_reshade_blend_rgb_to_rgba_cmod}}}}}, #endif }; - int opi = (op == OP_COPY) ? 0 - : (op == OP_ADD) ? 1 - : (op == OP_SUBTRACT) ? 2 - : (op == OP_RESHADE) ? 3 : -1; - int do_mmx = 0; + int opi = (op == OP_COPY) ? 0 + : (op == OP_ADD) ? 1 + : (op == OP_SUBTRACT) ? 2 : (op == OP_RESHADE) ? 3 : -1; + int do_mmx = 0; - if (opi == -1) return NULL; + if (opi == -1) + return NULL; #ifdef DO_MMX_ASM do_mmx = !!(__imlib_get_cpuid() & CPUID_MMX); @@ -964,36 +848,36 @@ __imlib_GetBlendFunction(ImlibOp op, char blend, char merge_alpha, char rgb_src, } void -__imlib_BlendRGBAToData(DATA32 *src, int src_w, int src_h, DATA32 *dst, - int dst_w, int dst_h, int sx, int sy, int dx, int dy, - int w, int h, char blend, char merge_alpha, - ImlibColorModifier *cm, ImlibOp op, char rgb_src) +__imlib_BlendRGBAToData(DATA32 * src, int src_w, int src_h, DATA32 * dst, + int dst_w, int dst_h, int sx, int sy, int dx, int dy, + int w, int h, char blend, char merge_alpha, + ImlibColorModifier * cm, ImlibOp op, char rgb_src) { - ImlibBlendFunction blender; + ImlibBlendFunction blender; if (sx < 0) { - w += sx; - dx -= sx; - sx = 0; + w += sx; + dx -= sx; + sx = 0; } if (sy < 0) { - h += sy; - dy -= sy; - sy = 0; + h += sy; + dy -= sy; + sy = 0; } if (dx < 0) { - w += dx; - sx -= dx; - dx = 0; + w += dx; + sx -= dx; + dx = 0; } if (dy < 0) { - h += dy; - sy -= dy; - dy = 0; + h += dy; + sy -= dy; + dy = 0; } if ((w <= 0) || (h <= 0)) return; @@ -1004,29 +888,29 @@ __imlib_BlendRGBAToData(DATA32 *src, int src_w, int src_h, DATA32 *dst, if ((dx + w) > dst_w) w = dst_w - dx; if ((dy + h) > dst_h) - h = dst_h - dy; + h = dst_h - dy; if ((w <= 0) || (h <= 0)) return; __imlib_build_pow_lut(); blender = __imlib_GetBlendFunction(op, blend, merge_alpha, rgb_src, cm); if (blender) - blender(src + (sy * src_w) + sx, src_w, - dst + (dy * dst_w) + dx, dst_w, w, h, cm); + blender(src + (sy * src_w) + sx, src_w, + dst + (dy * dst_w) + dx, dst_w, w, h, cm); } #define LINESIZE 16 void -__imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst, - char aa, char blend, char merge_alpha, - int ssx, int ssy, int ssw, int ssh, - int ddx, int ddy, int ddw, int ddh, - ImlibColorModifier *cm, ImlibOp op, - int clx, int cly, int clw, int clh) +__imlib_BlendImageToImage(ImlibImage * im_src, ImlibImage * im_dst, + char aa, char blend, char merge_alpha, + int ssx, int ssy, int ssw, int ssh, + int ddx, int ddy, int ddw, int ddh, + ImlibColorModifier * cm, ImlibOp op, + int clx, int cly, int clw, int clh) { - char rgb_src = 0; - + char rgb_src = 0; + if ((!(im_src->data)) && (im_src->loader) && (im_src->loader->load)) im_src->loader->load(im_src, NULL, 0, 1); if ((!(im_dst->data)) && (im_dst->loader) && (im_src->loader->load)) @@ -1035,172 +919,177 @@ __imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst, return; if (!im_dst->data) return; - - if ((ssw == ddw) && - (ssh == ddh)) + + if ((ssw == ddw) && (ssh == ddh)) { - if (!IMAGE_HAS_ALPHA(im_dst)) - merge_alpha = 0; - if (!IMAGE_HAS_ALPHA(im_src)) - { - rgb_src = 1; - if (merge_alpha) - blend = 1; - } - if (clw) - { - int px, py; - - px = ddx; - py = ddy; - CLIP_TO(ddx, ddy, ddw, ddh, clx, cly, clw, clh); - px = ddx - px; - py = ddy - py; - ssx += px; - ssy += py; - if ((ssw < 1) || (ssh < 1)) return; - if ((ddw < 1) || (ddh < 1)) return; - } - - __imlib_BlendRGBAToData(im_src->data, im_src->w, im_src->h, - im_dst->data, im_dst->w, im_dst->h, - ssx, ssy, - ddx, ddy, - ddw, ddh, blend, merge_alpha, cm, op, rgb_src); + if (!IMAGE_HAS_ALPHA(im_dst)) + merge_alpha = 0; + if (!IMAGE_HAS_ALPHA(im_src)) + { + rgb_src = 1; + if (merge_alpha) + blend = 1; + } + if (clw) + { + int px, py; + + px = ddx; + py = ddy; + CLIP_TO(ddx, ddy, ddw, ddh, clx, cly, clw, clh); + px = ddx - px; + py = ddy - py; + ssx += px; + ssy += py; + if ((ssw < 1) || (ssh < 1)) + return; + if ((ddw < 1) || (ddh < 1)) + return; + } + + __imlib_BlendRGBAToData(im_src->data, im_src->w, im_src->h, + im_dst->data, im_dst->w, im_dst->h, + ssx, ssy, + ddx, ddy, + ddw, ddh, blend, merge_alpha, cm, op, rgb_src); } else { - ImlibScaleInfo *scaleinfo = NULL; - DATA32 *buf = NULL; - int sx, sy, sw, sh, dx, dy, dw, dh, dxx, dyy, y2, x2; - int psx, psy, psw, psh; - int y, h, hh; - int do_mmx; - sx = ssx; - sy = ssy; - sw = ssw; - sh = ssh; - dx = ddx; - dy = ddy; - dw = abs(ddw); - dh = abs(ddh); - /* don't do anything if we have a 0 width or height image to render */ - /* if the input rect size < 0 don't render either */ - if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) - return; - /* clip the source rect to be within the actual image */ - psx = sx; - psy = sy; - psw = sw; - psh = sh; - CLIP(sx, sy, sw, sh, 0, 0, im_src->w, im_src->h); - if (psx != sx) - dx += ((sx - psx) * abs(ddw)) / ssw; - if (psy != sy) - dy += ((sy - psy) * abs(ddh)) / ssh; - if (psw != sw) - dw = (dw * sw) / psw; - if (psh != sh) - dh = (dh * sh) / psh; - if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) - { - return; - } - /* clip output coords to clipped input coords */ - psx = dx; - psy = dy; - psw = dw; - psh = dh; - x2 = sx; - y2 = sy; - CLIP(dx, dy, dw, dh, 0, 0, im_dst->w, im_dst->h); - if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) return; - if (clw) - { - CLIP_TO(dx, dy, dw, dh, clx, cly, clw, clh); - if ((dw < 1) || (dh < 1)) return; - } - if (psx != dx) - sx += ((dx - psx) * ssw) / abs(ddw); - if (psy != dy) - sy += ((dy - psy) * ssh) / abs(ddh); - if (psw != dw) - sw = (sw * dw) / psw; - if (psh != dh) - sh = (sh * dh) / psh; - dxx = dx - psx; - dyy = dy - psy; - dxx += (x2 * abs(ddw)) / ssw; - dyy += (y2 * abs(ddh)) / ssh; - - if ((dw > 0) && (sw == 0)) - sw = 1; - if ((dh > 0) && (sh == 0)) - sh = 1; - /* do a second check to see if we now have invalid coords */ - /* don't do anything if we have a 0 width or height image to render */ - /* if the input rect size < 0 don't render either */ - if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) - { - return; - } - scaleinfo = __imlib_CalcScaleInfo(im_src, ssw, ssh, ddw, ddh, aa); - if (!scaleinfo) return; - /* if we are scaling the image at all make a scaling buffer */ - /* allocate a buffer to render scaled RGBA data into */ - buf = malloc(dw * LINESIZE * sizeof(DATA32)); - if (!buf) - { - __imlib_FreeScaleInfo(scaleinfo); - return; - } - /* setup h */ - h = dh; - if (!IMAGE_HAS_ALPHA(im_dst)) - merge_alpha = 0; - if (!IMAGE_HAS_ALPHA(im_src)) - { - rgb_src = 1; - if (merge_alpha) - blend = 1; - } - /* scale in LINESIZE Y chunks and convert to depth*/ + ImlibScaleInfo *scaleinfo = NULL; + DATA32 *buf = NULL; + int sx, sy, sw, sh, dx, dy, dw, dh, dxx, dyy, y2, x2; + int psx, psy, psw, psh; + int y, h, hh; + int do_mmx; + + sx = ssx; + sy = ssy; + sw = ssw; + sh = ssh; + dx = ddx; + dy = ddy; + dw = abs(ddw); + dh = abs(ddh); + /* don't do anything if we have a 0 width or height image to render */ + /* if the input rect size < 0 don't render either */ + if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) + return; + /* clip the source rect to be within the actual image */ + psx = sx; + psy = sy; + psw = sw; + psh = sh; + CLIP(sx, sy, sw, sh, 0, 0, im_src->w, im_src->h); + if (psx != sx) + dx += ((sx - psx) * abs(ddw)) / ssw; + if (psy != sy) + dy += ((sy - psy) * abs(ddh)) / ssh; + if (psw != sw) + dw = (dw * sw) / psw; + if (psh != sh) + dh = (dh * sh) / psh; + if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) + { + return; + } + /* clip output coords to clipped input coords */ + psx = dx; + psy = dy; + psw = dw; + psh = dh; + x2 = sx; + y2 = sy; + CLIP(dx, dy, dw, dh, 0, 0, im_dst->w, im_dst->h); + if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) + return; + if (clw) + { + CLIP_TO(dx, dy, dw, dh, clx, cly, clw, clh); + if ((dw < 1) || (dh < 1)) + return; + } + if (psx != dx) + sx += ((dx - psx) * ssw) / abs(ddw); + if (psy != dy) + sy += ((dy - psy) * ssh) / abs(ddh); + if (psw != dw) + sw = (sw * dw) / psw; + if (psh != dh) + sh = (sh * dh) / psh; + dxx = dx - psx; + dyy = dy - psy; + dxx += (x2 * abs(ddw)) / ssw; + dyy += (y2 * abs(ddh)) / ssh; + + if ((dw > 0) && (sw == 0)) + sw = 1; + if ((dh > 0) && (sh == 0)) + sh = 1; + /* do a second check to see if we now have invalid coords */ + /* don't do anything if we have a 0 width or height image to render */ + /* if the input rect size < 0 don't render either */ + if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) + { + return; + } + scaleinfo = __imlib_CalcScaleInfo(im_src, ssw, ssh, ddw, ddh, aa); + if (!scaleinfo) + return; + /* if we are scaling the image at all make a scaling buffer */ + /* allocate a buffer to render scaled RGBA data into */ + buf = malloc(dw * LINESIZE * sizeof(DATA32)); + if (!buf) + { + __imlib_FreeScaleInfo(scaleinfo); + return; + } + /* setup h */ + h = dh; + if (!IMAGE_HAS_ALPHA(im_dst)) + merge_alpha = 0; + if (!IMAGE_HAS_ALPHA(im_src)) + { + rgb_src = 1; + if (merge_alpha) + blend = 1; + } + /* scale in LINESIZE Y chunks and convert to depth */ #ifdef DO_MMX_ASM - do_mmx = __imlib_get_cpuid() & CPUID_MMX; + do_mmx = __imlib_get_cpuid() & CPUID_MMX; #endif - for (y = 0; y < dh; y += LINESIZE) - { - hh = LINESIZE; - if (h < LINESIZE) - hh = h; - /* scale the imagedata for this LINESIZE lines chunk of image */ - if (aa) - { + for (y = 0; y < dh; y += LINESIZE) + { + hh = LINESIZE; + if (h < LINESIZE) + hh = h; + /* scale the imagedata for this LINESIZE lines chunk of image */ + if (aa) + { #ifdef DO_MMX_ASM - if (do_mmx) - __imlib_Scale_mmx_AARGBA(scaleinfo, buf, dxx, dyy + y, - 0, 0, dw, hh, dw, im_src->w); - else + if (do_mmx) + __imlib_Scale_mmx_AARGBA(scaleinfo, buf, dxx, dyy + y, + 0, 0, dw, hh, dw, im_src->w); + else #endif - if (IMAGE_HAS_ALPHA(im_src)) - __imlib_ScaleAARGBA(scaleinfo, buf, dxx, dyy + y, - 0, 0, dw, hh, dw, im_src->w); - else - __imlib_ScaleAARGB(scaleinfo, buf, dxx, dyy + y, - 0, 0, dw, hh, dw, im_src->w); - } - else - __imlib_ScaleSampleRGBA(scaleinfo, buf, dxx, dyy + y, - 0, 0, dw, hh, dw); - __imlib_BlendRGBAToData(buf, dw, hh, - im_dst->data, im_dst->w, - im_dst->h, - 0, 0, dx, dy + y, dw, dh, - blend, merge_alpha, cm, op, rgb_src); - h -= LINESIZE; - } - /* free up our buffers and point tables */ - free(buf); - __imlib_FreeScaleInfo(scaleinfo); + if (IMAGE_HAS_ALPHA(im_src)) + __imlib_ScaleAARGBA(scaleinfo, buf, dxx, dyy + y, + 0, 0, dw, hh, dw, im_src->w); + else + __imlib_ScaleAARGB(scaleinfo, buf, dxx, dyy + y, + 0, 0, dw, hh, dw, im_src->w); + } + else + __imlib_ScaleSampleRGBA(scaleinfo, buf, dxx, dyy + y, + 0, 0, dw, hh, dw); + __imlib_BlendRGBAToData(buf, dw, hh, + im_dst->data, im_dst->w, + im_dst->h, + 0, 0, dx, dy + y, dw, dh, + blend, merge_alpha, cm, op, rgb_src); + h -= LINESIZE; + } + /* free up our buffers and point tables */ + free(buf); + __imlib_FreeScaleInfo(scaleinfo); } } |