From be55f26a9ff6f36f69dce9ccd99984dbb0468646 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 31 Dec 2017 17:26:44 +0100 Subject: [PATCH 1/2] Fixed parts of issue #584 --- demo/overview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/overview.c b/demo/overview.c index b3f8822..29e21e0 100644 --- a/demo/overview.c +++ b/demo/overview.c @@ -891,7 +891,6 @@ overview(struct nk_context *ctx) if (nk_tree_push(ctx, NK_TREE_NODE, "Notebook", NK_MINIMIZED)) { static int current_tab = 0; - struct nk_vec2 item_padding; struct nk_rect bounds; float step = (2*3.141592654f) / 32; enum chart_type {CHART_LINE, CHART_HISTO, CHART_MIXED}; From 107c920fb0badef03a85ddba91868cc4e30711a3 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 31 Dec 2017 17:29:52 +0100 Subject: [PATCH 2/2] Fixed second part of issue #584 --- nuklear.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nuklear.h b/nuklear.h index 06234b6..4a3963d 100644 --- a/nuklear.h +++ b/nuklear.h @@ -5693,13 +5693,14 @@ nk_murmur_hash(const void * key, int len, nk_hash seed) tail = (const nk_byte*)(data + nblocks*4); k1 = 0; switch (len & 3) { - case 3: k1 ^= (nk_uint)(tail[2] << 16); - case 2: k1 ^= (nk_uint)(tail[1] << 8u); + case 3: k1 ^= (nk_uint)(tail[2] << 16); /* fallthrough */ + case 2: k1 ^= (nk_uint)(tail[1] << 8u); /* fallthrough */ case 1: k1 ^= tail[0]; k1 *= c1; k1 = NK_ROTL(k1,15); k1 *= c2; h1 ^= k1; + break; default: break; }