Merge remote-tracking branch 'upstream/master'

Makefile

@@ -231,7 +231,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

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