MuPDF 1.12 #577

TnS-hun · 2017-12-15T17:11:08Z

No description provided.

… unused with and height

…tion

…er needed

Requires changes to PdfDocument:saveHighlight too (that is outside of base).

TnS-hun · 2017-12-15T17:15:49Z

Closes #562.

Frenzie · 2017-12-15T19:43:39Z

thirdparty/mupdf/CMakeLists.txt


 # TODO: ignore shared git submodules built outside of mupdf by ourselves
+# https://git.ghostscript.com/mupdf.git is slow, so we use the official mirror on GitHub
+# v1.12 isn't tagged, so we refer to it with a hash


The tag 1.12.0 seems to have been added two days ago, which I think is a lot more legible than that hash below. ;-)

Frenzie · 2017-12-15T19:45:55Z

The shellchecks speak for themselves:

ffi/mupdf.lua:398:11: unused variable 'char_bbox'
ffi/mupdf.lua:416:1: line contains only whitespace

Then there's Android.

Setting up a basic Android build system is fairly easy (./kodev build android should take care of it all; see the README for the rest) but testing Android isn't necessarily self-evident. Hopefully I can find some time for that tomorrow but I'm not guaranteeing it.

Thanks for all the work!

houqp · 2017-12-16T06:42:54Z

Great work! Thanks for keeping this giant dependency uptodate :)

Frenzie · 2017-12-16T19:08:41Z

thirdparty/mupdf/CMakeLists.txt

@@ -69,7 +69,7 @@ ep_get_source_dir(SOURCE_DIR)
 ko_write_gitclone_script(
    GIT_CLONE_SCRIPT_FILENAME
    https://github.com/ArtifexSoftware/mupdf.git
-    b7749e563f93160de82c97fe34fb3fb0d3396304
+    tags/1.12.0


You forgot to remove the comment up above. ;-)

Frenzie · 2017-12-16T19:51:18Z

Alright, I have a few minutes now. I ascertained that it seems to be working on PC and building for Android. Should I also test it on Android or were you already able to?

TnS-hun · 2017-12-16T20:30:06Z

I just built it on Android.

TnS-hun · 2017-12-16T20:46:49Z

I tried to build the apk with ./kodev release android but it failed:

