Commit 6ae1b0c0 authored by gbazin's avatar gbazin
Browse files

* modules/gui/skins2/*: portability fixes.

parent c8caf934
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -95,6 +95,9 @@ void CtrlList::onUpdate( Subject<VarPercent> &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 )
......
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -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;
}
......
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
......@@ -28,12 +28,12 @@
#ifndef BUILDER_DATA_HPP
#define BUILDER_DATA_HPP
using namespace std;
#include <vlc/vlc.h>
#include <list>
#include <string>
using namespace std;
/// Structure for mapping data from XML file
struct BuilderData
{
......
......@@ -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 <asmax@via.ecp.fr>
*
......@@ -27,8 +27,6 @@
#include "../src/skin_common.hpp"
#include <libxml/xmlreader.h>
#include <map>
#include <string>
/// XML parser using libxml2 text reader API
class XMLParser: public SkinObject
......@@ -53,8 +51,8 @@ class XMLParser: public SkinObject
typedef map<const char*, const char*, ltstr> 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
......
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -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;
}
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -28,6 +28,7 @@
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <string>
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 ) \
......
......@@ -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 <asmax@via.ecp.fr>
*
......@@ -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();
......
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -25,6 +25,8 @@
#ifndef WIN32_FACTORY_HPP
#define WIN32_FACTORY_HPP
#define _WIN32_WINNT 0x0500
#include <windows.h>
#include "../src/os_factory.hpp"
#include <map>
......
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -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"
......
......@@ -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 <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
......@@ -27,7 +27,6 @@
#include "../events/evt_mouse.hpp"
#include "../src/os_loop.hpp"
#include <windows.h>
#include <map>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment