npapi-vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Jan 24 17:44:48 2012 +0100| [d389423419ac637c7f8130fd9b5f00b9d62c2d5b] | committer: Jean-Baptiste Kempf
Kill HTMLColor2RGB related warnings > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=d389423419ac637c7f8130fd9b5f00b9d62c2d5b --- common/vlc_player_options.h | 2 +- common/win32_fullscreen.cpp | 2 +- npapi/vlcplugin_xcb.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/vlc_player_options.h b/common/vlc_player_options.h index aadb566..d0f87ce 100644 --- a/common/vlc_player_options.h +++ b/common/vlc_player_options.h @@ -26,7 +26,7 @@ #include <cstring> #include <cstdio> -static bool HTMLColor2RGB(const char *htmlColor, uint8_t *r, uint8_t *g, uint8_t *b) +static inline bool HTMLColor2RGB(const char *htmlColor, unsigned *r, unsigned *g, unsigned *b) { if (!htmlColor) return false; diff --git a/common/win32_fullscreen.cpp b/common/win32_fullscreen.cpp index 9859a89..e1d7f0a 100644 --- a/common/win32_fullscreen.cpp +++ b/common/win32_fullscreen.cpp @@ -629,7 +629,7 @@ bool VLCHolderWnd::Create(HWND hWndParent) void VLCHolderWnd::PreRegisterWindowClass(WNDCLASS* wc) { if( !_hBgBrush){ - BYTE r = 0, g = 0, b = 0; + unsigned r = 0, g = 0, b = 0; HTMLColor2RGB(PO()->get_bg_color().c_str(), &r, &g, &b); _hBgBrush = CreateSolidBrush(RGB(r, g, b)); } diff --git a/npapi/vlcplugin_xcb.cpp b/npapi/vlcplugin_xcb.cpp index 76e4c12..42c7a56 100644 --- a/npapi/vlcplugin_xcb.cpp +++ b/npapi/vlcplugin_xcb.cpp @@ -95,7 +95,7 @@ bool VlcPluginXcb::create_windows() 32, 2, (void *) xembed_info_buf); colormap = screen->default_colormap; - uint8_t r = 0, g = 0, b = 0; + unsigned r = 0, g = 0, b = 0; HTMLColor2RGB(get_bg_color().c_str(), &r, &g, &b); xcb_alloc_color_reply_t *reply = xcb_alloc_color_reply(conn, xcb_alloc_color(conn, colormap, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
