Merge pull request #3942 from rettinghaus/fixex [skip-ci]

Some fixes

Verovio.podspec

@@ -6,16 +6,17 @@ Pod::Spec.new do |s|
   s.authors        = { 'Contributors List' => 'https://github.com/rism-digital/verovio/graphs/contributors' }
   s.summary        = 'Verovio'
   s.source         = { :git => 'https://github.com/rism-digital/verovio.git', :tag => 'version-' + s.version.to_s }
-  s.swift_versions = ['3.0', '4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
-  s.source_files        = 'src/**/*.{h,cpp,cc}',
-                        'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
-                        'libmei/{dist,addons}/*.{h,cpp}'
+  s.source_files   = 'src/**/*.{h,cpp,cc}',
+      'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
+      'libmei/{dist,addons}/*.{h,cpp}'
   s.public_header_files = 'src/**/*.{h}',
-                          'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
-                          'libmei/{dist,addons}/*.{h}'
+      'include/{crc, hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
+      'libmei/{dist,addons}/*.{h}'
+  s.private_header_files = 'include/{crc, hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
+      'libmei/{dist,addons}/*.{h}'
   s.resources      = 'data'
-  s.ios.deployment_target = '14.0'
-  s.osx.deployment_target = '10.15'
+  s.ios.deployment_target = '16.0'
+  s.osx.deployment_target = '11.0'
   s.pod_target_xcconfig = {
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++23",
       "CLANG_CXX_LIBRARY" => "libc++",

include/vrv/tuning.h

@@ -45,13 +45,13 @@ class Tuning : public Object, public AttCourseLog {
      * German tablature: the line is based on the note's index in the note list
      * or by explicit @loc.
      *
-     * @param[in] course
-     * @param[in] notationType
-     * @param[in] lines
-     * @param[in] listSize
-     * @param[in] index - 0 based from the bottom of the chord
-     * @param[in] loc - German tablature: note@loc if specified, 0 at the bottom
-     * @param[in] topAlign - German tablature: true => align at the top, false => align at the bottom
+     * @param [in] course The course number
+     * @param [in] notationType The notationType used to default tuning if not otherwise specified
+     * @param [in] lines The number of lines
+     * @param [in] listSize The number of objects in the tabGrp
+     * @param [in] index 0 based from the bottom of the chord
+     * @param [in] loc German tablature: note@loc if specified, 0 at the bottom
+     * @param [in] topAlign German tablature: true => align at the top, false => align at the bottom
      * @return position in staff half lines
      */
     int CalcPitchPos(
@@ -60,9 +60,9 @@ class Tuning : public Object, public AttCourseLog {
     /**
      * Calculate the MIDI note number for course/fret
      *
-     * @param[in] course The course number
-     * @param[in] fret The fret number
-     * @param[in] notationType The notationType used to default tuning if not otherwise specified
+     * @param [in] course The course number
+     * @param [in] fret The fret number
+     * @param [in] notationType The notationType used to default tuning if not otherwise specified
      *
      * @return MIDI note number
      */

src/editortoolkit_neume.cpp

@@ -893,7 +893,7 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
         Syl *syl = new Syl();
         Neume *neume = new Neume();
         Nc *nc = new Nc();
-        Zone *sylZone;
+        Zone *sylZone = NULL;
         std::string contour = "";
         nc->AttachZone(zone);
 
@@ -1061,7 +1061,7 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
         data_CLEFSHAPE clefShape = CLEFSHAPE_NONE;
 
         const int staffSize = m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-        int offsetR, offsetL;
+        int offsetR = 0, offsetL = 0;
 
         for (auto it = attributes.begin(); it != attributes.end(); ++it) {
             if (it->first == "shape") {
@@ -2887,6 +2887,7 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
             parent = new Syllable();
             Syl *fullSyl = NULL;
             int ulx, uly, lrx, lry;
+            ulx = uly = lrx = lry = 0;
 
             // construct concatenated string of all the syls
             std::u32string fullString = U"";
@@ -3013,7 +3014,7 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
 
     Nc *firstNc = NULL;
     Nc *secondNc = NULL;
-    bool success1, success2;
+    bool success1 = false, success2 = false;
     int ligCount = 0; // for ungroup ligature into nc
     int ligNum = 0; // for ligature in ungroupNcs
     int firstIsLig = false;

src/scoringupfunctor.cpp

@@ -308,7 +308,7 @@ ArrayOfElementDurPairs ScoringUpFunctor::GetBoundedNotes(
 double ScoringUpFunctor::GetDurNumberValue(
     const std::pair<LayerElement *, data_DURATION> &elementDurPair, bool followedByDot, LayerElement *nextElement)
 {
-    data_DURQUALITY_mensural durquality;
+    data_DURQUALITY_mensural durquality = DURQUALITY_mensural_NONE;
     data_DURATION dur = elementDurPair.second;
     LayerElement *element = elementDurPair.first;
     Note *note;