diff options
-rw-r--r-- | kyra/codecs.cpp | 7 | ||||
-rw-r--r-- | kyra/codecs.h | 6 | ||||
-rw-r--r-- | sound/mixer.h | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp index 210da4f570..a223f8310b 100644 --- a/kyra/codecs.cpp +++ b/kyra/codecs.cpp @@ -33,12 +33,13 @@ * Modified for ScummVM by Johannes Schickel ****************************************************************************/ +namespace Kyra { + /** decompress format 80 compressed data. - * @param compressed data. - * @param pointer to output uncompressed data. + * @param image_in compressed data. + * @param image_out pointer to output uncompressed data. * @returns size of uncompressed data. */ -namespace Kyra { int Compression::decode80(const uint8* image_in, uint8* image_out) { /* 0 copy 0cccpppp p diff --git a/kyra/codecs.h b/kyra/codecs.h index 58447d1a10..a7b9f11338 100644 --- a/kyra/codecs.h +++ b/kyra/codecs.h @@ -19,9 +19,9 @@ * */ -/** Various decompression routines */ -#ifndef __COMPRESSION_H -#define __COMPRESSION_H +/* Various decompression routines */ +#ifndef CODECS_H +#define CODECS_H // THIS CODE WAS TAKEN FROM FreeKyra Tools Module diff --git a/sound/mixer.h b/sound/mixer.h index 523e47fb6f..ae5055616b 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -100,8 +100,8 @@ public: * samples (i.e. len * 4 bytes). The endianness of these samples shall be * the native endianness. * - * @obsolete Instead of this, use the other setupPremix method which - * takes an AudioStream. + * @deprecated Instead of this, use the other setupPremix method which + * takes an AudioStream. */ void setupPremix(PremixProc *proc, void *param); |