Add a few RGB-aware set & blend methods to the blitters #1680

smasher816 · 2023-10-26T16:56:26Z

Add new BB_fill_rect_color and BB_blend_rect_color functions taking a ColorRGB32.
Use a new is_rgb flag in Color structs for lua wrapper to decide which BB_ function to call.
If a ColorRGB32 is passed to fillRect/lightenRect then the new path will be taken. Otherwise original Color8A/uint8_t code is called.

No changes should occur for existing code paths. Callers must be patched to provide RGB colors if desired.
Lua blitbuffer implementation has not been changed.

This change is

smasher816 · 2023-10-26T17:08:24Z

Initial inspiration. koreader/koreader#9024 (comment)

blitbuffer.c

ffi/blitbuffer.lua

smasher816 · 2023-10-26T19:13:59Z

Unrelated, but all of a sudden after pushing to forks I am unable to recompile. Any pointers would be helpful since I haven't touched 3rd-party deps.
I would like to tests my fixes on-device before updating the MR.

dewarp2.c:144:8: error: call to undeclared function 'dewarpBuildPageModel_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return(dewarpBuildPageModel_ex(dew,debugfile,2));
       ^
dewarp2.c:144:8: note: did you mean 'dewarpBuildPageModel'?
dewarp2.c:141:1: note: 'dewarpBuildPageModel' declared here
dewarpBuildPageModel(L_DEWARP    *dew,
^
dewarp2.c:230:9: error: call to undeclared function 'dewarpFindVertDisparity_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
    if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) {
        ^
dewarp2.c:230:9: note: did you mean 'dewarpFindVertDisparity'?
./allheaders.h:654:25: note: 'dewarpFindVertDisparity' declared here
LEPT_DLL extern l_int32 dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag );
                        ^
dewarp2.c:301:8: error: call to undeclared function 'dewarpFindVertDisparity_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2));
       ^
dewarp2.c:1411:8: error: call to undeclared function 'dewarpBuildLineModel_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2));
       ^
4 errors generated.
make[4]: *** [Makefile:823: dewarp2.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: Leaving directory '/home/arch/git/koreader/base/thirdparty/leptonica/build/aarch64-unknown-linux-android21/leptonica-prefix/src/leptonica/src'
make[3]: *** [Makefile:470: install-recursive] Error 1
make[3]: Leaving directory '/home/arch/git/koreader/base/thirdparty/leptonica/build/aarch64-unknown-linux-android21/leptonica-prefix/src/leptonica'
make[2]: *** [Makefile:95: liblept.so] Error 2
make[2]: Leaving directory '/home/arch/git/koreader/base/thirdparty/libk2pdfopt/build/aarch64-unknown-linux-android21/libk2pdfopt-prefix/src/libk2pdfopt'
ninja: build stopped: subcommand failed.
make[1]: *** [Makefile.third:372: build/aarch64-unknown-linux-android21/libs/libk2pdfopt.so.2] Error 1

NiLuJe · 2023-10-27T15:08:25Z

Unrelated

Make sure your submodules are up-to-date and point to the right place (both base's and base itself), then try a make dist-clean?

smasher816 · 2023-10-28T02:08:27Z

Fixed the above. A fresh clone also had issues so I figured out it was something with the machine and not the koreader repo.
After looking into env I found the following unexpectedly set.

profile.d/android-ndk.sh
2:export ANDROID_NDK=/opt/android-ndk
4:export ANDROID_NDK_HOME=/opt/android-ndk
6:export ANDROID_NDK_ROOT=/opt/android-ndk

It looks like installing a system package added those variables by default.

$ pacman -Qo /etc/profile.d/android-ndk.sh
/etc/profile.d/android-ndk.sh is owned by android-ndk r26.b-1

Unsetting the above fixed everything and now I can compile again. I'll work on resolving your comments.

smasher816 · 2023-10-28T03:23:29Z

New revision should have support for other screentypes and for real color blending (stacking multiple highlights makes the color get stronger and stronger).

smasher816 · 2023-10-28T13:57:57Z

Newest revision supports color pdf highlights. If new bb_color arg is not passed then the existing defaults are used.

blitbuffer.c

NiLuJe

I've pushed some minor simplifications, but have NOT tested them, I've just checked that it built (and was generating similar machine code before actual logic deviations were implemented ;p).

Reviewed 1 of 3 files at r2, 3 of 3 files at r3, 1 of 1 files at r4, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @smasher816)

NiLuJe

Reviewed 1 of 1 files at r5, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @smasher816)

poire-z · 2023-11-17T19:28:33Z

Is this ok? (I mean: ready to merge?)

NiLuJe · 2023-11-17T19:39:45Z

Needs testing ;).

NiLuJe · 2024-01-21T07:14:12Z

