Merge pull request koreader#10 from chrox/kctx_fix

update libk2pdfopt for new koptcontext

Author: houqp

djvu.c

@@ -15,10 +15,12 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 #include <math.h>
 #include <string.h>
 #include <errno.h>
 #include <pthread.h>
+#include <assert.h>
 #include <libdjvu/miniexp.h>
 #include <libdjvu/ddjvuapi.h>
 
@@ -488,7 +490,7 @@ static int getAutoBBox(lua_State *L) {
 	prect.h = ddjvu_page_get_height(page->page_ref);
 	rrect = prect;
 
-	WILLUSBITMAP *src = malloc(sizeof(WILLUSBITMAP));
+	WILLUSBITMAP *src = &kctx->src;
 	bmp_init(src);
 	src->width = rrect.w;
 	src->height = rrect.h;
@@ -504,7 +506,6 @@ static int getAutoBBox(lua_State *L) {
 	ddjvu_page_render(page->page_ref, 0, &prect, &rrect, page->doc->pixelformat,
 		bmp_bytewidth(src), (char *) src->data);
 
-	kctx->src = src;
 	k2pdfopt_crop_bmp(kctx);
 
 	lua_pushnumber(L, ((double)kctx->bbox.x0));
@@ -548,7 +549,7 @@ static int reflowPage(lua_State *L) {
 	printf("rendering page:%d,%d,%d,%d\n",rrect.x,rrect.y,rrect.w,rrect.h);
 	kctx->zoom = scale;
 
-	WILLUSBITMAP *src = malloc(sizeof(WILLUSBITMAP));
+	WILLUSBITMAP *src = &kctx->src;
 	bmp_init(src);
 	src->width = rrect.w;
 	src->height = rrect.h;
@@ -566,7 +567,6 @@ static int reflowPage(lua_State *L) {
 	status = ddjvu_page_render(page->page_ref, mode, &prect, &rrect, page->doc->pixelformat,
 			bmp_bytewidth(src), (char *) src->data);
 
-	kctx->src = src;
 	if (kctx->precache) {
 		pthread_t rf_thread;
 		pthread_attr_t attr;
@@ -586,7 +586,11 @@ static int drawReflowedPage(lua_State *L) {
 	KOPTContext *kc = (KOPTContext*) luaL_checkudata(L, 2, "koptcontext");
 	BlitBuffer *bb = (BlitBuffer*) luaL_checkudata(L, 3, "blitbuffer");
 
-	uint8_t *koptr = kc->data;
+	assert(kc->dst.data != NULL);
+	assert(kc->dst.width >= bb->w);
+	assert(kc->dst.height >= bb->h);
+
+	uint8_t *koptr = kc->dst.data;
 	uint8_t *bbptr = bb->data;
 
 	int x_offset = 0;

koptcontext.c

@@ -45,9 +45,7 @@ static int newKOPTContext(lua_State *L) {
 	double word_spacing = 1.375;
 	double shrink_factor = 0.9;
 
-	uint8_t *data = NULL;
 	BBox bbox = {0, 0, 0, 0};
-	WILLUSBITMAP *src;
 	int precache = 0;
 
 	KOPTContext *kc = (KOPTContext*) lua_newuserdata(L, sizeof(KOPTContext));
@@ -78,17 +76,28 @@ static int newKOPTContext(lua_State *L) {
 	kc->word_spacing = word_spacing;
 	kc->shrink_factor = shrink_factor;
 
-	kc->data = data;
 	kc->bbox = bbox;
-	kc->src = src;
 	kc->precache = precache;
 
+	bmp_init(&kc->src);
+	bmp_init(&kc->dst);
+
 	luaL_getmetatable(L, "koptcontext");
 	lua_setmetatable(L, -2);
 
 	return 1;
 }
 
+static int freeContext(lua_State *L) {
+	KOPTContext *kc = (KOPTContext*) luaL_checkudata(L, 1, "koptcontext");
+	/* Don't worry about the src bitmap in context. It's freed as soon as it's
+	 * been used in either reflow or autocrop. But we should take care of dst
+	 * bitmap since the usage of dst bitmap is delayed most of the times.
+	 */
+	bmp_free(&kc->dst);
+	return 0;
+}
+
 static int kcSetBBox(lua_State *L) {
 	KOPTContext *kc = (KOPTContext*) luaL_checkudata(L, 1, "koptcontext");
 	kc->bbox.x0 = luaL_checknumber(L, 2);
@@ -267,6 +276,9 @@ static const struct luaL_Reg koptcontext_meth[] = {
 
 	{"setPreCache", kcSetPreCache},
 	{"isPreCache", kcIsPreCache},
+
+	{"free", freeContext},
+	{"__gc", freeContext},
 	{NULL, NULL}
 };
 

libk2pdfopt

@@ -19,14 +19,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
+#include <locale.h>
 #include "lua_gettext.h"
 
-
 extern int _nl_msg_cat_cntr;
 
-
-
 static int lua_gettext_init(lua_State *L) {
 	const char* locale_dir = luaL_checkstring(L, 1);
 	const char* package = luaL_checkstring(L, 2);

lua_gettext.c

@@ -20,6 +20,7 @@
 #include <math.h>
 #include <stddef.h>
 #include <pthread.h>
+#include <assert.h>
 #include <fitz/fitz-internal.h>
 
 #include "blitbuffer.h"
@@ -586,14 +587,12 @@ static int getAutoBBox(lua_State *L) {
 		return luaL_error(L, "cannot calculate bbox for page");
 	}
 
-	WILLUSBITMAP *src = malloc(sizeof(WILLUSBITMAP));
+	WILLUSBITMAP *src = &kctx->src;
 	bmp_init(src);
 
 	bmpmupdf_pixmap_to_bmp(src, page->doc->context, pix);
 	fz_drop_pixmap(page->doc->context, pix);
 
-	kctx->src = src;
-
 	k2pdfopt_crop_bmp(kctx);
 
 	lua_pushnumber(L, ((double)kctx->bbox.x0));
@@ -652,13 +651,12 @@ static int reflowPage(lua_State *L) {
 	fz_run_page(page->doc->xref, page->page, dev, ctm, NULL);
 	fz_free_device(dev);
 
-	WILLUSBITMAP *src = malloc(sizeof(WILLUSBITMAP));
+	WILLUSBITMAP *src = &kctx->src;
 	bmp_init(src);
 
 	int status = bmpmupdf_pixmap_to_bmp(src, page->doc->context, pix);
 	fz_drop_pixmap(page->doc->context, pix);
 
-	kctx->src = src;
 	if (kctx->precache) {
 		pthread_t rf_thread;
 		pthread_attr_t attr;
@@ -678,7 +676,11 @@ static int drawReflowedPage(lua_State *L) {
 	KOPTContext *kc = (KOPTContext*) luaL_checkudata(L, 2, "koptcontext");
 	BlitBuffer *bb = (BlitBuffer*) luaL_checkudata(L, 3, "blitbuffer");
 
-	uint8_t *koptr = kc->data;
+	assert(kc->dst.data != NULL);
+	assert(kc->dst.width >= bb->w);
+	assert(kc->dst.height >= bb->h);
+
+	uint8_t *koptr = kc->dst.data;
 	uint8_t *bbptr = bb->data;
 
 	int x_offset = 0;