Browse Source

Windows build fixes (working around std::u32string bugs).

pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
361fc7b877
  1. 7
      src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp
  2. 4
      src/Plugins/MagnumFontConverter/MagnumFontConverter.h

7
src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp

@ -43,7 +43,12 @@ auto MagnumFontConverter::doFeatures() const -> Features {
return Feature::ExportFont|Feature::ConvertData|Feature::MultiFile;
}
std::vector<std::pair<std::string, Containers::Array<unsigned char>>> MagnumFontConverter::doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::u32string& characters) const {
#ifndef _WIN32
std::vector<std::pair<std::string, Containers::Array<unsigned char>>> MagnumFontConverter::doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::u32string& characters) const
#else
std::vector<std::pair<std::string, Containers::Array<unsigned char>>> MagnumFontConverter::doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::vector<char32_t>& characters) const
#endif
{
Utility::Configuration configuration;
configuration.setValue("version", 1);

4
src/Plugins/MagnumFontConverter/MagnumFontConverter.h

@ -48,7 +48,11 @@ class MagnumFontConverter: public Text::AbstractFontConverter {
private:
Features doFeatures() const override;
#ifndef _WIN32
std::vector<std::pair<std::string, Containers::Array<unsigned char>>> doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::u32string& characters) const override;
#else
std::vector<std::pair<std::string, Containers::Array<unsigned char>>> doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::vector<char32_t>& characters) const override;
#endif
};
}}

Loading…
Cancel
Save