Skip to content

Fix NK_MEMCPY() size types to nk_size #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobLoach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NK_MEMCPY() size types to nk_size #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nuklear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17606,7 +17606,7 @@ nk__lit(unsigned char *data, unsigned int length)
NK_ASSERT (nk__dout + length <= nk__barrier);
if (nk__dout + length > nk__barrier) { nk__dout += length; return; }
if (data < nk__barrier2) { nk__dout = nk__barrier+1; return; }
NK_MEMCPY(nk__dout, data, length);
NK_MEMCPY(nk__dout, data, (nk_size)length);
nk__dout += length;
}
NK_INTERN unsigned char*
Expand Down Expand Up @@ -29155,7 +29155,7 @@ nk_property(struct nk_context *ctx, const char *name, struct nk_property_variant
win->property.prev_state = prev_state;
win->property.prev_name = win->property.name;
win->property.prev_length = win->property.length;
NK_MEMCPY(win->property.prev_buffer, win->property.buffer, win->property.length);
NK_MEMCPY(win->property.prev_buffer, win->property.buffer, (nk_size)win->property.length);
}
/* current property is now hot */
win->property.active = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/nuklear_font.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ nk__lit(unsigned char *data, unsigned int length)
NK_ASSERT (nk__dout + length <= nk__barrier);
if (nk__dout + length > nk__barrier) { nk__dout += length; return; }
if (data < nk__barrier2) { nk__dout = nk__barrier+1; return; }
NK_MEMCPY(nk__dout, data, length);
NK_MEMCPY(nk__dout, data, (nk_size)length);
nk__dout += length;
}
NK_INTERN unsigned char*
Expand Down
2 changes: 1 addition & 1 deletion src/nuklear_property.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ nk_property(struct nk_context *ctx, const char *name, struct nk_property_variant
win->property.prev_state = prev_state;
win->property.prev_name = win->property.name;
win->property.prev_length = win->property.length;
NK_MEMCPY(win->property.prev_buffer, win->property.buffer, win->property.length);
NK_MEMCPY(win->property.prev_buffer, win->property.buffer, (nk_size)win->property.length);
}
/* current property is now hot */
win->property.active = 1;
Expand Down