Browse Source

Removed unneeded check in RenderText() loop + disable static analyzer false-positive warnings.

ocornut 1 month ago
parent
commit
895bff6524
2 changed files with 5 additions and 5 deletions
  1. 3 3
      imgui_draw.cpp
  2. 2 2
      imstb_truetype.h

+ 3 - 3
imgui_draw.cpp

@@ -2874,7 +2874,7 @@ void ImFontAtlasTextureBlockPostProcessMultiply(ImFontAtlasPostProcessData* data
             }
             }
         }
         }
     }
     }
-    else if (data->Format == ImTextureFormat_RGBA32)
+    else if (data->Format == ImTextureFormat_RGBA32) //-V547
     {
     {
         for (int ny = data->Height; ny > 0; ny--, pixels += pitch)
         for (int ny = data->Height; ny > 0; ny--, pixels += pitch)
         {
         {
@@ -5631,8 +5631,8 @@ begin:
         }
         }
 
 
         const ImFontGlyph* glyph = baked->FindGlyph((ImWchar)c);
         const ImFontGlyph* glyph = baked->FindGlyph((ImWchar)c);
-        if (glyph == NULL)
-            continue;
+        //if (glyph == NULL)
+        //    continue;
 
 
         float char_width = glyph->AdvanceX * scale;
         float char_width = glyph->AdvanceX * scale;
         if (glyph->Visible)
         if (glyph->Visible)

+ 2 - 2
imstb_truetype.h

@@ -4516,8 +4516,8 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex
             q2[0] = (float)x2;
             q2[0] = (float)x2;
             q2[1] = (float)y2;
             q2[1] = (float)y2;
             if (equal(q0,q1) || equal(q1,q2)) {
             if (equal(q0,q1) || equal(q1,q2)) {
-               x0 = (int)verts[i-1].x;
-               y0 = (int)verts[i-1].y;
+               x0 = (int)verts[i-1].x; //-V1048
+               y0 = (int)verts[i-1].y; //-V1048
                x1 = (int)verts[i  ].x;
                x1 = (int)verts[i  ].x;
                y1 = (int)verts[i  ].y;
                y1 = (int)verts[i  ].y;
                if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
                if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {