Merge branch 'master' of github.com:hwhw/kindlepdfviewer into djvu-highlight

Conflicts:
	blitbuffer.c
	unireader.lua
This commit is contained in:
Qingping Hou
2012-03-20 10:36:35 +08:00
16 changed files with 304 additions and 305 deletions

View File

@@ -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},