skins2: fix compiler warnings (missing ())

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

diff --git a/modules/gui/skins2/src/ft2_font.cpp b/modules/gui/skins2/src/ft2_font.cpp
index 42a6a927d52da275331a6f648d5cc9ddd1e6af3e..51a9ade572247b8f01b698d23a90e4437e42202e 100644 (file)
--- a/modules/gui/skins2/src/ft2_font.cpp
+++ b/modules/gui/skins2/src/ft2_font.cpp
@@ -22,8 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <errno.h>
 #include "ft2_font.hpp"
 #include "ft2_bitmap.hpp"
+#include "ft2_err.h"
 #include "../utils/ustring.hpp"
 
 #ifdef HAVE_FRIBIDI
@@ -40,66 +42,62 @@ FT2Font::FT2Font( intf_thread_t *pIntf, const string &rName, int size ):
 
 FT2Font::~FT2Font()
 {
-    // Clear the glyph cache
     GlyphMap_t::iterator iter;
     for( iter = m_glyphCache.begin(); iter != m_glyphCache.end(); ++iter )
-    {
         FT_Done_Glyph( (*iter).second.m_glyph );
-    }
-    if( m_face )
-    {
-        FT_Done_Face( m_face );
-    }
-    if( m_lib )
-    {
-        FT_Done_FreeType( m_lib );
-    }
-    if( m_buffer )
-    {
-        free( m_buffer );
-    }
+    if( m_face ) FT_Done_Face( m_face );
+    if( m_lib )  FT_Done_FreeType( m_lib );
+    delete[] m_buffer;
 }
 
 
 bool FT2Font::init()
 {
-    int err;
+    unsigned err;
 
-    // Initialize libfreetype
-    if( FT_Init_FreeType( &m_lib ) )
+    if( ( err = FT_Init_FreeType( &m_lib ) ) )
     {
-        msg_Err( getIntf(), "failed to initialize freetype" );
+        msg_Err( getIntf(), "failed to initialize freetype (%s)",
+                 ft2_strerror( err ) );
         return false;
     }
 
-    // Open the font
     FILE *file = fopen( m_name.c_str(), "rb" );
-    if( file )
-    {
-        msg_Dbg( getIntf(), "loading font %s", m_name.c_str() );
-    }
-    else
+    if( !file )
     {
-        msg_Dbg( getIntf(), "unable to open the font %s", m_name.c_str() );
+        msg_Dbg( getIntf(), "failed to open font %s (%s)",
+                 m_name.c_str(), strerror(errno) );
         return false;
     }
-    // Get the file size
+    msg_Dbg( getIntf(), "loading font %s", m_name.c_str() );
+
     fseek( file, 0, SEEK_END );
-    int size = ftell( file );
+    long size = ftell( file );
     rewind( file );
-    // Allocate the buffer
-    m_buffer = malloc( size );
+
+    if( -1==size )
+    {
+        msg_Dbg( getIntf(), "fseek loading font %s (%s)",
+                 m_name.c_str(), strerror(errno) );
+        fclose( file );
+        return false;
+    }
+
+    m_buffer = new (std::nothrow) char[size];
     if( !m_buffer )
     {
-        msg_Err( getIntf(), "not enough memory for the font %s",
-                 m_name.c_str() );
+        fclose( file );
+        return false;
+    }
+
+    if( fread( m_buffer, size, 1, file ) != 1 )
+    {
+        msg_Err( getIntf(), "unexpected result for read" );
+        fclose( file );
         return false;
     }
-    // Read the font data
-    fread( m_buffer, size, 1, file );
     fclose( file );
 
-    // Load the font from the buffer
     err = FT_New_Memory_Face( m_lib, (const FT_Byte*)m_buffer, size, 0,
                               &m_face );
     if ( err == FT_Err_Unknown_File_Format )
@@ -109,22 +107,24 @@ bool FT2Font::init()
     }
     else if ( err )
     {
-        msg_Err( getIntf(), "error opening font (%s)", m_name.c_str() );
+        msg_Err( getIntf(), "error opening font %s (%s)",
+                 m_name.c_str(), ft2_strerror(err) );
         return false;
     }
 
     // Select the charset
-    if( FT_Select_Charmap( m_face, ft_encoding_unicode ) )
+    if( ( err = FT_Select_Charmap( m_face, ft_encoding_unicode ) ) )
     {
-        msg_Err( getIntf(), "font has no UNICODE table (%s)", m_name.c_str() );
+        msg_Err( getIntf(), "font %s has no UNICODE table (%s)",
+                 m_name.c_str(), ft2_strerror(err) );
         return false;
     }
 
     // Set the pixel size
-    if( FT_Set_Pixel_Sizes( m_face, 0, m_size ) )
+    if( ( err = FT_Set_Pixel_Sizes( m_face, 0, m_size ) ) )
     {
-        msg_Warn( getIntf(), "cannot set a pixel size of %d (%s)", m_size,
-                  m_name.c_str() );
+        msg_Warn( getIntf(), "cannot set a pixel size of %d for %s (%s)",
+                  m_size, m_name.c_str(), ft2_strerror(err) );
     }
 
     // Get the font metrucs