web: tidy & format

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

Author: maliberty

src/web/src/font_atlas.h

@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <string_view>
+
 #include "glyph_cache.h"
 
 namespace web {

src/web/src/glyph_cache.cpp

@@ -5,6 +5,10 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <mutex>
+#include <string_view>
+#include <vector>
 
 #include "font_data.h"
 #include "third-party/stb_truetype/stb_truetype.h"
@@ -143,17 +147,22 @@ GlyphCache::GlyphInfo GlyphCache::glyph(int font_height, char ch) const
   const int idx = static_cast<unsigned char>(ch) - kFirstChar;
   const auto& slot = getSlot(font_height);
   if (idx < 0 || idx >= kNumGlyphs) {
-    return {nullptr, 0, 0, 0, 0, 0};
+    return {.alpha = nullptr,
+            .bmp_width = 0,
+            .bmp_height = 0,
+            .x_offset = 0,
+            .y_offset = 0,
+            .advance = 0};
   }
   const auto& cg = slot.glyphs[idx];
   const unsigned char* alpha_ptr
       = cg.bmp_width > 0 ? slot.alpha.data() + cg.alpha_offset : nullptr;
-  return {alpha_ptr,
-          cg.bmp_width,
-          cg.bmp_height,
-          cg.x_offset,
-          cg.y_offset,
-          cg.advance};
+  return {.alpha = alpha_ptr,
+          .bmp_width = cg.bmp_width,
+          .bmp_height = cg.bmp_height,
+          .x_offset = cg.x_offset,
+          .y_offset = cg.y_offset,
+          .advance = cg.advance};
 }
 
 int GlyphCache::kern(int font_height, char ch1, char ch2) const

src/web/src/tile_generator.cpp

@@ -405,9 +405,7 @@ odb::Rect TileGenerator::getBounds() const
       int max_text_px = 0;
       for (odb::dbBTerm* term : block->getBTerms()) {
         const int w = fontAtlasTextWidth(term->getName(), kPinLabelFontHeight);
-        if (w > max_text_px) {
-          max_text_px = w;
-        }
+        max_text_px = std::max(w, max_text_px);
       }
       const int label_px = kMinPinNameSizePixels + 3 + max_text_px;
       const int margin = label_px * pin_size / kMinPinNameSizePixels;