From e7db481ce93019292477fa793d3cf479f361de04 Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 28 May 2021 17:56:51 +0200 Subject: [PATCH] Minor warning fixes. --- imgui_demo.cpp | 4 ++-- imgui_draw.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index 4d6c2bbf2..1ba0bf450 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -9374,7 +9374,7 @@ static void ShowExampleAppCustomRendering(bool* p_open) draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, rounding, ImDrawFlags_None, th); x += sz + spacing; // Square with all rounded corners draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, rounding, corners_tl_br, th); x += sz + spacing; // Square with two rounded corners draw_list->AddTriangle(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col, th);x += sz + spacing; // Triangle - //draw_list->AddTriangle(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col, th);x+= sz*0.4f + spacing; // Thin triangle + draw_list->AddTriangle(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col, th);x+= sz*0.4f + spacing; // Thin triangle PathConcaveShape(draw_list, x, y, sz); draw_list->PathStroke(col, ImDrawFlags_Closed, th); x += sz + spacing; // Concave Shape //draw_list->AddPolyline(concave_shape, IM_ARRAYSIZE(concave_shape), col, ImDrawFlags_Closed, th); draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y), col, th); x += sz + spacing; // Horizontal line (note: drawing a filled rectangle will be faster!) @@ -9405,7 +9405,7 @@ static void ShowExampleAppCustomRendering(bool* p_open) draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f); x += sz + spacing; // Square with all rounded corners draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br); x += sz + spacing; // Square with two rounded corners draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col); x += sz + spacing; // Triangle - //draw_list->AddTriangleFilled(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col); x += sz*0.4f + spacing; // Thin triangle + draw_list->AddTriangleFilled(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col); x += sz*0.4f + spacing; // Thin triangle PathConcaveShape(draw_list, x, y, sz); draw_list->PathFillConcave(col); x += sz + spacing; // Concave shape draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + thickness), col); x += sz + spacing; // Horizontal line (faster than AddLine, but only handle integer thickness) draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + thickness, y + sz), col); x += spacing * 2.0f;// Vertical line (faster than AddLine, but only handle integer thickness) diff --git a/imgui_draw.cpp b/imgui_draw.cpp index a9763ab6c..b27c801cb 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -789,8 +789,14 @@ if (USE_NEW_CODE) const float half_thickness_aa = half_thickness + AA_SIZE; const unsigned int first_vtx_idx = _VtxCurrentIdx; + // Declare temporary variables in outer scope. Declared without a default value would trigger static analyser, and doing it in inner-scope would be more wasteful. + float mlx, mly, mrx, mry; // Left and right miters + float mlax = 0.0f, mlay = 0.0f, mrax = 0.0f, mray = 0.0f; // Left and right miters including anti-aliasing + float b1x = 0.0f, b1y = 0.0f, b2x = 0.0f, b2y = 0.0f; // First and second bevel point + float b1ax = 0.0f, b1ay = 0.0f, b2ax = 0.0f, b2ay = 0.0f; // First and second bevel point including anti-aliasing + float sqlen1 = 0.0f; - float dx1, dy1; + float dx1 = 0.0f, dy1 = 0.0f; if (closed) { dx1 = points[0].x - points[points_count - 1].x; @@ -823,8 +829,6 @@ if (USE_NEW_CODE) } float miter_l_recip = dx1 * dy2 - dy1 * dx2; - float mlx, mly, mrx, mry; // Left and right miters - float mlax, mlay, mrax, mray; // Left and right miters including anti-aliasing const bool bevel = (dx1 * dx2 + dy1 * dy2) > 1e-5f; if (ImFabs(miter_l_recip) > 1e-5f) { @@ -869,8 +873,6 @@ if (USE_NEW_CODE) // The two bevel vertices if the angle is right or obtuse // miter_sign == 1, iff the outer (maybe bevelled) edge is on the right, -1 iff it is on the left int miter_sign = (miter_l_recip >= 0) - (miter_l_recip < 0); - float b1x, b1y, b2x, b2y; // First and second bevel point - float b1ax, b1ay, b2ax, b2ay; // First and second bevel point including anti-aliasing if (bevel) { // FIXME-OPT: benchmark if doing these computations only once in AA case saves cycles