Browse Source

Text: put branch contents on a new line.

Wow, some of that code is still using std::vector. Ew.
pull/482/merge
Vladimír Vondruš 3 weeks ago
parent
commit
02368af938
  1. 6
      src/Magnum/Text/AbstractFont.cpp
  2. 9
      src/Magnum/Text/AbstractFontConverter.cpp

6
src/Magnum/Text/AbstractFont.cpp

@ -217,7 +217,8 @@ auto AbstractFont::doOpenFile(const Containers::StringView filename, const Float
} }
void AbstractFont::close() { void AbstractFont::close() {
if(!isOpened()) return; if(!isOpened())
return;
doClose(); doClose();
CORRADE_INTERNAL_ASSERT(!isOpened()); CORRADE_INTERNAL_ASSERT(!isOpened());
@ -354,7 +355,8 @@ bool AbstractFont::fillGlyphCache(AbstractGlyphCache& cache, const Containers::S
CORRADE_INTERNAL_ASSERT(uniqueCount <= glyphs.size()); CORRADE_INTERNAL_ASSERT(uniqueCount <= glyphs.size());
std::size_t offset = 0; std::size_t offset = 0;
for(UnsignedInt i = 0; i != uniqueGlyphs.size(); ++i) for(UnsignedInt i = 0; i != uniqueGlyphs.size(); ++i)
if(uniqueGlyphs[i]) glyphs[offset++].glyph = i; if(uniqueGlyphs[i])
glyphs[offset++].glyph = i;
CORRADE_INTERNAL_ASSERT(offset == uniqueCount); CORRADE_INTERNAL_ASSERT(offset == uniqueCount);
/* Pass the unique set to the implementation */ /* Pass the unique set to the implementation */

9
src/Magnum/Text/AbstractFontConverter.cpp

@ -156,7 +156,8 @@ bool AbstractFontConverter::doExportFontToFile(AbstractFont& font, AbstractGlyph
/* Export all data */ /* Export all data */
const auto data = doExportFontToData(font, cache, filename, characters); const auto data = doExportFontToData(font, cache, filename, characters);
if(data.empty()) return false; if(data.empty())
return false;
for(const auto& d: data) if(!Utility::Path::write(d.first, d.second)) { for(const auto& d: data) if(!Utility::Path::write(d.first, d.second)) {
Error() << "Text::AbstractFontConverter::exportFontToFile(): cannot write to file" << d.first; Error() << "Text::AbstractFontConverter::exportFontToFile(): cannot write to file" << d.first;
@ -186,7 +187,8 @@ std::vector<std::pair<std::string, Containers::Array<char>>> AbstractFontConvert
std::vector<std::pair<std::string, Containers::Array<char>>> out; std::vector<std::pair<std::string, Containers::Array<char>>> out;
Containers::Array<char> result = doExportGlyphCacheToSingleData(cache); Containers::Array<char> result = doExportGlyphCacheToSingleData(cache);
if(result) out.emplace_back(filename, Utility::move(result)); if(result)
out.emplace_back(filename, Utility::move(result));
return out; return out;
} }
@ -219,7 +221,8 @@ bool AbstractFontConverter::doExportGlyphCacheToFile(AbstractGlyphCache& cache,
/* Export all data */ /* Export all data */
const auto data = doExportGlyphCacheToData(cache, filename); const auto data = doExportGlyphCacheToData(cache, filename);
if(data.empty()) return false; if(data.empty())
return false;
for(const auto& d: data) if(!Utility::Path::write(d.first, d.second)) { for(const auto& d: data) if(!Utility::Path::write(d.first, d.second)) {
Error() << "Text::AbstractFontConverter::exportGlyphCacheToFile(): cannot write to file" << d.first; Error() << "Text::AbstractFontConverter::exportGlyphCacheToFile(): cannot write to file" << d.first;

Loading…
Cancel
Save