From 7ac5b419b56b7183ef91d893be13f2d4f03b582f Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Mon, 16 Jun 2014 02:20:59 -0400
Subject: [PATCH 1/2] refactor(doc): use ffi binding in picdocument

---
 frontend/document/picdocument.lua | 3 ++-
 koreader-base                     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/document/picdocument.lua b/frontend/document/picdocument.lua
index 042e32578..d2827ca35 100644
--- a/frontend/document/picdocument.lua
+++ b/frontend/document/picdocument.lua
@@ -1,5 +1,6 @@
 local Document = require("document/document")
 local DrawContext = require("ffi/drawcontext")
+local pic = nil
 
 local PicDocument = Document:new{
     _document = false,
@@ -7,7 +8,7 @@ local PicDocument = Document:new{
 }
 
 function PicDocument:init()
-    require "libs/libkoreader-pic"
+    if not pic then pic = require("ffi/pic") end
     ok, self._document = pcall(pic.openDocument, self.file)
     if not ok then
         self.error_message = "failed to open jpeg image"
diff --git a/koreader-base b/koreader-base
index 9dc2c6b2a..9a9d69591 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 9dc2c6b2a2e15d47a17cb811182684a4ed272013
+Subproject commit 9a9d69591025c55123a3ed86f4ba6c54fd82132d

From b10eb3a5bf6ec9aa21ab7bab357a0400b2a96859 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Mon, 16 Jun 2014 02:31:33 -0400
Subject: [PATCH 2/2] update koreader-base

---
 koreader-base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koreader-base b/koreader-base
index 9a9d69591..995dbe75d 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 9a9d69591025c55123a3ed86f4ba6c54fd82132d
+Subproject commit 995dbe75d9a5325ce93cd04486b0a1fe20143197