summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-21 13:30:39 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-21 13:30:39 +0300
commit1fcc02e803d83ae8415ff44f9696cb215f475daa (patch)
tree3c4ccb5160624db095a139cb5a81a982e156d81c /src/resources
parent126fa885664da8a8de86f3a38c04469f7006e447 (diff)
downloadmanaverse-1fcc02e803d83ae8415ff44f9696cb215f475daa.tar.gz
manaverse-1fcc02e803d83ae8415ff44f9696cb215f475daa.tar.bz2
manaverse-1fcc02e803d83ae8415ff44f9696cb215f475daa.tar.xz
manaverse-1fcc02e803d83ae8415ff44f9696cb215f475daa.zip
fix signed shifts.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/dye.cpp2
-rw-r--r--src/resources/dye.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index a1d925a1f..4f9e8a738 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -88,7 +88,7 @@ DyePalette::DyePalette(const std::string &description,
logger->log("Error, invalid embedded palette: %s", description.c_str());
}
-int DyePalette::hexDecode(const signed char c)
+unsigned int DyePalette::hexDecode(const signed char c)
{
if ('0' <= c && c <= '9')
return c - '0';
diff --git a/src/resources/dye.h b/src/resources/dye.h
index a68839e47..b6003624b 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -82,7 +82,7 @@ class DyePalette final
void replaceAOGLColor(uint32_t *restrict pixels,
const int bufSize) const;
- static int hexDecode(const signed char c) A_WARN_UNUSED;
+ static unsigned int hexDecode(const signed char c) A_WARN_UNUSED;
private:
std::vector<DyeColor> mColors;