Changeset d30e067 in mainline for uspace/lib/gfxfont/src/glyph_bmp.c

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/lib/gfxfont/src/glyph_bmp.c (modified) (2 diffs)

uspace/lib/gfxfont/src/glyph_bmp.c

@@ -293 +293 @@
 
         /* Allocate new pixel array */
-        npixels = calloc(sizeof(int), 1);
+        npixels = calloc(1, sizeof(int));
         if (npixels == NULL)
                 return ENOMEM;
@@ -332 +332 @@
 
         /* Allocate new pixel array */
-        npixels = calloc(sizeof(int), (nrect.p1.x - nrect.p0.x) *
-            (nrect.p1.y - nrect.p0.y));
+        npixels = calloc((nrect.p1.x - nrect.p0.x) *
+            (nrect.p1.y - nrect.p0.y), sizeof(int));
         if (npixels == NULL)
                 return ENOMEM;