[armeabi-v7a] Install        : libluajit.so => libs/armeabi-v7a/libluajit.so
[armeabi-v7a] Install        : liblzma.so => libs/armeabi-v7a/liblzma.so
make[3]: Leaving directory `/home/tns/source/koreader/platform/android/luajit-launcher'
ant debug
make[2]: execvp: ant: Permission denied
make[2]: *** [apk] Error 127
make[2]: Leaving directory `/home/tns/source/koreader/platform/android/luajit-launcher'
make[1]: *** [androidupdate] Error 2
make[1]: Leaving directory `/home/tns/source/koreader'
Makefile:340: recipe for target 'update' failed
make: *** [update] Error 2

Frenzie · 2017-12-16T20:47:10Z

It seems to be working. :-)

I'll hold off on merging another day or two. I haven't been able to read it properly yet myself.

Frenzie · 2017-12-16T20:50:17Z

make[2]: execvp: ant: Permission denied

Huh, weird. I have version 1.9.9.

PS "I haven't been able to read it properly yet myself" and I'm sure others might want to take a look first too, pinging @houqp (who already took a peek) @chrox @NiLuJe .

houqp · 2017-12-18T04:19:44Z

@TnS-hun are you able to run ant manually?

TnS-hun · 2017-12-18T20:47:55Z

@houqp: that was the problem, ant wasn't installed. I should've read the readme more carefully.

I tried to run the resulting apk with Genymotion Android Emulator but it didn't start. I tried the last two KOReader releases too but got the same result.

Frenzie · 2017-12-18T20:52:55Z

@TnS-hun On PC I'd use x86 builds. Anyway like I said wfm after your patch. :-)

Frenzie

Did I miss simple-out.pdf being used in the unit tests somewhere or is that an accidental include?

Frenzie · 2017-12-18T20:59:39Z

ffi-cdecl/mupdf_decl.c

-cdecl_type(fz_text_sheet)
-cdecl_struct(fz_text_sheet_s)
-cdecl_func(mupdf_new_text_sheet)
-cdecl_func(fz_drop_text_sheet) // NOTE: libk2pdfopt uses old fz_free_text_sheet symbol


What about these comments? Do they no longer apply?

The fz_drop_text_sheet function no longer exists.

I don't think those comments are relevant anymore because libk2pdfopt is built without using MuPDF (HAVE_MUPDF_LIB).

Frenzie · 2017-12-18T20:59:46Z

ffi-cdecl/mupdf_decl.c

-cdecl_type(fz_page_block)
-cdecl_struct(fz_text_page_s)
-cdecl_func(mupdf_new_text_page)
-cdecl_func(fz_drop_text_page) // NOTE: libk2pdfopt uses old fz_free_text_page symbol


And this one.

That cdecl and the comment are still there but fz_drop_text_page has been renamed to fz_drop_stext_page.

Frenzie · 2017-12-18T21:00:58Z

ffi/mupdf.lua

    return c == 0x2022 or --  Bullet
        c == 0x2023 or --  Triangular bullet
+        c == 0x25a0 or --  Black square


Is there supposed to be an order to these?

I don't know if there is any order here — maybe number of occurances? —, so the three I added has been simply ordered by value.

Frenzie · 2017-12-18T21:04:54Z

ffi/mupdf.lua

    elseif ncomp == 4 then bbtype = BlitBuffer.TYPE_BBRGB32
    else error("unsupported number of color components")
    end
    local p = M.fz_pixmap_samples(context(), pixmap)
    local bb = BlitBuffer.new(p_width, p_height, bbtype, p):copy()
    M.fz_drop_pixmap(context(), pixmap)
-    M.fz_drop_image(context(), image)


This was already done earlier or is it no longer necessary?

It's done earlier, as suggested by poire-z, so the error handling is cleaner.

Frenzie · 2017-12-18T21:05:37Z

ffi/mupdf_h.lua

 typedef void fz_store_drop_fn(fz_context *, fz_storable *);
 struct fz_storable_s {
  int refs;
  fz_store_drop_fn *drop;
 };
+struct fz_key_storable_s {
+  fz_storable storable;


Four-space indentation, right? :-)

(I know, old file.)

That's generated code by ffi-cdecl. :)

TnS-hun · 2017-12-19T20:31:02Z

Did I miss simple-out.pdf being used in the unit tests somewhere or is that an accidental include?

Simple-out.pdf is used by the unit test to compare the tested and the expected output. I had to update it because the output by MuPDF v1.12 is a bit different.

Frenzie · 2017-12-20T11:10:04Z

Alright, thanks! Please include the base update in koreader/koreader#3547

* addMarkupAnnotation expects a float array * Use the latest from koreader-base with koreader/koreader-base#577 Closes #3519.

TnS-hun and others added 25 commits December 15, 2017 18:07

Updated to MuPDF 1.12

e6f1aa1

mupdf_new_pixmap_with_data missed parameters

826859b

Make all parameters of fz_get_pixmap_from_image available, remove the…

962d94d

… unused with and height

Drop buffer and image as soon as possible as per poire-z's recommenda…

5dfbad5

…tion

encrypted zip patch for MuPDF 1.12

3ba30a5

external fonts patch for MuPDF 1.12

44d9736

Use libjpeg as a shared library

7136f55

Wrong patch number

9144221

git.ghostscript.com is slow, so we use the official mirror on GitHub

968fb9e

html-font patch, just enough to test html & epub rendering

c5455e4

TOC segmentation fault fix

fb7670f

Regenerated mupdf_h.lua with ffi-cdecl

84bb6dc

fz_scale_pixmap was missing

c1eee61

fz_new_text_page has been renamed to fz_new_stext_page

7ea4d64

Fixed most of the warnings caused by the patches and wrap-mupdf.c

f24310e

Wrong mupdf_new_text_page parameters, mupdf_new_text_sheet is no long…

a9fc268

…er needed

getPageText works again

3677ae9

Adding higlights almost works (width is 50% off), PDF saving works

bfa8d9c

Requires changes to PdfDocument:saveHighlight too (that is outside of base).

Fixed wrong number of arguments for mupdf_new_pixmap_with_bbox

b0c4bd9

Do not select bullet points

347ad39

The incompatible bb error messages show the blitbuffer types

17ab6da

Support blitting from RGB24 to RGB32 in BB_alpha_blit_from

5b68329

getPageText returned everything twice

185cb81

Unit test update

2b9058a

vec_dot fix

5008599

TnS-hun mentioned this pull request Dec 15, 2017

MuPDF 1.12 koreader/koreader#3547

Merged

Frenzie reviewed Dec 15, 2017

View reviewed changes

TnS-hun added 2 commits December 16, 2017 19:42

MuPDF v1.12.0 has been tagged, use that

99396fb

Removed unused variable

a529c65

Frenzie reviewed Dec 16, 2017

View reviewed changes

TnS-hun added 2 commits December 16, 2017 20:28

'SIZE_MAX' was undeclared on Android

5c4e351

Forgot to remove the comment about the v1.12.0 tag

d269c44

Frenzie added the enhancement label Dec 16, 2017

Frenzie reviewed Dec 18, 2017

View reviewed changes

Frenzie merged commit bd97e1b into koreader:master Dec 20, 2017

Frenzie mentioned this pull request Dec 20, 2017

Notes on updating MuPDF #562

Closed

Frenzie pushed a commit to koreader/koreader that referenced this pull request Dec 20, 2017

MuPDF 1.12 (#3547)

89164dc

* addMarkupAnnotation expects a float array * Use the latest from koreader-base with koreader/koreader-base#577 Closes #3519.

TnS-hun deleted the patch-mupdf-update branch December 20, 2017 19:34

Frenzie mentioned this pull request Sep 30, 2020

Bump mupdf, kopt, lept and tess #1203

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MuPDF 1.12 #577

MuPDF 1.12 #577

TnS-hun commented Dec 15, 2017

TnS-hun commented Dec 15, 2017

Frenzie Dec 15, 2017

Frenzie commented Dec 15, 2017 •

edited

Loading

houqp commented Dec 16, 2017

Frenzie Dec 16, 2017

TnS-hun Dec 16, 2017

Frenzie commented Dec 16, 2017

TnS-hun commented Dec 16, 2017 •

edited

Loading

TnS-hun commented Dec 16, 2017

Frenzie commented Dec 16, 2017

Frenzie commented Dec 16, 2017

houqp commented Dec 18, 2017

TnS-hun commented Dec 18, 2017

Frenzie commented Dec 18, 2017

Frenzie left a comment

Frenzie Dec 18, 2017

TnS-hun Dec 19, 2017

Frenzie Dec 18, 2017

TnS-hun Dec 19, 2017

Frenzie Dec 18, 2017

TnS-hun Dec 19, 2017

Frenzie Dec 18, 2017

TnS-hun Dec 19, 2017

Frenzie Dec 18, 2017

TnS-hun Dec 19, 2017

TnS-hun commented Dec 19, 2017

Frenzie commented Dec 20, 2017

MuPDF 1.12 #577

MuPDF 1.12 #577

Conversation

TnS-hun commented Dec 15, 2017

TnS-hun commented Dec 15, 2017

Choose a reason for hiding this comment

Frenzie commented Dec 15, 2017 • edited Loading

houqp commented Dec 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Frenzie commented Dec 16, 2017

TnS-hun commented Dec 16, 2017 • edited Loading

TnS-hun commented Dec 16, 2017

Frenzie commented Dec 16, 2017

Frenzie commented Dec 16, 2017

houqp commented Dec 18, 2017

TnS-hun commented Dec 18, 2017

Frenzie commented Dec 18, 2017

Frenzie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TnS-hun commented Dec 19, 2017

Frenzie commented Dec 20, 2017

Frenzie commented Dec 15, 2017 •

edited

Loading

TnS-hun commented Dec 16, 2017 •

edited

Loading