sorry - needed to unpatch code for old scaling to work.........

SVN revision: 2512
This commit is contained in:
Carsten Haitzler 2000-04-20 22:49:12 +00:00
parent 54b76ea1f7
commit c58aa765c0
4 changed files with 250 additions and 1256 deletions

View File

@ -1132,11 +1132,6 @@ __imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst,
/* scale the imagedata for this LINESIZE lines chunk of image */
if (aa)
{
#ifdef DO_MMX_ASM /*\ TODO: runtime mmx check \*/
__imlib_Scale_mmx_AARGBA(ypoints, xpoints, buf, xapoints,
yapoints, xup, yup, dxx, dyy + y,
0, 0, dw, hh, dw, im_src->w);
#else
if (IMAGE_HAS_ALPHA(im_src))
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
yapoints, xup, yup, dxx, dyy + y,
@ -1145,7 +1140,6 @@ __imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst,
__imlib_ScaleAARGB(ypoints, xpoints, buf, xapoints,
yapoints, xup, yup, dxx, dyy + y,
0, 0, dw, hh, dw, im_src->w);
#endif
}
else
__imlib_ScaleSampleRGBA(ypoints, xpoints, buf, dxx, dyy + y,

View File

@ -216,13 +216,6 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
/* scale the imagedata for this LINESIZE lines chunk of image data */
if (antialias)
{
#ifdef DO_MMX_ASM /*\ TODO: runtime mmx check \*/
__imlib_Scale_mmx_AARGBA(ypoints, xpoints, buf, xapoints,
yapoints, xup, yup,
((sx * dw) / sw),
((sy * dh) / sh) + y,
0, 0, dw, hh, dw, im->w);
#else
if (IMAGE_HAS_ALPHA(im))
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
yapoints, xup, yup,
@ -233,7 +226,6 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
yapoints, xup, yup,
((sx * dw) / sw), ((sy * dh) / sh) + y,
0, 0, dw, hh, dw, im->w);
#endif
}
else
__imlib_ScaleSampleRGBA(ypoints, xpoints, buf,

File diff suppressed because it is too large Load Diff

View File

@ -18,8 +18,4 @@ void
__imlib_ScaleAARGB(DATA32 **ypoints, int *xpoints, DATA32 *dest,
int *xapoints, int *yapoints, char xup, char yup,
int dxx, int dyy, int dx, int dy, int dw, int dh, int dow, int sow);
void
__imlib_Scale_mmx_AARGBA(DATA32 **ypoints, int *xpoints, DATA32 *dest,
int *xapoints, int *yapoints, char xup, char yup,
int dxx, int dyy, int dx, int dy, int dw, int dh, int dow, int sow);
#endif