>From 45c708607bf0fc689d4dcf8d47fad6ed220e3819 Mon Sep 17 00:00:00 2001
From: Jaap de Wolff <address@hidden>
Date: Sun, 10 May 2020 17:09:00 +0200
Subject: [PATCH 1/5] Modify obvious incorrect types

---
 lily/figured-bass-engraver.cc | 2 +-
 lily/font-select.cc           | 4 ++--
 lily/lookup.cc                | 6 +++---
 lily/slur-scoring.cc          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index f42852e81d..30ccae96b9 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -347,7 +347,7 @@ Figured_bass_engraver::process_music ()
 
   if (use_extenders)
     {
-      vector<int> junk_continuations;
+      vector<vsize> junk_continuations;
       for (vsize i = 0; i < groups_.size (); i++)
         {
           Figure_group &group = groups_[i];
diff --git a/lily/font-select.cc b/lily/font-select.cc
index 85456a22c0..1c9a290dd2 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -30,10 +30,10 @@ Font_metric *
 get_font_by_design_size (Output_def *layout, Real requested,
                          SCM font_vector)
 {
-  int n = scm_c_vector_length (font_vector);
+  size_t n = scm_c_vector_length (font_vector);
   Real size = 1e6;
   Real last_size = -1e6;
-  int i = 0;
+  size_t i = 0;
 
   SCM pango_description_string = SCM_EOL;
   SCM last_pango_description_string = SCM_EOL;
diff --git a/lily/lookup.cc b/lily/lookup.cc
index e52ad83a40..80995f882b 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -312,9 +312,9 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
 
       for (vsize i = 0; i < points.size (); i++)
         {
-          int i0 = i;
-          int i1 = (i + 1) % points.size ();
-          int i2 = (i + 2) % points.size ();
+          vsize i0 = i;
+          vsize i1 = (i + 1) % points.size ();
+          vsize i2 = (i + 2) % points.size ();
           Offset p0 = points[i0];
           Offset p1 = points[i1];
           Offset p2 = points[i2];
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 7a718f7987..ee4cb2fa3a 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -387,7 +387,7 @@ Slur::calc_control_points (SCM smob)
   if (debug_slurs)
     {
       string total = best->card ();
-      total += to_string (" TOTAL=%.2f idx=%d", best->score (), best->index_);
+      total += to_string (" TOTAL=%.2f idx=%ld", best->score (), best->index_);
       set_property (me, "annotation", ly_string2scm (total));
     }
 #endif
-- 
2.20.1