diff options
| author | Jaromir Wysoglad | 2019-08-14 21:48:50 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-08-24 18:12:45 +0300 |
| commit | 96270d4bf23aa77bcda5ec98b808dcd26931e0b1 (patch) | |
| tree | ac4bd0a6ed844309b4a3838c461d22068de3802c | |
| parent | 4edf35e414aa43fcce8c5a25aff6b1f1ce92244f (diff) | |
| download | scummvm-rg350-96270d4bf23aa77bcda5ec98b808dcd26931e0b1.tar.gz scummvm-rg350-96270d4bf23aa77bcda5ec98b808dcd26931e0b1.tar.bz2 scummvm-rg350-96270d4bf23aa77bcda5ec98b808dcd26931e0b1.zip | |
JANITORIAL: Remove debuging code.
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 2 | ||||
| -rw-r--r-- | common/encoding.cpp | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 0139bac29d..800df58ed3 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -770,7 +770,6 @@ int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key) { char *OSystem_SDL::convertEncoding(const char *to, const char *from, const char *string, size_t length) { #if SDL_VERSION_ATLEAST(2, 0, 0) - debug("Trying SDL..."); int zeroBytes = 1; if (Common::String(from).hasPrefixIgnoreCase("utf-16")) zeroBytes = 2; @@ -778,7 +777,6 @@ char *OSystem_SDL::convertEncoding(const char *to, const char *from, const char zeroBytes = 4; return SDL_iconv_string(to, from, string, length + zeroBytes); #else - debug("SDL isn't available"); return nullptr; #endif // SDL_VERSION_ATLEAST(2, 0, 0) } diff --git a/common/encoding.cpp b/common/encoding.cpp index 66d2381ac7..fa3085342a 100644 --- a/common/encoding.cpp +++ b/common/encoding.cpp @@ -21,7 +21,6 @@ */ #include "common/encoding.h" -#include "common/debug.h" #include "common/textconsole.h" #include "common/system.h" #include "common/translation.h" @@ -161,19 +160,12 @@ char *Encoding::conversion(iconv_t iconvHandle, const String &to, const String & #ifdef USE_ICONV if (iconvHandle != (iconv_t) -1) result = convertIconv(iconvHandle, string, length); - else - debug("Could not convert from %s to %s using iconv", from.c_str(), to.c_str()); - if (result == nullptr) - debug("Error while converting with iconv"); -#else - debug("Iconv is not available"); #endif // USE_ICONV if (result == nullptr) result = g_system->convertEncoding(addUtfEndianness(to).c_str(), addUtfEndianness(from).c_str(), string, length); if (result == nullptr) { - debug("Could not convert from %s to %s using backend specific conversion", from.c_str(), to.c_str()); result = convertTransManMapping(addUtfEndianness(to).c_str(), addUtfEndianness(from).c_str(), string, length); } @@ -182,7 +174,6 @@ char *Encoding::conversion(iconv_t iconvHandle, const String &to, const String & char *Encoding::convertIconv(iconv_t iconvHandle, const char *string, size_t length) { #ifdef USE_ICONV - debug("Trying iconv..."); size_t inSize = length; size_t outSize = inSize; @@ -222,7 +213,6 @@ char *Encoding::convertIconv(iconv_t iconvHandle, const char *string, size_t len memset(dst, 0, stringSize / 2); } else { error = true; - debug("iconv failed"); break; } } @@ -242,11 +232,8 @@ char *Encoding::convertIconv(iconv_t iconvHandle, const char *string, size_t len free(buffer); return nullptr; } - debug("Size: %d", stringSize); - return buffer; #else - debug("Iconv isn't available"); return nullptr; #endif //USE_ICONV } @@ -256,7 +243,6 @@ char *Encoding::convertIconv(iconv_t iconvHandle, const char *string, size_t len // TransMan encoding to UTF-32 and then it calls convert() again with that. char *Encoding::convertTransManMapping(const char *to, const char *from, const char *string, size_t length) { #ifdef USE_TRANSLATION - debug("Trying TransMan..."); String currentCharset = TransMan.getCurrentCharset(); if (currentCharset.equalsIgnoreCase(from)) { // We can use the transMan mapping directly @@ -307,7 +293,6 @@ char *Encoding::convertTransManMapping(const char *to, const char *from, const c } else return nullptr; #else - debug("TransMan isn't available"); return nullptr; #endif // USE_TRANSLATION } |