-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
(Upstream) Various minor picks to keep some bits in sync #450
Conversation
Gently reminding @Frenzie about #443 (comment) :) |
@poire-z If you rebase and force push I figure it should run. |
Nope, same issue as #451 (comment) |
c2d6ce6
to
c38f97c
Compare
It ran ! |
d46c5bd
to
d153b65
Compare
Thanks for #452 (comment) I still don't get why I dont see the running/results icons, or after a delay... Anyway, clang-tidy complains with this that I hadn't seen before:
Pinging @NiLuJe if that talks to you, if it's related to the recent introduction of offsetof() in 604132a - if it's something to be solved or if we can silent these via some pragma. |
I see the problem; I made the same mistake a year and a half ago. :-D |
@poire-z Will you attach the change as a separate commit in this PR (since we're rebasing it anyway), or would you prefer I stick it in a separate PR? |
Picked from d57a2913 ("more correct comparison of the language tag", which includes fixes to things we didn't pick).
Avoids making separate sentences when meeting inline elements.
Use it for parsing gamma. Avoid sscanf() expecing ',' instead of provided '.' with some locales.
d153b65
to
7d41728
Compare
Done, and seeing that mellow yellow dot and seeing it become green, thanks ! |
So, when I fork a project that uses GH Actions, these actions will run on my fork too. When I push a PR, the action runs both on my repo (47s the last one) and on koreader's repo (40s the last one, so not the same). |
It doesn't simply regard them as the same run like CircleCI does? |
I don't think so, it doesn't look like these 2 runs are the sames. |
Perhaps https://github.com/marketplace/actions/skip-duplicate-actions can help. But at the very least that's not for this PR. ^_^ |
@NiLuJe : any thoughts about #450 (comment) ? |
Haven't forgotten about it, but haven't had time to actually look into it yet ;p. |
- Sanitizer error fixed in chmlib: chmlib/src/lzx.c:569:25: runtime error: left shift of 65404 by 16 places cannot be represented in type 'int'. - Fixed incorrect parsing of content file in 'chm' files. Details: tag auto-closing did not work. - Fixed null pointer dereferencing when parsing 'chm' files.
Fix possible integer overflow when measuring text with fallback fonts (HarfBuzz render).
Added 2 commits picked from buggins/coolreader#308. |
Merging, as all is merged upstream. |
Pinging again @NiLuJe about #450 (comment) (still happening , ie in https://github.com/koreader/crengine/runs/4340698048?check_suite_focus=true) |
Last I checked it's because it's a class or something, but we tested the code on its own and it behaves, so, meh :/. |
But it's not a class, it's a classic struct. May be it's because the functions that use it are defined inside the stuct, so before it's fully defined?
I know it behave, I'm just trying to (make you) kill introduced false positives so it doesn't bug us in CI output in unrelated PRs. |
Nope, that's not it. |
I can't even silence it with https://stackoverflow.com/questions/49206519/not-able-to-use-offsetof-with-clang-compiler-using-libc-and-c14 |
Picking what we can easily from buggins/coolreader#304 and buggins/coolreader#307:
Many other things not picked as they touch mostly the UI<->Core interface and we have already diverged too much, so even if I would have liked picking buggins/coolreader@2d693aedd44c93 to keep much of that in sync, I didn't as we have diverged because of previous added things that we didn't need and I didn't picked at the time :/
Also, some top status bar refactoring that couldn't be integrated because we did some changes on our side, and upstream did too (ability to put this status bar at the bottom that we obviously didn't need, etc...)
So, well, that's how it is - with lvdocview.cpp having to be a bit of their version of our cre.cpp.
The LVDrawBookCover will need some fixes to cre.cpp, because we have its call in a method we don't use - so I'll comment out our drawCoverPage() and cursorRight().
This change is