From koffice-devel Sat Jan 27 13:05:39 2007 From: Bart Coppens Date: Sat, 27 Jan 2007 13:05:39 +0000 To: koffice-devel Subject: koffice/krita/ui Message-Id: <1169903139.498314.12188.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=koffice-devel&m=116990316725229 SVN commit 627624 by coppens: The assembler code not only uses mmx, but also x86 asm, which doesn't translate directly to amd64 apparently. Seems to fix it on my machine, don't know if there's a better way to fix it. (Sucky, of course, that this code is not available on amd64.) CCMAIL:koffice-devel@kde.org M +2 -0 asm_scale.S M +4 -0 scale.cpp --- trunk/koffice/krita/ui/asm_scale.S #627623:627624 @@ -1,4 +1,5 @@ #include +#if defined(__i386__) #ifdef HAVE_X86_MMX #ifdef __EMX__ @@ -807,5 +808,6 @@ SIZE(mimageScale_mmx_AARGBA) #endif +#endif .section .note.GNU-stack,"",%progbits --- trunk/koffice/krita/ui/scale.cpp #627623:627624 @@ -118,6 +118,7 @@ QImage smoothScale(const QImage& img, int dw, int dh); } +#if defined(QT_ARCH_I386) #ifdef HAVE_X86_MMX extern "C" { void __mimageScale_mmx_AARGBA(MImageScale::MImageScaleInfo *isi, @@ -126,6 +127,7 @@ int dow, int sow); } #endif +#endif using namespace MImageScale; @@ -147,6 +149,7 @@ QImage buffer( dw, dh, QImage::Format_ARGB32 ); +#if defined(QT_ARCH_I386) #ifdef HAVE_X86_MMX //#warning Using MMX Smoothscale bool haveMMX = KCPUInfo::haveExtension( KCPUInfo::IntelMMX ); @@ -156,6 +159,7 @@ } else #endif +#endif { mimageScaleAARGBA(scaleinfo, (unsigned int *)buffer.scanLine(0), 0, 0, 0, 0, dw, dh, dw, sow); _______________________________________________ koffice-devel mailing list koffice-devel@kde.org https://mail.kde.org/mailman/listinfo/koffice-devel