From 8abd8a8a1f5186da417125b06f5f0d4aa1b74b10 Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 22 Jan 2014 18:34:41 +0800 Subject: [PATCH] loading KoptInterface only in pdf and djvu reader This will save 4MB RAM in crereader which otherwise will load liblept.so.3 and libk2pdfopt.so.2 automatically for nothing. --- frontend/document/djvudocument.lua | 6 +++--- frontend/document/pdfdocument.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/document/djvudocument.lua b/frontend/document/djvudocument.lua index 39e02e8de..ac916ae0b 100644 --- a/frontend/document/djvudocument.lua +++ b/frontend/document/djvudocument.lua @@ -2,7 +2,6 @@ local Geom = require("ui/geometry") local Cache = require("cache") local CacheItem = require("cacheitem") local KoptOptions = require("ui/data/koptoptions") -local KoptInterface = require("document/koptinterface") local Document = require("document/document") local Configurable = require("ui/reader/configurable") local DrawContext = require("ffi/drawcontext") @@ -13,7 +12,7 @@ local DjvuDocument = Document:new{ djvulibre_cache_size = nil, dc_null = DrawContext.new(), options = KoptOptions, - koptinterface = KoptInterface, + koptinterface = nil, } -- check DjVu magic string to validate @@ -27,7 +26,8 @@ local function validDjvuFile(filename) end function DjvuDocument:init() - require "libs/libkoreader-djvu" + local djvu = require("libs/libkoreader-djvu") + self.koptinterface = require("document/koptinterface") self.configurable:loadDefaults(self.options) if not validDjvuFile(self.file) then self.error_message = "Not a valid DjVu file" diff --git a/frontend/document/pdfdocument.lua b/frontend/document/pdfdocument.lua index f70f1485c..3ccc5d813 100644 --- a/frontend/document/pdfdocument.lua +++ b/frontend/document/pdfdocument.lua @@ -1,7 +1,6 @@ local Cache = require("cache") local CacheItem = require("cacheitem") local KoptOptions = require("ui/data/koptoptions") -local KoptInterface = require("document/koptinterface") local Document = require("document/document") local Configurable = require("ui/reader/configurable") local DrawContext = require("ffi/drawcontext") @@ -12,11 +11,12 @@ local PdfDocument = Document:new{ mupdf_cache_size = 5 * 1024 * 1024, dc_null = DrawContext.new(), options = KoptOptions, - koptinterface = KoptInterface, + koptinterface = nil, } function PdfDocument:init() - require "libs/libkoreader-pdf" + local pdf = require("libs/libkoreader-pdf") + self.koptinterface = require("document/koptinterface") self.configurable:loadDefaults(self.options) local ok ok, self._document = pcall(pdf.openDocument, self.file, self.mupdf_cache_size)