fix(build): enable clang-tidy before creating targets

CHANGELOG.md

@@ -16,6 +16,9 @@ The release run heads these entries with the version and opens a fresh
 
 ## Unreleased
 
+- `ODR_CLANG_TIDY=ON` runs clang-tidy during C++ compilation and fails
+  configuration if the executable is unavailable.
+
 - HTTP server shutdown avoids user logging callbacks, so logging failures
   cannot interrupt cleanup or terminate the process during destruction.
 

CMakeLists.txt

@@ -21,6 +21,20 @@ option(ODR_JNI "Build JNI bindings" OFF)
 option(ODR_APPLE "Build Objective-C bindings as a framework" OFF)
 option(ODR_WASM "Build WebAssembly bindings" OFF)
 
+if (ODR_CLANG_TIDY)
+    find_program(CLANG_TIDY_COMMAND NAMES clang-tidy)
+    if (NOT CLANG_TIDY_COMMAND)
+        message(FATAL_ERROR "ODR_CLANG_TIDY is ON but clang-tidy was not found")
+    endif ()
+    configure_file(.clang-tidy "${CMAKE_CURRENT_BINARY_DIR}/.clang-tidy" COPYONLY)
+    set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.25")
+        # Retain the configured compiler's standard-library include paths.
+        set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+        list(APPEND CMAKE_CXX_CLANG_TIDY -p "${CMAKE_BINARY_DIR}")
+    endif ()
+endif ()
+
 include(GNUInstallDirs)
 
 # TODO defining global compiler flags seems to be bad practice with conan
@@ -452,10 +466,6 @@ if (ODR_TEST)
     add_subdirectory("test")
 endif ()
 
-if (ODR_CLANG_TIDY)
-    add_subdirectory("static_analysis/clang-tidy")
-endif ()
-
 if (NOT ODR_WITH_HTTP_SERVER)
     # Don't ship the public header for an API that wasn't built.
     set(ODR_HEADER_EXCLUDE PATTERN "http_server.hpp" EXCLUDE)

src/odr/internal/font/type1_transform.cpp

@@ -30,10 +30,11 @@ std::string type1::to_cff(const Type1Font &font) {
     }
     // A charstring that does not translate becomes an empty glyph, so one
     // broken glyph does not refuse the font.
-    std::string charstring(1, static_cast<char>(14));
+    std::string charstring;
     try {
       charstring = to_type2(glyph.charstring, font.subrs());
     } catch (const std::runtime_error &) {
+      charstring.assign(1, static_cast<char>(14));
     }
     glyphs.push_back({glyph.name, std::move(charstring)});
   };

src/odr/internal/pdf/pdf_document_parser.cpp

@@ -280,14 +280,17 @@ void parse_cid_widths(const Array &w, Font &font) {
     }
     const std::optional<std::uint32_t> first = font_code(w[i], max_cid);
     if (i + 1 < w.size() && w[i + 1].is_array()) {
-      const Array &list = w[i + 1].as_array();
-      // widths past the CID range are dropped
-      const std::size_t count =
-          first ? std::min<std::size_t>(list.size(), max_cid - *first + 1) : 0;
-      for (std::size_t j = 0; j < count; ++j) {
-        if (list[j].is_real()) {
-          font.cid_widths[*first + static_cast<std::uint32_t>(j)] =
-              list[j].as_real();
+      if (first.has_value()) {
+        const std::uint32_t start = *first;
+        const Array &list = w[i + 1].as_array();
+        // widths past the CID range are dropped
+        const std::size_t count =
+            std::min<std::size_t>(list.size(), max_cid - start + 1);
+        for (std::size_t j = 0; j < count; ++j) {
+          if (list[j].is_real()) {
+            font.cid_widths[start + static_cast<std::uint32_t>(j)] =
+                list[j].as_real();
+          }
         }
       }
       i += 2;