mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Merge branch 'master' of github.com:hwhw/kindlepdfviewer into djvu-highlight
Conflicts: blitbuffer.c unireader.lua
This commit is contained in:
@@ -423,12 +423,12 @@ static int invertRect(lua_State *L) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct luaL_reg blitbuffer_func[] = {
|
||||
static const struct luaL_Reg blitbuffer_func[] = {
|
||||
{"new", newBlitBuffer},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
static const struct luaL_reg blitbuffer_meth[] = {
|
||||
static const struct luaL_Reg blitbuffer_meth[] = {
|
||||
{"getWidth", getWidth},
|
||||
{"getHeight", getHeight},
|
||||
{"blitFrom", blitToBuffer},
|
||||
|
||||
Reference in New Issue
Block a user