Win32 skins: reorder includes to fix warnings

[vlc] / modules / gui / skins2 / src / ft2_font.hpp

diff --git a/modules/gui/skins2/src/ft2_font.hpp b/modules/gui/skins2/src/ft2_font.hpp
index b975e643bdc12516e8bb6455a5da8739586213e6..6b7cafce046560de201d420f8bba6150969c5872 100644 (file)
--- a/modules/gui/skins2/src/ft2_font.hpp
+++ b/modules/gui/skins2/src/ft2_font.hpp
@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef FT2_FONT_HPP
@@ -39,48 +39,49 @@ class UString;
 /// Freetype2 font
 class FT2Font: public GenericFont
 {
-    public:
-        FT2Font( intf_thread_t *pIntf, const string &rName, int size );
-        virtual ~FT2Font();
+public:
+    FT2Font( intf_thread_t *pIntf, const string &rName, int size );
+    virtual ~FT2Font();
 
-        /// Initialize the object. Returns false if it failed
-        virtual bool init();
+    /// Initialize the object. Returns false if it failed
+    virtual bool init();
 
-        /// Render a string on a bitmap.
-        /// If maxWidth != -1, the text is truncated with '...'
-        virtual GenericBitmap *drawString( const UString &rString,
-            uint32_t color, int maxWidth = -1 ) const;
+    /// Render a string on a bitmap.
+    /// If maxWidth != -1, the text is truncated with '...'
+    virtual GenericBitmap *drawString( const UString &rString,
+        uint32_t color, int maxWidth = -1 ) const;
 
-        /// Get the text height
-        virtual int getSize() const { return m_height; }
+    /// Get the text height
+    virtual int getSize() const { return m_height; }
 
-    private:
-        typedef struct
-        {
-            FT_Glyph m_glyph;
-            FT_BBox m_size;
-            int m_index;
-            int m_advance;
-        } Glyph_t;
-        typedef map<uint32_t,Glyph_t> GlyphMap_t;
+private:
+    typedef struct
+    {
+        FT_Glyph m_glyph;
+        FT_BBox m_size;
+        int m_index;
+        int m_advance;
+    } Glyph_t;
+    typedef map<uint32_t,Glyph_t> GlyphMap_t;
 
-        /// File name
-        const string m_name;
-        /// Buffer to store the font
-        void *m_buffer;
-        /// Pixel size of the font
-        int m_size;
-        /// Handle to FT library
-        FT_Library m_lib;
-        /// Font face
-        FT_Face m_face;
-        /// Font metrics
-        int m_height, m_ascender, m_descender;
-        /// Glyph cache
-        mutable GlyphMap_t m_glyphCache;
+    /// File name
+    const string m_name;
+    /// Buffer to store the font
+    char *m_buffer;
+    /// Pixel size of the font
+    int m_size;
+    /// Handle to FT library
+    FT_Library m_lib;
+    /// Font face
+    FT_Face m_face;
+    /// Font metrics
+    int m_height, m_ascender, m_descender;
+    /// Glyph cache
+    mutable GlyphMap_t m_glyphCache;
 
-        /// Get the glyph corresponding to the given code
-        Glyph_t &getGlyph( uint32_t code ) const;
+    /// Get the glyph corresponding to the given code
+    Glyph_t &getGlyph( uint32_t code ) const;
+    bool error( unsigned err, const char *msg );
 };