@poire-z: Because I'm super lazy, If you have a random test file with colored text on hand, that could come in handy. Thanks ;).

poire-z · 2024-01-21T09:26:43Z

Because I'm super lazy,

I know :)
Here's 2 of my test.html files where I tested various text & bg colors: test-color-stuff.zip
Any Wikipedia saved as EPUB will probably have various kinds of colored images if you need more.

And re-implement RGB32 fast path

(Jokes aside, we tend to prefer that syntatcit sugar (and string methods) as opposed to calling string.fn(obj) explicitly).

Requires a few bendRGB32 shims for Color <= 8A, as the usual blend methods assume Color8 input.

Which is the one we actually care about, as we don't actually have any colorblitFromRGB32 callers ;).

To deal with highlights on sw nightmode...

Implement a grayscale and a color one, like other setters Instead of implementing a full array of per-color type blend methods

And round the component values to 16 shades per component.

We often need a copy anyway, so take the opportunity to make this safer ;)

This allows us to fairly easily make gray behave as our legacy grayscale highlights, honoring the user's opacity value.

Matches what I did for BB_color_blit_from_RGB32

These are unsigned, they can't be negative ;).

NiLuJe

Reviewed 4 of 4 files at r8, 1 of 1 files at r9, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @smasher816)

Apparently, 8 wasn't enough, the highlight style dialog was still cutoff :/

dithering. So, rejig that so we can tweak that on a per-device basis, too.

NiLuJe · 2024-08-26T22:47:43Z

Hey, look, I've finally gotten around to finish this before the PR's first birthday ;p.

(I basically just want to test a few color changes tomorrow, but other than that, it's ready).

NiLuJe · 2024-08-27T10:16:17Z

ChangeLog:

BlitBuffer: Added a fill_rect variant that takes an RGB32 color as input
BlitBuffer: Added a couple of blend OVER & blend MUL methods to handle color highlights
BlitBuffer: Added a color_blit_from variant that takes an RGB32 color as input
C BlitBuffer: Fix a few minor compiler warnings
BlitBuffer: Rename the awfully named dimRect & lightenRect methods to lightenRect & darkenRect, respectively. Because they did the opposite of what it said on the tin. Added more comments explaining the results to avoid further confusion.
BlitBuffer: Defined a set of highlight colors as BB.HIGHLIGHT_COLORS (user patchable), most of them having a more pastel variant because those look slightly less terrible on Kaleido panels.
BlitBuffer: Added a few miscellaneous methods to ease working with this in front.
Kobo MTK: Increased the alignment constraint, because the HL color popup was getting cut off.
MuPDF: Support color annotations in addMarkupAnnotation

NiLuJe

Reviewed 1 of 1 files at r10, 1 of 1 files at r11, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @smasher816)

NiLuJe · 2024-08-27T10:51:09Z

Commit history will be archived in my color-highlights branch

koreader/koreader-base#1894 koreader/koreader-base#1908 koreader/koreader-base#1909 koreader/koreader-base#1904 koreader/koreader-base#1910 koreader/koreader-base#1911 koreader/koreader-base#1912 koreader/koreader-base#1901 koreader/koreader-base#1913 koreader/koreader-base#1680 koreader/koreader-base#1915 koreader/koreader-base#1916 koreader/koreader-base#1914

smasher816 mentioned this pull request Oct 26, 2023

Add color highlight menu koreader/koreader#11044

Merged

NiLuJe reviewed Oct 26, 2023

View reviewed changes

blitbuffer.c Outdated Show resolved Hide resolved

NiLuJe reviewed Oct 26, 2023

View reviewed changes

blitbuffer.c Show resolved Hide resolved

NiLuJe reviewed Oct 26, 2023

View reviewed changes

blitbuffer.c Show resolved Hide resolved

NiLuJe reviewed Oct 26, 2023

View reviewed changes

ffi/blitbuffer.lua Outdated Show resolved Hide resolved

smasher816 force-pushed the master branch from ce6597a to ab2d287 Compare October 28, 2023 03:21

smasher816 force-pushed the master branch from ab2d287 to a962a43 Compare October 28, 2023 13:56

NiLuJe reviewed Oct 28, 2023

View reviewed changes

blitbuffer.c Outdated Show resolved Hide resolved

smasher816 force-pushed the master branch 2 times, most recently from c610c9a to df9fb03 Compare October 30, 2023 19:05

NiLuJe reviewed Nov 1, 2023

View reviewed changes

Galunid mentioned this pull request Jan 14, 2024

FR: [Add more highlight color options] koreader/koreader#9024

Closed

NiLuJe force-pushed the master branch from a58cb2f to 73ac82b Compare January 21, 2024 05:44

NiLuJe marked this pull request as draft January 21, 2024 06:27

