mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

luainstance: fix types to allow compilation with newer gcc

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b62da2624e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 18:45:02 +01:00
committed by Michael Liebmann
parent 79b8a95524
commit 7e1ea37842
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/lua/luainstance.cpp
View File

@@ -740,7 +740,7 @@ int CLuaInstance::PaintBox(lua_State *L)
int count = lua_gettop(L); int count = lua_gettop(L);
LUA_DEBUG("CLuaInstance::%s %d\n", __func__, count); LUA_DEBUG("CLuaInstance::%s %d\n", __func__, count);
int x, y, w, h, radius = 0, corner = CORNER_ALL; int x, y, w, h, radius = 0, corner = CORNER_ALL;
unsigned int c; lua_Unsigned c;
CLuaData *W = CheckData(L, 1); CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) return 0; if (!W || !W->fbwin) return 0;
@@ -777,7 +777,7 @@ int CLuaInstance::PaintBox(lua_State *L)
int CLuaInstance::paintHLineRel(lua_State *L) int CLuaInstance::paintHLineRel(lua_State *L)
{ {
int x, y, dx; int x, y, dx;
unsigned int c; lua_Unsigned c;
CLuaData *W = CheckData(L, 1); CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) return 0; if (!W || !W->fbwin) return 0;
@@ -805,7 +805,7 @@ int CLuaInstance::paintHLineRel(lua_State *L)
int CLuaInstance::paintVLineRel(lua_State *L) int CLuaInstance::paintVLineRel(lua_State *L)
{ {
int x, y, dy; int x, y, dy;
unsigned int c; lua_Unsigned c;
CLuaData *W = CheckData(L, 1); CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) return 0; if (!W || !W->fbwin) return 0;
@@ -836,7 +836,7 @@ int CLuaInstance::RenderString(lua_State *L)
{ {
int x, y, w, boxh, center; int x, y, w, boxh, center;
Font* font = NULL; Font* font = NULL;
unsigned int c; lua_Unsigned c;
const char *text; const char *text;
int numargs = lua_gettop(L); int numargs = lua_gettop(L);
LUA_DEBUG("CLuaInstance::%s %d\n", __func__, numargs); LUA_DEBUG("CLuaInstance::%s %d\n", __func__, numargs);
@@ -1010,7 +1010,8 @@ int CLuaInstance::getDynFont(lua_State *L)
return 2; return 2;
} }
lua_Integer dx = 0, dy = 0, style = CNeutrinoFonts::FONT_STYLE_REGULAR; int dx = 0, dy = 0;
lua_Integer style = CNeutrinoFonts::FONT_STYLE_REGULAR;
std::string text=""; std::string text="";
dx = luaL_checkint(L, 2); dx = luaL_checkint(L, 2);