From 78c33311d99b1c9b854669d9b634d602692a304b Mon Sep 17 00:00:00 2001 From: scuri Date: Fri, 11 Jun 2010 17:28:54 +0000 Subject: *** empty log message *** --- html/en/history.html | 3 + include/cdlua.h | 5 ++ mak.vc9/cd.sln | 38 ++++++++--- mak.vc9/cdlua5.vcproj | 131 -------------------------------------- mak.vc9/cdlua51.vcproj | 131 ++++++++++++++++++++++++++++++++++++++ mak.vc9/cdlua52.vcproj | 131 ++++++++++++++++++++++++++++++++++++++ mak.vc9/cdluacontextplus5.vcproj | 106 ------------------------------ mak.vc9/cdluacontextplus51.vcproj | 106 ++++++++++++++++++++++++++++++ mak.vc9/cdluacontextplus52.vcproj | 106 ++++++++++++++++++++++++++++++ mak.vc9/cdluaim5.vcproj | 111 -------------------------------- mak.vc9/cdluaim51.vcproj | 110 ++++++++++++++++++++++++++++++++ mak.vc9/cdluaim52.vcproj | 110 ++++++++++++++++++++++++++++++++ mak.vc9/cdluapdf5.vcproj | 106 ------------------------------ mak.vc9/cdluapdf51.vcproj | 106 ++++++++++++++++++++++++++++++ mak.vc9/cdluapdf52.vcproj | 106 ++++++++++++++++++++++++++++++ src/lua5/cdlua5.c | 2 +- src/lua5/cdlua5ctx.c | 6 +- 17 files changed, 948 insertions(+), 466 deletions(-) delete mode 100644 mak.vc9/cdlua5.vcproj create mode 100644 mak.vc9/cdlua51.vcproj create mode 100644 mak.vc9/cdlua52.vcproj delete mode 100644 mak.vc9/cdluacontextplus5.vcproj create mode 100644 mak.vc9/cdluacontextplus51.vcproj create mode 100644 mak.vc9/cdluacontextplus52.vcproj delete mode 100644 mak.vc9/cdluaim5.vcproj create mode 100644 mak.vc9/cdluaim51.vcproj create mode 100644 mak.vc9/cdluaim52.vcproj delete mode 100644 mak.vc9/cdluapdf5.vcproj create mode 100644 mak.vc9/cdluapdf51.vcproj create mode 100644 mak.vc9/cdluapdf52.vcproj diff --git a/html/en/history.html b/html/en/history.html index 1b1ac36..11532df 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -45,6 +45,9 @@ or LUA_CPATH must be set.
  • Changed: + added compatibility with Lua 5.2.
    • +
  • + Changed: IMPORTANT - the main library in Linux and BSD is now the GDK base driver. The X11 base driver library diff --git a/include/cdlua.h b/include/cdlua.h index 30d8174..465d09c 100644 --- a/include/cdlua.h +++ b/include/cdlua.h @@ -29,6 +29,11 @@ int cdlua_close(lua_State *L); cdCanvas* cdlua_getcanvas(lua_State * L); /* pos=1, deprecated use cdlua_checkcanvas */ cdCanvas* cdlua_checkcanvas(lua_State * L, int pos); void cdlua_pushcanvas(lua_State * L, cdCanvas* canvas); + +#if LUA_VERSION_NUM < 502 +#define luaL_typeerror luaL_typerror +#endif + #endif #ifdef __cplusplus diff --git a/mak.vc9/cd.sln b/mak.vc9/cd.sln index f006382..9a861fb 100644 --- a/mak.vc9/cd.sln +++ b/mak.vc9/cd.sln @@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdgdiplus", "cdgdiplus.vcpr {01818D2C-65AF-4D5C-9452-4DFF401C6461} = {01818D2C-65AF-4D5C-9452-4DFF401C6461} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua5", "cdlua5.vcproj", "{53FC9752-81C1-4AA6-B366-A7890A2B81F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua51", "cdlua51.vcproj", "{53FC9752-81C1-4AA6-B366-A7890A2B81F6}" ProjectSection(ProjectDependencies) = postProject {01818D2C-65AF-4D5C-9452-4DFF401C6461} = {01818D2C-65AF-4D5C-9452-4DFF401C6461} EndProjectSection @@ -38,7 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf3", "cdluapdf3.vcpr {8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf5", "cdluapdf5.vcproj", "{B4823266-DF8C-1224-EE00-C7688C234EAC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf51", "cdluapdf51.vcproj", "{B4823266-DF8C-1224-EE00-C7688C234EAC}" ProjectSection(ProjectDependencies) = postProject {53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6} {8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467} @@ -49,7 +49,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdxrender", "cdxrender.vcpr {01818D2C-7689-4D5C-1234-4DFF401C6461} = {01818D2C-7689-4D5C-1234-4DFF401C6461} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim5", "cdluaim5.vcproj", "{CB863607-6B6C-0000-0000-123400001234}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim51", "cdluaim51.vcproj", "{CB863607-6B6C-0000-0000-123400001234}" ProjectSection(ProjectDependencies) = postProject {53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6} EndProjectSection @@ -58,12 +58,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflib", "cd_pdflib.vcproj" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype6", "cd_freetype.vcproj", "{01818D2C-65AF-AFDC-4356-1234401C6461}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus5", "cdluacontextplus5.vcproj", "{B4823266-DF8C-ABCD-1234-C7688C234EAC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus51", "cdluacontextplus51.vcproj", "{B4823266-DF8C-ABCD-1234-C7688C234EAC}" ProjectSection(ProjectDependencies) = postProject {53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua5", "Lua5", "{EFB1BE3C-2981-456B-8E32-928CBDFF7822}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua51", "Lua51", "{EFB1BE3C-2981-456B-8E32-928CBDFF7822}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua3", "Lua3", "{E92DB6FF-5501-4FC0-81D2-00DB8EFA2434}" EndProject @@ -124,6 +124,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtestcairo", "cdtestcairo. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ContextPlus", "ContextPlus", "{89C76F13-4572-4A6D-9F6B-9ED4D0809B64}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua52", "Lua52", "{9645A3AF-CEAB-4A7E-92AB-BF3420E655FF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua52", "cdlua52.vcproj", "{53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus52", "cdluacontextplus52.vcproj", "{B4823266-DF8C-A169-F6A1-C7656C234EAC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim52", "cdluaim52.vcproj", "{CB863607-6B6C-FF53-DF34-12AA00001234}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf52", "cdluapdf52.vcproj", "{B4823266-DF8C-ABC1-DF8C-12688C234EAC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -171,6 +181,14 @@ Global {01818D2C-AAAA-DD23-00AA-5678401C6461}.Debug|Win32.Build.0 = Debug|Win32 {A7E49FB8-0022-15EC-AB17-FFCDC7E83C00}.Debug|Win32.ActiveCfg = Debug|Win32 {A7E49FB8-0022-15EC-AB17-FFCDC7E83C00}.Debug|Win32.Build.0 = Debug|Win32 + {53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}.Debug|Win32.ActiveCfg = Debug|Win32 + {53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}.Debug|Win32.Build.0 = Debug|Win32 + {B4823266-DF8C-A169-F6A1-C7656C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32 + {B4823266-DF8C-A169-F6A1-C7656C234EAC}.Debug|Win32.Build.0 = Debug|Win32 + {CB863607-6B6C-FF53-DF34-12AA00001234}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB863607-6B6C-FF53-DF34-12AA00001234}.Debug|Win32.Build.0 = Debug|Win32 + {B4823266-DF8C-ABC1-DF8C-12688C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32 + {B4823266-DF8C-ABC1-DF8C-12688C234EAC}.Debug|Win32.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -182,6 +200,9 @@ Global {01818D2C-65AF-4D5C-9452-4DFF401C6461} = {1EE89DAC-3D3A-450C-9CF8-E200DF5E12E8} {B4823266-DF8C-AAAA-9999-C7E78C234EAC} = {E92DB6FF-5501-4FC0-81D2-00DB8EFA2434} {53FC9752-81C1-4AA6-B366-AF6D0A2B81F6} = {E92DB6FF-5501-4FC0-81D2-00DB8EFA2434} + {160DEDA5-C1AA-48C7-8B07-490C6A8DE2EE} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64} + {01818D2C-AAAA-DD23-00AA-5678401C6461} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64} + {51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64} {B4823266-DF8C-1224-EE00-C7688C234EAC} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822} {CB863607-6B6C-0000-0000-123400001234} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822} {B4823266-DF8C-ABCD-1234-C7688C234EAC} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822} @@ -192,9 +213,10 @@ Global {A7E49FB8-0000-45EC-1234-ABCDC7E83C00} = {162715BD-4DB3-4007-8B50-725C0BD11878} {A7E49FB8-5467-45EC-2211-FFAB7E83C100} = {162715BD-4DB3-4007-8B50-725C0BD11878} {A7E49FB8-0022-15EC-AB17-FFCDC7E83C00} = {162715BD-4DB3-4007-8B50-725C0BD11878} - {01818D2C-AAAA-DD23-00AA-5678401C6461} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64} - {160DEDA5-C1AA-48C7-8B07-490C6A8DE2EE} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64} - {51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64} + {53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF} + {B4823266-DF8C-A169-F6A1-C7656C234EAC} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF} + {CB863607-6B6C-FF53-DF34-12AA00001234} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF} + {B4823266-DF8C-ABC1-DF8C-12688C234EAC} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF} EndGlobalSection GlobalSection(DevPartner Solution Properties) = postSolution EndGlobalSection diff --git a/mak.vc9/cdlua5.vcproj b/mak.vc9/cdlua5.vcproj deleted file mode 100644 index 625275a..0000000 --- a/mak.vc9/cdlua5.vcproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mak.vc9/cdlua51.vcproj b/mak.vc9/cdlua51.vcproj new file mode 100644 index 0000000..cc94b78 --- /dev/null +++ b/mak.vc9/cdlua51.vcproj @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdlua52.vcproj b/mak.vc9/cdlua52.vcproj new file mode 100644 index 0000000..30d3b3a --- /dev/null +++ b/mak.vc9/cdlua52.vcproj @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdluacontextplus5.vcproj b/mak.vc9/cdluacontextplus5.vcproj deleted file mode 100644 index a595c8d..0000000 --- a/mak.vc9/cdluacontextplus5.vcproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mak.vc9/cdluacontextplus51.vcproj b/mak.vc9/cdluacontextplus51.vcproj new file mode 100644 index 0000000..640408a --- /dev/null +++ b/mak.vc9/cdluacontextplus51.vcproj @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdluacontextplus52.vcproj b/mak.vc9/cdluacontextplus52.vcproj new file mode 100644 index 0000000..90e49d6 --- /dev/null +++ b/mak.vc9/cdluacontextplus52.vcproj @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdluaim5.vcproj b/mak.vc9/cdluaim5.vcproj deleted file mode 100644 index af1b2f3..0000000 --- a/mak.vc9/cdluaim5.vcproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mak.vc9/cdluaim51.vcproj b/mak.vc9/cdluaim51.vcproj new file mode 100644 index 0000000..67c6bc8 --- /dev/null +++ b/mak.vc9/cdluaim51.vcproj @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdluaim52.vcproj b/mak.vc9/cdluaim52.vcproj new file mode 100644 index 0000000..f0bdd99 --- /dev/null +++ b/mak.vc9/cdluaim52.vcproj @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdluapdf5.vcproj b/mak.vc9/cdluapdf5.vcproj deleted file mode 100644 index 28da040..0000000 --- a/mak.vc9/cdluapdf5.vcproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mak.vc9/cdluapdf51.vcproj b/mak.vc9/cdluapdf51.vcproj new file mode 100644 index 0000000..d103929 --- /dev/null +++ b/mak.vc9/cdluapdf51.vcproj @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mak.vc9/cdluapdf52.vcproj b/mak.vc9/cdluapdf52.vcproj new file mode 100644 index 0000000..c28f85a --- /dev/null +++ b/mak.vc9/cdluapdf52.vcproj @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lua5/cdlua5.c b/src/lua5/cdlua5.c index c5d9537..a45bbd3 100644 --- a/src/lua5/cdlua5.c +++ b/src/lua5/cdlua5.c @@ -87,7 +87,7 @@ static cdluaPalette* cdlua_rawcheckpalette(lua_State *L, int param) } } } - luaL_typerror(L, param, "cdPalette"); /* else error */ + luaL_typeerror(L, param, "cdPalette"); /* else error */ return NULL; /* to avoid warnings */ } diff --git a/src/lua5/cdlua5ctx.c b/src/lua5/cdlua5ctx.c index b4c899b..71f090d 100644 --- a/src/lua5/cdlua5ctx.c +++ b/src/lua5/cdlua5ctx.c @@ -1,5 +1,5 @@ /***************************************************************************\ -* $Id: cdlua5ctx.c,v 1.3 2010/04/23 14:27:10 scuri Exp $ +* $Id: cdlua5ctx.c,v 1.4 2010/06/11 17:28:56 scuri Exp $ * * \***************************************************************************/ @@ -397,7 +397,7 @@ static void *cdimagergb_checkdata(lua_State* L, int param) int ret = cdlua_rawchecktype(L, param, "cdBitmap"); if (ret == 0) - luaL_typerror(L, param, "cdBitmap"); /* not a user data and not a metatable */ + luaL_typeerror(L, param, "cdBitmap"); /* not a user data and not a metatable */ if (ret == 1) { @@ -487,7 +487,7 @@ static void *cdimagergb_checkdata(lua_State* L, int param) return data_s; } - luaL_typerror(L, param, "cdBitmap"); /* is a metatable but it is not one of the accepted */ + luaL_typeerror(L, param, "cdBitmap"); /* is a metatable but it is not one of the accepted */ } return data_s; -- cgit v1.2.3