extmod/modframebuf: Enable blit between different formats. #7682
Conversation
911bf6d to
1af7174
Compare
|
Please could someone advise on the AppVeyor failure: the log is completely baffling to me :-( |
|
Errors are at the end of the log: '1 tests failed: extreme_exc' which is a known issue see e.g. PR 7659 |
|
Sorry about this, took a while to figure out (see discussion in #7659). The fix was just merged a couple of hours ago though, so you could force-push to trigger a re-test (or just happily ignore it). Thanks for re-sending the PR, still looks good :) |
extmod/modframebuf.c
Outdated
| @@ -491,7 +491,11 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) { | |||
| if (n_args > 4) { | |||
| key = mp_obj_get_int(args[4]); | |||
| } | |||
|
|
|||
| mp_obj_framebuf_t *palette = (mp_obj_framebuf_t *)MP_OBJ_NULL; | |||
There was a problem hiding this comment.
The two (mp_obj_framebuf_t *)MP_OBJ_NULL (this line and below) should be just regular NULL.
MP_OBJ_NULL is an mp_obj_t encoding of NULL. But in this case you have a pointer (mp_obj_framebuf_t*), not an mp_obj_t, so you should be using NULL.
mp_obj_cast_to_native_base will return MP_OBJ_NULL (or a valid mp_obj_t), and then MP_OBJ_TO_PTR will convert that to NULL.
(What you had works because under the hood, mp_obj_t and pointers are actually (usually) encoded exactly the same way -- MP_OBJ_NULL is actually equal to NULL).
extmod/modframebuf.c
Outdated
| @@ -514,6 +518,9 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) { | |||
| int cx1 = x1; | |||
| for (int cx0 = x0; cx0 < x0end; ++cx0) { | |||
| uint32_t col = getpixel(source, cx1, y1); | |||
| if (palette != (mp_obj_framebuf_t *)MP_OBJ_NULL) { | |||
1af7174 to
6ad1f7b
Compare
Codecov Report
@@ Coverage Diff @@
## master #7682 +/- ##
=======================================
Coverage 98.25% 98.25%
=======================================
Files 154 154
Lines 20071 20077 +6
=======================================
+ Hits 19721 19727 +6
Misses 350 350
Continue to review full report at Codecov.
|
|
This is a very neat addition, nice and simple yet powerful. Thank you very much! Merged in 2296df0 |
This replaces #7666 which included cruft which I was unable to remove.