Changeset 32066f2 in mainline for uspace/lib

Timestamp:

2020-08-27T11:24:39Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e2776ff

Parents:

20d0098

git-author:

Jiri Svoboda <jiri@…> (2020-08-26 18:34:29)

git-committer:

Jiri Svoboda <jiri@…> (2020-08-27 11:24:39)

Message:

Need to be able to paint in the negative quadrants

Location:

uspace/lib

Files:

• gfx/include/gfx/coord.h (modified) (1 diff)
• gfx/src/coord.c (modified) (1 diff)
• gfxfont/include/gfx/glyph_bmp.h (modified) (1 diff)
• gfxfont/src/glyph_bmp.c (modified) (1 diff)

uspace/lib/gfx/include/gfx/coord.h

@@ -40 +40 @@
 #include <types/gfx/coord.h>
 
+extern gfx_coord_t gfx_coord_div_rneg(gfx_coord_t, gfx_coord_t);
 extern void gfx_coord2_add(gfx_coord2_t *, gfx_coord2_t *, gfx_coord2_t *);
 extern void gfx_coord2_subtract(gfx_coord2_t *, gfx_coord2_t *, gfx_coord2_t *);

uspace/lib/gfx/src/coord.c

@@ -39 +39 @@
 #include <stddef.h>
 
+/** Divide @a a by @a b and round towards negative numbers.
+ *
+ * Regular integer division always rounds towards zero. This is not useful
+ * e.g. for scaling down, where we always need to round towards negative
+ * numbers.
+ *
+ * @param a Dividend
+ * @param b Divisor
+ * @return Quotient
+ */
+gfx_coord_t gfx_coord_div_rneg(gfx_coord_t a, gfx_coord_t b)
+{
+        if ((a > 0 && b > 0) || (a < 0 && b < 0)) {
+                /* Result is non-negative, round towards zero */
+                return a / b;
+        } else {
+                /* Result is negative, round away from zero */
+                return (a - b + 1) / b;
+        }
+}
+
 /** Add two vectors.
  *

uspace/lib/gfxfont/include/gfx/glyph_bmp.h

@@ -45 +45 @@
 extern errno_t gfx_glyph_bmp_save(gfx_glyph_bmp_t *);
 extern void gfx_glyph_bmp_close(gfx_glyph_bmp_t *);
+extern void gfx_glyph_bmp_get_rect(gfx_glyph_bmp_t *, gfx_rect_t *);
 extern int gfx_glyph_bmp_getpix(gfx_glyph_bmp_t *, gfx_coord_t, gfx_coord_t);
 extern errno_t gfx_glyph_bmp_setpix(gfx_glyph_bmp_t *, gfx_coord_t,

uspace/lib/gfxfont/src/glyph_bmp.c

@@ -165 +165 @@
 }
 
+/** Get rectangle covered by glyph bitmap.
+ *
+ * @param bmp Glyph bitmap
+ * @param rect Place to store rectangle
+ */
+void gfx_glyph_bmp_get_rect(gfx_glyph_bmp_t *bmp, gfx_rect_t *rect)
+{
+        *rect = bmp->rect;
+}
+
 /** Get pixel from glyph bitmap.
  *