From 6325183dc3b787be0e14ef52336269e0b4d0405d Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Tue, 2 Oct 2012 23:22:06 +0200 Subject: [PATCH 1/2] Revert "don't preCache in two column mode" This reverts commit 4d187aad4ee49a20254048ca301119176b54039b. --- unireader.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/unireader.lua b/unireader.lua index 0521b8578..0cd17a951 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1528,12 +1528,8 @@ function UniReader:goto(no, is_ignore_jump) -- TODO: move the following to a more appropriate place -- into the caching section if no < self.doc:getPages() then - if self.bbox.enabled and #self.bbox > 0 then - Debug("no preCache -- using custom bbox") - elseif self.pan_by_page then - Debug("no preCache -- in two column mode") - else - Debug("preCache", no+1) + if #self.bbox == 0 or not self.bbox.enabled then + -- pre-cache next page, but if we will modify bbox don't! self:drawOrCache(no+1, true) end end From 53a60495b56ac344c8a98f3129b98aa4c25ed08b Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Tue, 2 Oct 2012 23:24:09 +0200 Subject: [PATCH 2/2] use git describe to generate version Last release had git annotate tag (added with git -a) so this is now much better alternative to just git sha1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f4f9258b..9b206e19c 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ INSTALL_DIR=kindlepdfviewer LUA_FILES=alt_getopt.lua commands.lua crereader.lua dialog.lua djvureader.lua extentions.lua filechooser.lua filehistory.lua fileinfo.lua filesearcher.lua font.lua graphics.lua helppage.lua image.lua inputbox.lua keys.lua pdfreader.lua reader.lua rendertext.lua screen.lua selectmenu.lua settings.lua unireader.lua widget.lua -VERSION?=$(shell git rev-parse --short HEAD) +VERSION?=$(shell git describe HEAD) customupdate: all # ensure that build binary is for ARM file kpdfview | grep ARM || exit 1