Clip it right

erkkah · Feb 28, 2022 · 29f9364 · 29f9364
1 parent 1d89c79
commit 29f9364
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/tigr_bitmaps.c b/src/tigr_bitmaps.c
@@ -298,7 +298,13 @@ TPixel tigrGet(Tigr* bmp, int x, int y) {
 
 void tigrPlot(Tigr* bmp, int x, int y, TPixel pix) {
     int xa, i, a;
-    if (x >= bmp->cx && y >= bmp->cy && x < bmp->cx + bmp->cw && y < bmp->cy + bmp->h) {
+
+    int cx = bmp->cx;
+    int cy = bmp->cy;
+    int cw = bmp->cw >= 0 ? bmp->cw : bmp->w;
+    int ch = bmp->ch >= 0 ? bmp->ch : bmp->h;
+
+    if (x >= cx && y >= cy && x < cx + cw && y < cy + ch) {
         xa = EXPAND(pix.a);
         a = xa * xa;
         i = y * bmp->w + x;

diff --git a/tigr.c b/tigr.c
@@ -548,7 +548,13 @@ TPixel tigrGet(Tigr* bmp, int x, int y) {
 
 void tigrPlot(Tigr* bmp, int x, int y, TPixel pix) {
     int xa, i, a;
-    if (x >= bmp->cx && y >= bmp->cy && x < bmp->cx + bmp->cw && y < bmp->cy + bmp->h) {
+
+    int cx = bmp->cx;
+    int cy = bmp->cy;
+    int cw = bmp->cw >= 0 ? bmp->cw : bmp->w;
+    int ch = bmp->ch >= 0 ? bmp->ch : bmp->h;
+
+    if (x >= cx && y >= cy && x < cx + cw && y < cy + ch) {
         xa = EXPAND(pix.a);
         a = xa * xa;
         i = y * bmp->w + x;