diff options
author | Paweł Kołodziejski | 2007-06-24 07:02:55 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2007-06-24 07:02:55 +0000 |
commit | c88567aa79eb5a88b54f1c47d36b65b0a3ddae2b (patch) | |
tree | f9840981485f12be65dda1a1fef3a6bfaa96844b /engines/scumm/smush/codec47.cpp | |
parent | caa69a55fc3b449b02c4b1ecd03d52f9257d7c75 (diff) | |
download | scummvm-rg350-c88567aa79eb5a88b54f1c47d36b65b0a3ddae2b.tar.gz scummvm-rg350-c88567aa79eb5a88b54f1c47d36b65b0a3ddae2b.tar.bz2 scummvm-rg350-c88567aa79eb5a88b54f1c47d36b65b0a3ddae2b.zip |
added arm assembly from patch #1742112 for codec47. (and really build arm code this time)
svn-id: r27685
Diffstat (limited to 'engines/scumm/smush/codec47.cpp')
-rw-r--r-- | engines/scumm/smush/codec47.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp index 34d61d1c8a..6904e96c11 100644 --- a/engines/scumm/smush/codec47.cpp +++ b/engines/scumm/smush/codec47.cpp @@ -342,6 +342,24 @@ void Codec47Decoder::makeTables47(int width) { } while (c < 32768); } +#ifdef USE_ARM_SMUSH_ASM + +extern "C" void ARM_Smush_decode2( byte *dst, + const byte *src, + int width, + int height, + const byte *param_ptr, + int16 *_table, + byte *_tableBig, + int32 offset1, + int32 offset2, + byte *_tableSmall); + +#define decode2(SRC,DST,WIDTH,HEIGHT,PARAM) \ + ARM_Smush_decode2(SRC,DST,WIDTH,HEIGHT,PARAM,_table,_tableBig, \ + _offset1,_offset2,_tableSmall) + +#else void Codec47Decoder::level3(byte *d_dst) { int32 tmp; byte code = *_d_src++; @@ -503,6 +521,7 @@ void Codec47Decoder::decode2(byte *dst, const byte *src, int width, int height, dst += next_line; } while (--bh); } +#endif Codec47Decoder::Codec47Decoder(int width, int height) { _width = width; |