From 6ae1b0c09febc532d2ae197008d5159045b226a3 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Fri, 27 Feb 2004 13:24:12 +0000 Subject: [PATCH 1/1] * modules/gui/skins2/*: portability fixes. --- modules/gui/skins2/controls/ctrl_list.cpp | 5 ++++- modules/gui/skins2/parser/builder.cpp | 13 +++++++------ modules/gui/skins2/parser/builder_data.hpp | 6 +++--- modules/gui/skins2/parser/xmlparser.hpp | 8 +++----- modules/gui/skins2/src/ft2_font.cpp | 10 ++++++---- modules/gui/skins2/src/skin_common.hpp | 6 +++++- modules/gui/skins2/vars/playlist.cpp | 4 ++-- modules/gui/skins2/win32/win32_factory.hpp | 4 +++- modules/gui/skins2/win32/win32_loop.cpp | 4 ++-- modules/gui/skins2/win32/win32_loop.hpp | 3 +-- 10 files changed, 36 insertions(+), 27 deletions(-) diff --git a/modules/gui/skins2/controls/ctrl_list.cpp b/modules/gui/skins2/controls/ctrl_list.cpp index 6b0dc72ecf..568e8fed66 100644 --- a/modules/gui/skins2/controls/ctrl_list.cpp +++ b/modules/gui/skins2/controls/ctrl_list.cpp @@ -2,7 +2,7 @@ * ctrl_list.cpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: ctrl_list.cpp,v 1.1 2004/01/03 23:31:33 asmax Exp $ + * $Id: ctrl_list.cpp,v 1.2 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -95,6 +95,9 @@ void CtrlList::onUpdate( Subject &rPercent ) if( excessItems > 0 ) { // a simple (int)(...) causes rounding errors ! +#ifdef _MSC_VER +# define lrint (int) +#endif firstItem = lrint( (1.0 - rVarPos.get()) * (double)excessItems ); } if( m_lastPos != firstItem ) diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp index 4c98d4095b..6c08c68314 100755 --- a/modules/gui/skins2/parser/builder.cpp +++ b/modules/gui/skins2/parser/builder.cpp @@ -2,7 +2,7 @@ * builder.cpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: builder.cpp,v 1.5 2004/02/01 16:15:40 asmax Exp $ + * $Id: builder.cpp,v 1.6 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -542,11 +542,12 @@ const string Builder::generateId() const { static int i = 1; - const string base = "_ReservedId_"; - char genId[base.size() + 4]; - snprintf( genId, base.size() + 4, "%s%i", base.c_str(), i ); - i++; - return genId; + char genId[5]; + snprintf( genId, 4, "%i", i++ ); + + string base = "_ReservedId_" + (string)genId; + + return base; } diff --git a/modules/gui/skins2/parser/builder_data.hpp b/modules/gui/skins2/parser/builder_data.hpp index 7052d575b2..b0839630d1 100644 --- a/modules/gui/skins2/parser/builder_data.hpp +++ b/modules/gui/skins2/parser/builder_data.hpp @@ -2,7 +2,7 @@ * builder_data.hpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: builder_data.hpp,v 1.3 2004/01/25 11:44:19 asmax Exp $ + * $Id: builder_data.hpp,v 1.4 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -28,12 +28,12 @@ #ifndef BUILDER_DATA_HPP #define BUILDER_DATA_HPP -using namespace std; - #include #include #include +using namespace std; + /// Structure for mapping data from XML file struct BuilderData { diff --git a/modules/gui/skins2/parser/xmlparser.hpp b/modules/gui/skins2/parser/xmlparser.hpp index f64302b7fb..cdfd78e252 100644 --- a/modules/gui/skins2/parser/xmlparser.hpp +++ b/modules/gui/skins2/parser/xmlparser.hpp @@ -2,7 +2,7 @@ * xmlparser.hpp ***************************************************************************** * Copyright (C) 2004 VideoLAN - * $Id: xmlparser.hpp,v 1.3 2004/01/25 11:44:19 asmax Exp $ + * $Id: xmlparser.hpp,v 1.4 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * @@ -27,8 +27,6 @@ #include "../src/skin_common.hpp" #include #include -#include - /// XML parser using libxml2 text reader API class XMLParser: public SkinObject @@ -53,8 +51,8 @@ class XMLParser: public SkinObject typedef map AttrList_t; /// Callbacks - virtual void handleBeginElement( const string &rName, AttrList_t &attr ) {} - virtual void handleEndElement( const string &rName ) {} + virtual void handleBeginElement( const string &rName, AttrList_t &attr ) {;} + virtual void handleEndElement( const string &rName ) {;} private: /// Reader context diff --git a/modules/gui/skins2/src/ft2_font.cpp b/modules/gui/skins2/src/ft2_font.cpp index ef968e4e6d..ae8ab9ea9c 100644 --- a/modules/gui/skins2/src/ft2_font.cpp +++ b/modules/gui/skins2/src/ft2_font.cpp @@ -2,7 +2,7 @@ * ft2_font.cpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: ft2_font.cpp,v 1.1 2004/01/03 23:31:33 asmax Exp $ + * $Id: ft2_font.cpp,v 1.2 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -142,8 +142,8 @@ GenericBitmap *FT2Font::drawString( const UString &rString, uint32_t color, int len = rString.length(); // Array of glyph bitmaps and position - FT_Glyph glyphs[len]; - int pos[len]; + FT_Glyph *glyphs = new FT_Glyph[len]; + int *pos = new int[len]; // Does the font support kerning ? FT_Bool useKerning = FT_HAS_KERNING( m_face ); @@ -254,6 +254,8 @@ GenericBitmap *FT2Font::drawString( const UString &rString, uint32_t color, } } + delete [] glyphs; + delete [] pos; + return pBmp; } - diff --git a/modules/gui/skins2/src/skin_common.hpp b/modules/gui/skins2/src/skin_common.hpp index 800c9830d6..c4cc7d54b8 100644 --- a/modules/gui/skins2/src/skin_common.hpp +++ b/modules/gui/skins2/src/skin_common.hpp @@ -2,7 +2,7 @@ * skin_common.hpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: skin_common.hpp,v 1.2 2004/01/11 17:12:17 asmax Exp $ + * $Id: skin_common.hpp,v 1.3 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -28,6 +28,7 @@ #include #include +#include using namespace std; class AsyncQueue; @@ -40,6 +41,9 @@ class VarManager; class VlcProc; class Theme; +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif // Useful macros #define SKINS_DELETE( p ) \ diff --git a/modules/gui/skins2/vars/playlist.cpp b/modules/gui/skins2/vars/playlist.cpp index d61359252d..68aa3b95e5 100644 --- a/modules/gui/skins2/vars/playlist.cpp +++ b/modules/gui/skins2/vars/playlist.cpp @@ -2,7 +2,7 @@ * playlist.cpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: playlist.cpp,v 1.6 2004/01/05 22:17:32 asmax Exp $ + * $Id: playlist.cpp,v 1.7 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * @@ -50,7 +50,7 @@ Playlist::Playlist( intf_thread_t *pIntf ): VarList( pIntf ) msg_Warn( pIntf, "Unable to do requested conversion" ); } #else - msg_Dbg( p_dec, "No iconv support available" ); + msg_Dbg( pIntf, "No iconv support available" ); #endif buildList(); diff --git a/modules/gui/skins2/win32/win32_factory.hpp b/modules/gui/skins2/win32/win32_factory.hpp index 4e74f6efad..573e285a3e 100644 --- a/modules/gui/skins2/win32/win32_factory.hpp +++ b/modules/gui/skins2/win32/win32_factory.hpp @@ -2,7 +2,7 @@ * win32_factory.hpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: win32_factory.hpp,v 1.2 2004/01/27 17:01:51 gbazin Exp $ + * $Id: win32_factory.hpp,v 1.3 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -25,6 +25,8 @@ #ifndef WIN32_FACTORY_HPP #define WIN32_FACTORY_HPP +#define _WIN32_WINNT 0x0500 + #include #include "../src/os_factory.hpp" #include diff --git a/modules/gui/skins2/win32/win32_loop.cpp b/modules/gui/skins2/win32/win32_loop.cpp index f5ae615995..0e725647d3 100755 --- a/modules/gui/skins2/win32/win32_loop.cpp +++ b/modules/gui/skins2/win32/win32_loop.cpp @@ -2,7 +2,7 @@ * win32_loop.cpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: win32_loop.cpp,v 1.1 2004/01/03 23:31:34 asmax Exp $ + * $Id: win32_loop.cpp,v 1.2 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -24,8 +24,8 @@ #ifdef WIN32_SKINS -#include "win32_loop.hpp" #include "win32_factory.hpp" +#include "win32_loop.hpp" #include "../src/generic_window.hpp" #include "../events/evt_key.hpp" #include "../events/evt_leave.hpp" diff --git a/modules/gui/skins2/win32/win32_loop.hpp b/modules/gui/skins2/win32/win32_loop.hpp index 5ac66fb55e..25ab61b05d 100644 --- a/modules/gui/skins2/win32/win32_loop.hpp +++ b/modules/gui/skins2/win32/win32_loop.hpp @@ -2,7 +2,7 @@ * win32_loop.hpp ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: win32_loop.hpp,v 1.1 2004/01/03 23:31:34 asmax Exp $ + * $Id: win32_loop.hpp,v 1.2 2004/02/27 13:24:12 gbazin Exp $ * * Authors: Cyril Deguet * Olivier Teulière @@ -27,7 +27,6 @@ #include "../events/evt_mouse.hpp" #include "../src/os_loop.hpp" -#include #include -- 2.39.2