From e8469dcb5be4bff7d1ea2ab2d8ffee2ae9e3a806 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 25 Jul 2013 23:01:37 +0800 Subject: [PATCH 1/2] fix libpng conflict in libk2pdfopt --- koreader-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koreader-base b/koreader-base index d594373ea..f684be43e 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit d594373eacd535f211fa93b0d3a8f3faa8d30426 +Subproject commit f684be43efaa12c7f2716efe8eb0a3a2dd5ffbb1 From 3f36fa80fd09a448f3c207d48873fa6ca3532ef2 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 25 Jul 2013 23:03:54 +0800 Subject: [PATCH 2/2] fix nil pos bug in readerhighlight --- frontend/ui/reader/readerhighlight.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/ui/reader/readerhighlight.lua b/frontend/ui/reader/readerhighlight.lua index 9b9e40f08..d815791b1 100644 --- a/frontend/ui/reader/readerhighlight.lua +++ b/frontend/ui/reader/readerhighlight.lua @@ -68,13 +68,14 @@ end function ReaderHighlight:onTap(arg, ges) local function inside_box(ges, box) local pos = self.view:screenToPageTransform(ges.pos) - local x, y = pos.x, pos.y - if box.x <= x and box.y <= y - and box.x + box.w >= x - and box.y + box.h >= y then - return true + if pos then + local x, y = pos.x, pos.y + if box.x <= x and box.y <= y + and box.x + box.w >= x + and box.y + box.h >= y then + return true + end end - return false end if self.hold_pos then self.view.highlight.temp[self.hold_pos.page] = nil