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

Merge pull request #1014 from hwhw/master

Browse Source 
use new FFI based mupdf API
This commit is contained in:
Huang Xin
2014-10-21 18:13:21 +08:00
parent 3a42557b19 b843a46c82
commit 3c1d2c69df
4 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base

Submodule base updated: a4191d3366...1c0cf8963b

4
frontend/document/credocument.lua
View File

@@ -3,7 +3,6 @@ local Document = require("document/document")
local Configurable = require("configurable")
local Blitbuffer = require("ffi/blitbuffer")
local lfs = require("libs/libkoreader-lfs")
local Image = require("ffi/mupdfimg")
local Geom = require("ui/geometry")
local Device = require("ui/device")
local Screen = require("ui/screen")
@@ -148,7 +147,8 @@ function CreDocument:getCoverPageImage()
self:loadDocument()
local data, size = self._document:getCoverPageImageData()
if data and size then
local image = Image:fromData(data, size)
local Mupdf = require("ffi/mupdf")
local image = Mupdf.renderImage(data, size)
ffi.C.free(data)
return image
end

40
frontend/document/pdfdocument.lua
View File

@@ -5,56 +5,20 @@ local Document = require("document/document")
local Configurable = require("configurable")
local DrawContext = require("ffi/drawcontext")
local DEBUG = require("dbg")
local ffi = require("ffi")
ffi.cdef[[
typedef struct fz_point_s fz_point;
struct fz_point_s {
float x, y;
};
typedef enum {
FZ_ANNOT_TEXT,
FZ_ANNOT_LINK,
FZ_ANNOT_FREETEXT,
FZ_ANNOT_LINE,
FZ_ANNOT_SQUARE,
FZ_ANNOT_CIRCLE,
FZ_ANNOT_POLYGON,
FZ_ANNOT_POLYLINE,
FZ_ANNOT_HIGHLIGHT,
FZ_ANNOT_UNDERLINE,
FZ_ANNOT_SQUIGGLY,
FZ_ANNOT_STRIKEOUT,
FZ_ANNOT_STAMP,
FZ_ANNOT_CARET,
FZ_ANNOT_INK,
FZ_ANNOT_POPUP,
FZ_ANNOT_FILEATTACHMENT,
FZ_ANNOT_SOUND,
FZ_ANNOT_MOVIE,
FZ_ANNOT_WIDGET,
FZ_ANNOT_SCREEN,
FZ_ANNOT_PRINTERMARK,
FZ_ANNOT_TRAPNET,
FZ_ANNOT_WATERMARK,
FZ_ANNOT_3D
} fz_annot_type;
]]
local PdfDocument = Document:new{
_document = false,
-- muPDF manages its own additional cache
mupdf_cache_size = 5 * 1024 * 1024,
dc_null = DrawContext.new(),
options = KoptOptions,
koptinterface = nil,
}
function PdfDocument:init()
local pdf = require("libs/libkoreader-pdf")
local pdf = require("ffi/mupdf")
self.koptinterface = require("document/koptinterface")
self.configurable:loadDefaults(self.options)
local ok
ok, self._document = pcall(pdf.openDocument, self.file, self.mupdf_cache_size)
ok, self._document = pcall(pdf.openDocument, self.file)
if not ok then
error(self._document) -- will contain error message
end

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

@@ -1,6 +1,6 @@
local Widget = require("ui/widget/widget")
local CacheItem = require("cacheitem")
local Image = require("ffi/mupdfimg")
local Mupdf = require("ffi/mupdf")
local Geom = require("ui/geometry")
local Cache = require("cache")
local DEBUG = require("dbg")
@@ -54,9 +54,9 @@ function ImageWidget:_loadfile()
-- cache this image
DEBUG("cache", hash)
local cache = ImageCacheItem:new{
bb = Image:fromFile(self.file, self.width, self.height),
bb = Mupdf.renderImageFile(self.file, self.width, self.height),
}
cache.size = cache.bb.pitch * cache.bb.h
cache.size = cache.bb.pitch * cache.bb.h * cache.bb:getBpp() / 8
ImageCache:insert(hash, cache)
self._bb = cache.bb
end