diff options
| author | Eugene Sandulenko | 2007-12-28 07:52:56 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2007-12-28 07:52:56 +0000 |
| commit | ac54f3a26f5ebe1b1f7af03ebe1b6872ebe64703 (patch) | |
| tree | f47426fee7827977824b526fd911225228840e42 /engines/scumm/smush | |
| parent | ae06d5337e80503d25c58cd9475bd8a45a87f48d (diff) | |
| download | scummvm-rg350-ac54f3a26f5ebe1b1f7af03ebe1b6872ebe64703.tar.gz scummvm-rg350-ac54f3a26f5ebe1b1f7af03ebe1b6872ebe64703.tar.bz2 scummvm-rg350-ac54f3a26f5ebe1b1f7af03ebe1b6872ebe64703.zip | |
Patch #1858158: BUILD: Plugin building cleanup
svn-id: r30041
Diffstat (limited to 'engines/scumm/smush')
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 7c66c8124d..906395c0ca 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -59,9 +59,7 @@ #include <png.h> #endif -#ifdef USE_ZLIB -#include <zlib.h> -#endif +#include "common/zlib.h" namespace Scumm { @@ -820,8 +818,8 @@ void SmushPlayer::handleZlibFrameObject(Chunk &b) { unsigned long decompressedSize = READ_BE_UINT32(chunkBuffer); byte *fobjBuffer = (byte *)malloc(decompressedSize); - int result = uncompress(fobjBuffer, &decompressedSize, chunkBuffer + 4, chunkSize - 4); - if (result != Z_OK) + int result = Common::uncompress(fobjBuffer, &decompressedSize, chunkBuffer + 4, chunkSize - 4); + if (result != Common::ZLIB_OK) error("SmushPlayer::handleZlibFrameObject() Zlib uncompress error"); free(chunkBuffer); |