Skip to content

Commit f42712c

Browse files
committed
Replace usage of memset in nk_font_atlas_bake with NK_MEMSET
1 parent 0b49ee5 commit f42712c

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

nuklear.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17428,7 +17428,7 @@ nk_font_atlas_bake(struct nk_font_atlas *atlas, int *width, int *height,
1742817428
tmp = atlas->temporary.alloc(atlas->temporary.userdata,0, tmp_size);
1742917429
NK_ASSERT(tmp);
1743017430
if (!tmp) goto failed;
17431-
memset(tmp,0,tmp_size);
17431+
NK_MEMSET(tmp,0,tmp_size);
1743217432

1743317433
/* allocate glyph memory for all fonts */
1743417434
baker = nk_font_baker(tmp, atlas->glyph_count, atlas->font_num, &atlas->temporary);
@@ -29177,6 +29177,8 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
2917729177
/// - [yy]: Minor version with non-breaking API and library changes
2917829178
/// - [zz]: Bug fix version with no direct changes to API
2917929179
///
29180+
/// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET
29181+
/// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings
2918029182
/// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts
2918129183
/// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset
2918229184
/// - 2021/03/17 (4.07.1) - Fix warning about unused parameter
@@ -29508,3 +29510,4 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
2950829510
/// in libraries and brought me to create some of my own. Finally Apoorva Joshi
2950929511
/// for his single header file packer.
2951029512
*/
29513+

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nuklear",
3-
"version": "4.07.4",
3+
"version": "4.07.5",
44
"repo": "Immediate-Mode-UI/Nuklear",
55
"description": "A small ANSI C gui toolkit",
66
"keywords": ["gl", "ui", "toolkit"],

src/CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/// - [yy]: Minor version with non-breaking API and library changes
99
/// - [zz]: Bug fix version with no direct changes to API
1010
///
11+
/// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET
1112
/// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings
1213
/// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts
1314
/// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset

src/nuklear_font.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ nk_font_atlas_bake(struct nk_font_atlas *atlas, int *width, int *height,
11851185
tmp = atlas->temporary.alloc(atlas->temporary.userdata,0, tmp_size);
11861186
NK_ASSERT(tmp);
11871187
if (!tmp) goto failed;
1188-
memset(tmp,0,tmp_size);
1188+
NK_MEMSET(tmp,0,tmp_size);
11891189

11901190
/* allocate glyph memory for all fonts */
11911191
baker = nk_font_baker(tmp, atlas->glyph_count, atlas->font_num, &atlas->temporary);

0 commit comments

Comments
 (0)