mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix clang builds

This commit is contained in:
Ted John 2018-05-10 18:13:41 +01:00
parent 428dd05dcf
commit f212894eb0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/core/Imaging.cpp
View File

@ -53,7 +53,6 @@ public:
namespace Imaging
{
constexpr auto EXCEPTION_IMAGE_FORMAT_UNSUPPORTED = "Unsupported image format.";
constexpr auto EXCEPTION_IMAGE_FORMAT_UNKNOWN = "Unknown image format.";
static std::unordered_map<IMAGE_FORMAT, ImageReaderFunc> _readerImplementations;
@ -366,7 +365,7 @@ namespace Imaging
break;
}
default:
throw std::runtime_error("Unknown image format.");
throw std::runtime_error(EXCEPTION_IMAGE_FORMAT_UNKNOWN);
}
}
}

3
src/openrct2/drawing/ImageImporter.cpp
View File

@ -16,6 +16,7 @@
#include <cstring>
#include <stdexcept>
#include <string>
#include "../core/Imaging.h"
#include "ImageImporter.h"
@ -44,7 +45,7 @@ ImportResult ImageImporter::Import(
if ((flags & IMPORT_FLAGS::KEEP_PALETTE) && image.Depth != 8)
{
throw std::invalid_argument("Image is not palletted, it has bit depth of " + image.Depth);
throw std::invalid_argument("Image is not palletted, it has bit depth of " + std::to_string(image.Depth));
}
if (!(flags & IMPORT_FLAGS::RLE))