diff --git a/USAGE.md b/USAGE.md index be8156470..fe5c2b635 100644 --- a/USAGE.md +++ b/USAGE.md @@ -1030,7 +1030,7 @@ int ncplane_at_yx_cell(struct ncplane* n, int y, int x, nccell* c); // 'pxdimx' are non-NULL, they will be filled in with the pixel geometry. uint32_t* ncplane_as_rgba(const struct ncplane* n, ncblitter_e blit, int begy, int begx, int leny, int lenx, - int *pxdimy, int *pxdimx); + int* pxdimy, int* pxdimx); // return a nul-terminated, heap copy of the current (UTF-8) contents. char* ncplane_contents(const struct ncplane* nc, int begy, int begx, diff --git a/cffi/src/notcurses/build_notcurses.py b/cffi/src/notcurses/build_notcurses.py index 49395b484..446f72476 100644 --- a/cffi/src/notcurses/build_notcurses.py +++ b/cffi/src/notcurses/build_notcurses.py @@ -129,7 +129,7 @@ typedef enum { } ncblitter_e; const char* notcurses_str_blitter(ncblitter_e blitter); int notcurses_lex_blitter(const char* op, ncblitter_e* blitter); -uint32_t* ncplane_rgba(const struct ncplane* nc, ncblitter_e blit, int begy, int begx, int leny, int lenx); +uint32_t* ncplane_as_rgba(const struct ncplane* nc, ncblitter_e blit, int begy, int begx, int leny, int lenx, int* pxdimy, int* pxdimx); char* ncplane_contents(const struct ncplane* nc, int begy, int begx, int leny, int lenx); void* ncplane_set_userptr(struct ncplane* n, void* opaque); void* ncplane_userptr(struct ncplane* n); diff --git a/include/notcurses/notcurses.h b/include/notcurses/notcurses.h index 7685d92c8..7d7fef57d 100644 --- a/include/notcurses/notcurses.h +++ b/include/notcurses/notcurses.h @@ -2465,7 +2465,7 @@ struct ncvisual_options { // 'pxdimx' are non-NULL, they will be filled in with the pixel geometry. API ALLOC uint32_t* ncplane_as_rgba(const struct ncplane* n, ncblitter_e blit, int begy, int begx, int leny, int lenx, - int *pxdimy, int *pxdimx) + int* pxdimy, int* pxdimx) __attribute__ ((nonnull (1))); // Deprecated in favor of ncplane_as_rgba. This will be removed in ABI3. diff --git a/src/lib/notcurses.c b/src/lib/notcurses.c index b7e21368b..65215f426 100644 --- a/src/lib/notcurses.c +++ b/src/lib/notcurses.c @@ -2426,7 +2426,7 @@ int ncdirect_inputready_fd(ncdirect* n){ uint32_t* ncplane_as_rgba(const ncplane* nc, ncblitter_e blit, int begy, int begx, int leny, int lenx, - int *pxdimy, int *pxdimx){ + int* pxdimy, int* pxdimx){ const notcurses* ncur = ncplane_notcurses_const(nc); if(begy < 0 || begx < 0){ logerror(ncur, "Nil offset (%d,%d)\n", begy, begx); diff --git a/src/lib/visual.c b/src/lib/visual.c index 6849f37a3..6398ecb44 100644 --- a/src/lib/visual.c +++ b/src/lib/visual.c @@ -684,7 +684,7 @@ ncplane* ncvisual_render(notcurses* nc, ncvisual* ncv, const struct ncvisual_opt } int placey = vopts ? vopts->y : 0; int placex = vopts ? vopts->x : 0; -fprintf(stderr, "beg/len: %d %d %d %d place: %d/%d scale: %d/%d\n", begy, leny, begx, lenx, placey, placex, encoding_y_scale(&nc->tcache, bset), encoding_x_scale(&nc->tcache, bset)); +//fprintf(stderr, "beg/len: %d %d %d %d place: %d/%d scale: %d/%d\n", begy, leny, begx, lenx, placey, placex, encoding_y_scale(&nc->tcache, bset), encoding_x_scale(&nc->tcache, bset)); ncplane* n = (vopts ? vopts->n : NULL); //fprintf(stderr, "%p tacache: %p\n", n, n->tacache); ncscale_e scaling = vopts ? vopts->scaling : NCSCALE_NONE;