fix extremely large font on certain reflowed pages

chrox · chrox · commit 3d9bd2aa6a57 · 2015-09-13T05:03:00.000+08:00
previously the zoom value from reflowing is calculated also with
page height which actually does not make sense. Because reflowed
pages will be shown in fit-to-width zoom mode not fit-to-height
zoom mode so original page height has nothing to do with font size.

With this patch font size in reflowing mode will be more consistent
through the book.
diff --git a/djvu.c b/djvu.c
@@ -550,8 +550,7 @@ static int reflowPage(lua_State *L) {
 	rh = (int)(kctx->bbox.y1 - kctx->bbox.y0);
 
 	double zoom = kctx->zoom*kctx->quality;
-	float scale = ((2*zoom*kctx->dev_width) / (double)pw + \
-			 	   (2*zoom*kctx->dev_height) / (double)ph) / 2;
+	float scale = (1.5*zoom*kctx->dev_width) / (double)pw;
 	prect.w = pw * scale;
 	prect.h = ph * scale;
 	rrect.x = rx * scale;
diff --git a/ffi/mupdf.lua b/ffi/mupdf.lua
@@ -761,10 +761,7 @@ function page_mt.__index:reflow(kopt_context)
 	-- probe scale
 	local zoom = kopt_context.zoom * kopt_context.quality
 	M.fz_transform_rect(bounds, M.fz_identity)
-	local scale = 1.0 / ((
-                bounds[0].x1 / (2 * zoom * kopt_context.dev_width) +
-			    bounds[0].y1 / (2 * zoom * kopt_context.dev_height)
-            ) / 2 )
+	local scale = (1.5 * zoom * kopt_context.dev_width) / bounds[0].x1
 	-- store zoom
 	kopt_context.zoom = scale
 	-- do real scale
