diff --git a/include/SFML/Graphics/Font.hpp b/include/SFML/Graphics/Font.hpp index 8bbfcb142..a8eb9c591 100644 --- a/include/SFML/Graphics/Font.hpp +++ b/include/SFML/Graphics/Font.hpp @@ -51,14 +51,14 @@ class SFML_GRAPHICS_API Font { public : - //////////////////////////////////////////////////////////// - /// \brief Holds various information about a font - /// - //////////////////////////////////////////////////////////// - struct Info - { - std::string family; ///< The font family - }; + //////////////////////////////////////////////////////////// + /// \brief Holds various information about a font + /// + //////////////////////////////////////////////////////////// + struct Info + { + std::string family; ///< The font family + }; public : @@ -147,7 +147,7 @@ public : /// \return A structure that holds the font information /// //////////////////////////////////////////////////////////// - const Info& getInfo() const; + const Info& getInfo() const; //////////////////////////////////////////////////////////// /// \brief Retrieve a glyph of the font @@ -302,8 +302,8 @@ private : void* m_face; ///< Pointer to the internal font face (it is typeless to avoid exposing implementation details) void* m_streamRec; ///< Pointer to the stream rec instance (it is typeless to avoid exposing implementation details) int* m_refCount; ///< Reference counter used by implicit sharing - Info m_info; ///< Information about the font - mutable PageTable m_pages; ///< Table containing the glyphs pages by character size + Info m_info; ///< Information about the font + mutable PageTable m_pages; ///< Table containing the glyphs pages by character size mutable std::vector m_pixelBuffer; ///< Pixel buffer holding a glyph's pixels before being written to the texture }; diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index 32b6b3eed..b4dd125d5 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/SFML/Graphics/Font.cpp @@ -80,7 +80,7 @@ m_library (copy.m_library), m_face (copy.m_face), m_streamRec (copy.m_streamRec), m_refCount (copy.m_refCount), -m_info (copy.m_info), +m_info (copy.m_info), m_pages (copy.m_pages), m_pixelBuffer(copy.m_pixelBuffer) { @@ -125,7 +125,7 @@ bool Font::loadFromFile(const std::string& filename) return false; } - // Select the unicode character map + // Select the unicode character map if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0) { err() << "Failed to load font \"" << filename << "\" (failed to set the Unicode character set)" << std::endl; @@ -135,8 +135,8 @@ bool Font::loadFromFile(const std::string& filename) // Store the loaded font in our ugly void* :) m_face = face; - // Store the font information - m_info.family = face->family_name ? face->family_name : std::string(); + // Store the font information + m_info.family = face->family_name ? face->family_name : std::string(); return true; } @@ -178,8 +178,8 @@ bool Font::loadFromMemory(const void* data, std::size_t sizeInBytes) // Store the loaded font in our ugly void* :) m_face = face; - // Store the font information - m_info.family = face->family_name ? face->family_name : std::string(); + // Store the font information + m_info.family = face->family_name ? face->family_name : std::string(); return true; } @@ -241,8 +241,8 @@ bool Font::loadFromStream(InputStream& stream) m_face = face; m_streamRec = rec; - // Store the font information - m_info.family = face->family_name ? face->family_name : std::string(); + // Store the font information + m_info.family = face->family_name ? face->family_name : std::string(); return true; } @@ -251,7 +251,7 @@ bool Font::loadFromStream(InputStream& stream) //////////////////////////////////////////////////////////// const Font::Info& Font::getInfo() const { - return m_info; + return m_info; }