Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add screen rotation in koptconfig

Browse Source
chrox 12 years ago
parent 2f0cc5b827
commit 47da06a29e
6 changed files with 163 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
djvu.c
Unescape Escape View File

@ -486,9 +486,11 @@ static int reflowPage(lua_State *L) {
int justification = luaL_checkint(L, 12);
int columns = luaL_checkint(L, 13);
double contrast = luaL_checknumber(L, 14);
int rotation = luaL_checknumber(L, 15);
k2pdfopt_set_params(width, height, font_size, page_margin, line_spacing, word_spacing, \
text_wrap, straighten, justification, columns, contrast);
text_wrap, straighten, justification, columns, contrast, rotation);
k2pdfopt_djvu_reflow(page->page_ref, page->doc->context, mode, page->doc->pixelformat);
k2pdfopt_rfbmp_size(&width, &height);
k2pdfopt_rfbmp_zoom(&dc->zoom);

140
k2pdfopt.c
Unescape Escape View File

@ -200,6 +200,7 @@ static int debug = 0;
** Blank Area Threshold Widths--average black pixel width, in inches, that
** prevents a region from being determined as "blank" or clear.
*/
static int src_rot = 0;
static double gtc_in = .005; // detecting gap between columns
static double gtr_in = .006; // detecting gap between rows
static double gtw_in = .0015; // detecting gap between words
@ -402,6 +403,7 @@ static void bmp_contrast_adjust(WILLUSBITMAP *dest,WILLUSBITMAP *src,double cont
static void bmp_convert_to_greyscale_ex(WILLUSBITMAP *dst, WILLUSBITMAP *src);
static double bmp_autostraighten(WILLUSBITMAP *src, WILLUSBITMAP *srcgrey, int white,
double maxdegrees, double mindegrees, int debug);
static int bmp_rotate_right_angle(WILLUSBITMAP *bmp, int degrees);
static int bmpmupdf_pixmap_to_bmp(WILLUSBITMAP *bmp, fz_context *ctx,
fz_pixmap *pixmap);
static void handle(int wait, ddjvu_context_t *ctx);
@ -452,6 +454,10 @@ static void k2pdfopt_reflow_bmp(MASTERINFO *masterinfo, WILLUSBITMAP *src) {
bmp_alloc(&masterinfo->bmp);
bmp_fill(&masterinfo->bmp, 255, 255, 255);
if (src_rot != 0) {
bmp_rotate_right_angle(src, src_rot);
}
BMPREGION region;
bmp_copy(srcgrey, src);
adjust_contrast(src, srcgrey, &white);
@ -489,7 +495,7 @@ void k2pdfopt_set_params(int bb_width, int bb_height, \
double font_size, double page_margin, \
double line_space, double word_space, \
int wrapping, int straighten, int justification, \
int columns, double contrast) {
int columns, double contrast, int rotation) {
dst_userwidth = bb_width; // dst_width is adjusted in adjust_params_init
dst_userheight = bb_height;
zoom_value = font_size;
@ -499,6 +505,7 @@ void k2pdfopt_set_params(int bb_width, int bb_height, \
src_autostraighten = straighten;
max_columns = columns;
gamma_correction = contrast; // contrast is only used by k2pdfopt_mupdf_reflow
src_rot = rotation;
// margin
dst_mar = page_margin;
@ -6805,6 +6812,137 @@ static double bmp_autostraighten(WILLUSBITMAP *src, WILLUSBITMAP *srcgrey, int w
return (rotdeg);
}
static void bmp_flip_horizontal(WILLUSBITMAP *bmp)
{
int i, j, bpp;
bpp = bmp->bpp / 8;
for (i = 0; i < bmp->height; i++) {
unsigned char *p, *p2;
p = bmp_rowptr_from_top(bmp, i);
p2 = &p[(bmp->width - 1) * bpp];
for (; p < p2; p += bpp, p2 -= bpp)
for (j = 0; j < bpp; j++) {
unsigned char t;
t = p[j];
p[j] = p2[j];
p2[j] = t;
}
}
}
static void bmp_flip_vertical(WILLUSBITMAP *bmp)
{
int i, bw, n;
bw = bmp_bytewidth(bmp);
n = bmp->height / 2;
for (i = 0; i < n; i++) {
unsigned char *p, *p2;
int j;
p = bmp_rowptr_from_top(bmp, i);
p2 = bmp_rowptr_from_top(bmp, bmp->height - i - 1);
for (j = bw; j > 0; j--, p++, p2++) {
unsigned char t;
t = p[0];
p[0] = p2[0];
p2[0] = t;
}
}
}
static int bmp_rotate_90(WILLUSBITMAP *bmp)
{
WILLUSBITMAP *sbmp, _sbmp;
int bpp, dbw, sr;
sbmp = &_sbmp;
bmp_init(sbmp);
if (!bmp_copy(sbmp, bmp))
return (0);
bmp->width = sbmp->height;
bmp->height = sbmp->width;
bpp = bmp->bpp / 8;
if (!bmp_alloc(bmp)) {
bmp_free(sbmp);
return (0);
}
dbw = (int) (bmp_rowptr_from_top(bmp, 1) - bmp_rowptr_from_top(bmp, 0));
for (sr = 0; sr < sbmp->height; sr++) {
unsigned char *sp, *dp;
int j, sc;
sp = bmp_rowptr_from_top(sbmp, sr);
dp = bmp_rowptr_from_top(bmp, bmp->height - 1) + bpp * sr;
for (sc = sbmp->width; sc > 0; sc--, dp -= dbw)
for (j = 0; j < bpp; j++, sp++)
dp[j] = sp[0];
}
bmp_free(sbmp);
return (1);
}
static int bmp_rotate_270(WILLUSBITMAP *bmp)
{
WILLUSBITMAP *sbmp, _sbmp;
int bpp, dbw, sr;
sbmp = &_sbmp;
bmp_init(sbmp);
if (!bmp_copy(sbmp, bmp))
return (0);
bmp->width = sbmp->height;
bmp->height = sbmp->width;
bpp = bmp->bpp / 8;
if (!bmp_alloc(bmp)) {
bmp_free(sbmp);
return (0);
}
dbw = (int) (bmp_rowptr_from_top(bmp, 1) - bmp_rowptr_from_top(bmp, 0));
for (sr = 0; sr < sbmp->height; sr++) {
unsigned char *sp, *dp;
int j, sc;
sp = bmp_rowptr_from_top(sbmp, sr);
dp = bmp_rowptr_from_top(bmp, 0) + bpp * (sbmp->height - 1 - sr);
for (sc = sbmp->width; sc > 0; sc--, dp += dbw)
for (j = 0; j < bpp; j++, sp++)
dp[j] = sp[0];
}
bmp_free(sbmp);
return (1);
}
/*
** 1 = okay, 0 = fail
*/
static int bmp_rotate_right_angle(WILLUSBITMAP *bmp, int degrees)
{
int d;
d = degrees % 360;
if (d < 0)
d += 360;
d = (d + 45) / 90;
if (d == 1)
return (bmp_rotate_90(bmp));
if (d == 2) {
bmp_flip_horizontal(bmp);
bmp_flip_vertical(bmp);
return (1);
}
if (d == 3)
return (bmp_rotate_270(bmp));
return (1);
}
/* bmpmupdf.c */
static int bmpmupdf_pixmap_to_bmp(WILLUSBITMAP *bmp, fz_context *ctx,
fz_pixmap *pixmap)

2
k2pdfopt.h
Unescape Escape View File

@ -30,7 +30,7 @@ void k2pdfopt_set_params(int bb_width, int bb_height, \
double font_size, double page_margin, \
double line_space, double word_space, \
int wrapping, int straighten, int justification, \
int columns, double contrast);
int columns, double contrast, int rotation);
void k2pdfopt_mupdf_reflow(fz_document *doc, fz_page *page, fz_context *ctx);
void k2pdfopt_djvu_reflow(ddjvu_page_t *page, ddjvu_context_t *ctx, ddjvu_render_mode_t mode, ddjvu_format_t *fmt);
void k2pdfopt_rfbmp_size(int *width, int *height);

21
koptconfig.lua
Unescape Escape View File

@ -12,7 +12,7 @@ KOPTOptions = {
current_item=6,
text_dirty=true,
marker_dirty={true, true, true, true, true, true, true, true, true},
value={0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.6, 2.0, 2.6}},
value={0.2, 0.3, 0.4, 0.6, 1.0, 1.2, 1.6, 2.0, 2.6}},
{
name="page_margin",
option_text="Page Margin",
@ -34,12 +34,12 @@ KOPTOptions = {
{
name="word_spacing",
option_text="Word Spacing",
items_text={"small","medium","large"},
default_item=2,
current_item=2,
items_text={"smallest","smaller","small","medium","large"},
default_item=4,
current_item=4,
text_dirty=true,
marker_dirty={true, true, true},
value={0.02, 0.375, 0.5}},
marker_dirty={true, true, true, true, true},
value={0.005, 0.01, 0.02, 0.375, 0.5}},
{
name="text_wrap",
option_text="Text Wrap",
@ -85,6 +85,15 @@ KOPTOptions = {
text_dirty=true,
marker_dirty={true, true, true, true, true},
value={0.2, 0.4, 1.0, 1.8, 2.6}},
{
name="screen_rotation",
option_text="Screen Rotation",
items_text={"0","90","180","270"},
default_item=1,
current_item=1,
text_dirty=true,
marker_dirty={true, true, true, true},
value={0, 90, 180, 270}},
}
KOPTConfig = {

4
koptreader.lua
Unescape Escape View File

@ -12,6 +12,7 @@ Configurable = {
justification = -1,
max_columns = 2,
contrast = 1.0,
screen_rotation = 0,
}
function Configurable:hash(sep)
@ -181,7 +182,8 @@ function KOPTReader:drawOrCache(no, preCache)
local text_wrap, justification = self.configurable.text_wrap, self.configurable.justification
local max_columns, contrast = self.configurable.max_columns, self.configurable.contrast
local auto_straighten = self.configurable.auto_straighten
self.fullwidth, self.fullheight, self.reflow_zoom = page:reflow(dc, self.render_mode, width, height, font_size, page_margin, line_spacing, word_spacing, text_wrap, auto_straighten, justification, max_columns, contrast)
local screen_rotation = self.configurable.screen_rotation
self.fullwidth, self.fullheight, self.reflow_zoom = page:reflow(dc, self.render_mode, width, height, font_size, page_margin, line_spacing, word_spacing, text_wrap, auto_straighten, justification, max_columns, contrast, screen_rotation)
Debug("page::reflowPage:", "fullwidth:", self.fullwidth, "fullheight:", self.fullheight)
if (self.fullwidth * self.fullheight / 2) <= max_cache then

3
pdf.c
Unescape Escape View File

@ -526,9 +526,10 @@ static int reflowPage(lua_State *L) {
int justification = luaL_checkint(L, 12);
int columns = luaL_checkint(L, 13);
double contrast = luaL_checknumber(L, 14);
int rotation = luaL_checknumber(L, 15);
k2pdfopt_set_params(width, height, font_size, page_margin, line_spacing, word_spacing, \
text_wrap, straighten, justification, columns, contrast);
text_wrap, straighten, justification, columns, contrast, rotation);
k2pdfopt_mupdf_reflow(page->doc->xref, page->page, page->doc->context);
k2pdfopt_rfbmp_size(&width, &height);
k2pdfopt_rfbmp_zoom(&dc->zoom);

Write Preview
Loading…
Cancel
Save