renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blitbuffer: fixups for base (#6714)

Browse Source 
fixups for base bumped to https://github.com/koreader/koreader-base/pull/1201
otherwise tilecache breaks
This commit is contained in:
ezdiy
2020-09-28 01:04:59 +02:00
committed by GitHub
parent 6bfa021689
commit 7a40b496fb
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base

Submodule base updated: de01c8a37c...df85f11880

8
frontend/document/tilecacheitem.lua
View File

@@ -15,15 +15,15 @@ end
function TileCacheItem:dump(filename)
logger.dbg("dumping tile cache to", filename, self.excerpt)
return serial.dump(self.size, self.excerpt, self.pageno,
self.bb.w, self.bb.h, self.bb.pitch, self.bb:getType(),
self.bb.w, self.bb.h, self.bb.stride, self.bb:getType(),
Blitbuffer.tostring(self.bb), filename)
end
function TileCacheItem:load(filename)
local w, h, pitch, bb_type, bb_data
local w, h, stride, bb_type, bb_data
self.size, self.excerpt, self.pageno,
w, h, pitch, bb_type, bb_data = serial.load(filename)
self.bb = Blitbuffer.fromstring(w, h, bb_type, bb_data, pitch)
w, h, stride, bb_type, bb_data = serial.load(filename)
self.bb = Blitbuffer.fromstring(w, h, bb_type, bb_data, stride)
logger.dbg("loading tile cache from", filename, self)
end

2
frontend/ui/widget/imagewidget.lua
View File

@@ -169,7 +169,7 @@ function ImageWidget:_loadfile()
-- cache this image
logger.dbg("cache", hash)
cache = ImageCacheItem:new{ bb = self._bb }
cache.size = cache.bb.pitch * cache.bb.h * cache.bb:getBytesPerPixel()
cache.size = cache.bb.stride * cache.bb.h
ImageCache:insert(hash, cache)
end
end

2
plugins/coverbrowser.koplugin/bookinfomanager.lua
View File

@@ -450,7 +450,7 @@ function BookInfoManager:extractBookInfo(filepath, cover_specs)
dbrow.cover_w = cbb_w
dbrow.cover_h = cbb_h
dbrow.cover_btype = cover_bb:getType()
dbrow.cover_bpitch = cover_bb.pitch
dbrow.cover_bpitch = cover_bb.stride
local cover_data = Blitbuffer.tostring(cover_bb)
cover_bb:free() -- free bb before compressing to save memory
dbrow.cover_datalen = cover_data:len()