From 987b34f09279b304364085d75bc5f6e883e2bf4a Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 15 Oct 2013 22:55:35 +0800 Subject: [PATCH 1/2] reactivate FFI blitbuffer module This should fix #274 and #288. --- frontend/ui/image.lua | 25 ------------------------- frontend/ui/widget/base.lua | 1 - frontend/ui/widget/image.lua | 6 +++--- koreader-base | 2 +- 4 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 frontend/ui/image.lua diff --git a/frontend/ui/image.lua b/frontend/ui/image.lua deleted file mode 100644 index 055fb8476..000000000 --- a/frontend/ui/image.lua +++ /dev/null @@ -1,25 +0,0 @@ -Image = {} - -function Image._getFileData(filename) - local f = io.open(filename) - local data = f:read("*a") - f:close() - return data -end - -function Image.fromPNG(filename) - local img = mupdfimg.new() - img:loadPNGData(Image._getFileData(filename)) - local bb = img:toBlitBuffer() - img:free() - return bb -end - -function Image.fromJPEG(filename) - local img = mupdfimg.new() - img:loadJPEGData(Image._getFileData(filename)) - local bb = img:toBlitBuffer() - img:free() - return bb -end - diff --git a/frontend/ui/widget/base.lua b/frontend/ui/widget/base.lua index b66b6e49d..27096b297 100644 --- a/frontend/ui/widget/base.lua +++ b/frontend/ui/widget/base.lua @@ -1,7 +1,6 @@ require "ui/screen" require "ui/rendertext" require "ui/graphics" -require "ui/image" require "ui/event" require "ui/gesturedetector" require "ui/font" diff --git a/frontend/ui/widget/image.lua b/frontend/ui/widget/image.lua index e4f94e0f7..88bc8de4c 100644 --- a/frontend/ui/widget/image.lua +++ b/frontend/ui/widget/image.lua @@ -1,5 +1,5 @@ require "ui/widget/base" -require "ui/image" +--require "ui/image" --[[ @@ -16,9 +16,9 @@ ImageWidget = Widget:new{ function ImageWidget:_render() local itype = string.lower(string.match(self.file, ".+%.([^.]+)") or "") if itype == "jpeg" or itype == "jpg" then - self._bb = Image.fromJPEG(self.file) + self._bb = Image:fromJPEG(self.file) elseif itype == "png" then - self._bb = Image.fromPNG(self.file) + self._bb = Image:fromPNG(self.file) end end diff --git a/koreader-base b/koreader-base index dbe989867..f406cec21 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit dbe989867af6f187ad0ef40cc1bdae735ea9be86 +Subproject commit f406cec21ed62bd715853ed526658ae8ecbf6ae4 From ca37eb88890f741ea0e440833ec55caab097dfde Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 15 Oct 2013 23:00:52 +0800 Subject: [PATCH 2/2] remove the ui/image dependency --- frontend/ui/widget/image.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/ui/widget/image.lua b/frontend/ui/widget/image.lua index 88bc8de4c..36b8ae830 100644 --- a/frontend/ui/widget/image.lua +++ b/frontend/ui/widget/image.lua @@ -1,6 +1,4 @@ require "ui/widget/base" ---require "ui/image" - --[[ ImageWidget shows an image from a file