diff options
| -rw-r--r-- | engines/sci/detection.cpp | 2 | ||||
| -rw-r--r-- | graphics/jpeg.cpp | 2 | ||||
| -rw-r--r-- | graphics/jpeg.h | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 6f25d1cdc1..d0ae45a31f 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -163,7 +163,7 @@ public: const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; }; -Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags) { +static Common::String convertSierraGameId(const Common::String &sierraId, uint32 *gameFlags) { // TODO: SCI32 IDs if (sierraId == "demo") diff --git a/graphics/jpeg.cpp b/graphics/jpeg.cpp index 0ad2cf7699..bccffd254e 100644 --- a/graphics/jpeg.cpp +++ b/graphics/jpeg.cpp @@ -31,7 +31,7 @@ namespace Graphics { // Order used to traverse the quantization tables -uint8 JPEG::_zigZagOrder[64] = { +static const uint8 _zigZagOrder[64] = { 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, diff --git a/graphics/jpeg.h b/graphics/jpeg.h index f4743a5e83..9bf314de49 100644 --- a/graphics/jpeg.h +++ b/graphics/jpeg.h @@ -75,9 +75,6 @@ private: uint8 _maxFactorV; uint8 _maxFactorH; - // Zig-Zag order - static uint8 _zigZagOrder[64]; - // Quantization tables uint16 *_quant[JPEG_MAX_QUANT_TABLES]; |