NiLuJe changed the title ~~Add initial RGB painting support to C blitbuffer~~ Add a few RGB-aware set & blend methods to the blitters Jan 22, 2024

smasher816 and others added 4 commits August 25, 2024 19:48

Add RGB Highlights

c924cf8

Simplify BB_fill_rect_color

4ac358c

And re-implement RGB32 fast path

hashception!

ca873ab

(Jokes aside, we tend to prefer that syntatcit sugar (and string methods) as opposed to calling string.fn(obj) explicitly).

can't do that, it horribly break AA

54c4833

NiLuJe added 11 commits August 25, 2024 19:48

Implement setPixelColorizeRGB32 in the Lua blitter

b00c2e6

Requires a few bendRGB32 shims for Color <= 8A, as the usual blend methods assume Color8 input.

And implement setPixelMultiply in the Lua blitter

609ffaf

Which is the one we actually care about, as we don't actually have any colorblitFromRGB32 callers ;).

Implement blendRectRGB32

9f7c6be

To deal with highlights on sw nightmode...

LuaCheck'ed

1cd0a45

Simplify setPixelColorizeRGB32

341f05e

Implement a grayscale and a color one, like other setters Instead of implementing a full array of per-color type blend methods

Make colorblitFromRGB32 safer

c9a3cad

make red redder, and less carrot soup

bad4ea5

Tweak colors some more

7d457d3

And round the component values to 16 shades per component.

Make sure we cast colors to the right type first

6e8277a

We often need a copy anyway, so take the opportunity to make this safer ;)

More logical color orders

5c6534d

Drop gray from the highlight colors, and let colorFromName return nil

a7710f9

This allows us to fairly easily make gray behave as our legacy grayscale highlights, honoring the user's opacity value.

NiLuJe force-pushed the master branch from 90fbdde to a7710f9 Compare August 25, 2024 17:52

NiLuJe added 4 commits August 26, 2024 19:22

Tighter scope for source_y8

94ffa8e

Matches what I did for BB_color_blit_from_RGB32

Fix a -Wunused-parameter warning

53f5dfb

Fix a -Wsign-compare warning

0942857

Fix a truckload of -Wtype-limits warnings

171c10d

These are unsigned, they can't be negative ;).

NiLuJe reviewed Aug 26, 2024

View reviewed changes

NiLuJe added 3 commits August 26, 2024 21:32

Increase the alignment constraint on Kobo MTK

bd56c8c

Apparently, 8 wasn't enough, the highlight style dialog was still cutoff :/

Eeh, go back down to 8, it doesn't help for REAGL -_-".

99f302e

Oh, no, I'd just forgotten that we enforced different constraints when

824488c

dithering. So, rejig that so we can tweak that on a per-device basis, too.

NiLuJe marked this pull request as ready for review August 26, 2024 22:46

Add a sliiightly more pastel green

24b5f0f

NiLuJe reviewed Aug 27, 2024

View reviewed changes

NiLuJe merged commit dbe9f09 into koreader:master Aug 29, 2024
4 checks passed

NiLuJe mentioned this pull request Sep 3, 2024

PDF annotation not saved on file in latest version koreader/koreader#12186

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a few RGB-aware set & blend methods to the blitters #1680

Add a few RGB-aware set & blend methods to the blitters #1680

smasher816 commented Oct 26, 2023 •

edited by Frenzie

Loading

smasher816 commented Oct 26, 2023

smasher816 commented Oct 26, 2023

NiLuJe commented Oct 27, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

NiLuJe left a comment

NiLuJe left a comment

poire-z commented Nov 17, 2023 •

edited

Loading

NiLuJe commented Nov 17, 2023

NiLuJe commented Jan 21, 2024

poire-z commented Jan 21, 2024

NiLuJe left a comment

NiLuJe commented Aug 26, 2024

NiLuJe commented Aug 27, 2024 •

edited

Loading

NiLuJe left a comment

NiLuJe commented Aug 27, 2024

Add a few RGB-aware set & blend methods to the blitters #1680

Add a few RGB-aware set & blend methods to the blitters #1680

Conversation

smasher816 commented Oct 26, 2023 • edited by Frenzie Loading

smasher816 commented Oct 26, 2023

smasher816 commented Oct 26, 2023

NiLuJe commented Oct 27, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe left a comment

Choose a reason for hiding this comment

poire-z commented Nov 17, 2023 • edited Loading

NiLuJe commented Nov 17, 2023

NiLuJe commented Jan 21, 2024

poire-z commented Jan 21, 2024

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe commented Aug 26, 2024

NiLuJe commented Aug 27, 2024 • edited Loading

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe commented Aug 27, 2024

smasher816 commented Oct 26, 2023 •

edited by Frenzie

Loading

poire-z commented Nov 17, 2023 •

edited

Loading

NiLuJe commented Aug 27, 2024 •

edited

Loading