Skip to content

Commit e2278ed

Browse files
committed
fix C++ style comments error in nuklear_font.c
1 parent ec697f3 commit e2278ed

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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+
/// - 2020/10/11 (4.06.1) - Fix C++ style comments which are not allowed in ISO C90.
1112
/// - 2020/10/07 (4.06.0) - Fix nk_combo return type wrongly changed to nk_bool
1213
/// - 2020/09/05 (4.05.0) - Use the nk_font_atlas allocator for stb_truetype memory management.
1314
/// - 2020/09/04 (4.04.1) - Replace every boolean int by nk_bool

src/nuklear_font.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,10 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
333333
dst_font->ascent = ((float)unscaled_ascent * font_scale);
334334
dst_font->descent = ((float)unscaled_descent * font_scale);
335335
dst_font->glyph_offset = glyph_n;
336-
// Need to zero this, or it will carry over from a previous
337-
// bake, and cause a segfault when accessing glyphs[].
336+
/*
337+
Need to zero this, or it will carry over from a previous
338+
bake, and cause a segfault when accessing glyphs[].
339+
*/
338340
dst_font->glyph_count = 0;
339341
}
340342

0 commit comments

Comments
 (0)