From 100054dbd656c0ba8d98f32a88471be8a2e1f011 Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Thu, 21 Nov 2019 12:42:58 +0100 Subject: [PATCH 1/2] Changes type from `int` to `size_t` Changes type from `int` to `size_t` to stop compiler complaining "Implicit conversion loses integer precision: `unsigned long` to `int`". --- src/tool-musicxml2hum.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tool-musicxml2hum.cpp b/src/tool-musicxml2hum.cpp index c9a15b01..a5ed66aa 100644 --- a/src/tool-musicxml2hum.cpp +++ b/src/tool-musicxml2hum.cpp @@ -1021,7 +1021,7 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, // end rather than the start of the note. vector& events = measuredata[i]->getEventList(); xml_node hairpin = xml_node(NULL); - for (int j=events.size() - 1; j >= 0; j--) { + for (size_t j=events.size() - 1; j >= 0; j--) { if (events[j]->getElementName() == "note") { if (hairpin) { events[j]->setHairpinEnding(hairpin); From 09f708b8b6a6ecbdeac477a6536e56b057a9dbef Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Thu, 21 Nov 2019 14:01:39 +0100 Subject: [PATCH 2/2] Changes type from to --- include/humlib.h | 2 +- src/humlib.cpp | 44 ++++++++++++++++++++------------------- src/tool-musicxml2hum.cpp | 42 +++++++++++++++++++------------------ 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/include/humlib.h b/include/humlib.h index 0c656307..15775cc6 100644 --- a/include/humlib.h +++ b/include/humlib.h @@ -1,7 +1,7 @@ // // Programmer: Craig Stuart Sapp // Creation Date: Sat Aug 8 12:24:49 PDT 2015 -// Last Modified: Fri Nov 15 12:54:06 WET 2019 +// Last Modified: Thu Nov 21 13:55:10 CET 2019 // Filename: humlib.h // URL: https://github.com/craigsapp/humlib/blob/master/include/humlib.h // Syntax: C++11 diff --git a/src/humlib.cpp b/src/humlib.cpp index 28f1f048..77d73ff2 100644 --- a/src/humlib.cpp +++ b/src/humlib.cpp @@ -1,7 +1,7 @@ // // Programmer: Craig Stuart Sapp // Creation Date: Sat Aug 8 12:24:49 PDT 2015 -// Last Modified: Fri Nov 15 12:54:06 WET 2019 +// Last Modified: Thu Nov 21 13:55:10 CET 2019 // Filename: /include/humlib.cpp // URL: https://github.com/craigsapp/humlib/blob/master/src/humlib.cpp // Syntax: C++11 @@ -63668,9 +63668,9 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, MxmlMeasure* xmeasure; vector measuredata; vector* > sevents; - int i; + size_t i; - for (i=0; i<(int)partdata.size(); i++) { + for (i=0; i curtime(partdata.size()); vector measuredurs(partdata.size()); - vector curindex(partdata.size(), 0); // assuming data in a measure... + vector curindex(partdata.size(), 0); // assuming data in a measure... HumNum nexttime = -1; vector> endingDirections(partdata.size()); HumNum tsdur; - for (i=0; i<(int)curtime.size(); i++) { + for (i=0; igetTimeSigDur(); if ((tsdur == 0) && (i > 0)) { tsdur = measuredata[i-1]->getTimeSigDur(); @@ -63707,27 +63707,28 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, // end rather than the start of the note. vector& events = measuredata[i]->getEventList(); xml_node hairpin = xml_node(NULL); - for (int j=events.size() - 1; j >= 0; j--) { - if (events[j]->getElementName() == "note") { + for (size_t j=events.size(); j > 0; j--) { + size_t index = j - 1; + if (events[index]->getElementName() == "note") { if (hairpin) { - events[j]->setHairpinEnding(hairpin); + events[index]->setHairpinEnding(hairpin); hairpin = xml_node(NULL); } break; - } else if (events[j]->getElementName() == "direction") { + } else if (events[index]->getElementName() == "direction") { stringstream ss; ss.str(""); - events[j]->getNode().print(ss); + events[index]->getNode().print(ss); if (ss.str().find("wedge") != string::npos) { if (ss.str().find("stop") != string::npos) { - hairpin = events[j]->getNode(); + hairpin = events[index]->getNode(); } } } } if (VoiceDebugQ) { - for (int j=0; j<(int)events.size(); j++) { + for (size_t j=0; jgetStartTime(); cerr << "\tSTi: " << events[j]->getStaffIndex(); @@ -63765,23 +63766,24 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, allend = true; processtime = nexttime; nexttime = -1; - for (i = (int)partdata.size()-1; i >= 0; i--) { - if (curindex[i] >= (int)(*sevents[i]).size()) { + for (i = partdata.size(); i > 0; i--) { + size_t index = i - 1; + if (curindex[index] >= (int)(*sevents[index]).size()) { continue; } - if ((*sevents[i])[curindex[i]].starttime == processtime) { - SimultaneousEvents* thing = &(*sevents[i])[curindex[i]]; + if ((*sevents[index])[curindex[index]].starttime == processtime) { + SimultaneousEvents* thing = &(*sevents[index])[curindex[index]]; nowevents.push_back(thing); - nowparts.push_back(i); - curindex[i]++; + nowparts.push_back(index); + curindex[index]++; } - if (curindex[i] < (int)(*sevents[i]).size()) { + if (curindex[index] < (int)(*sevents[index]).size()) { allend = false; if ((nexttime < 0) || - ((*sevents[i])[curindex[i]].starttime < nexttime)) { - nexttime = (*sevents[i])[curindex[i]].starttime; + ((*sevents[index])[curindex[index]].starttime < nexttime)) { + nexttime = (*sevents[index])[curindex[index]].starttime; } } } diff --git a/src/tool-musicxml2hum.cpp b/src/tool-musicxml2hum.cpp index a5ed66aa..be4818e9 100644 --- a/src/tool-musicxml2hum.cpp +++ b/src/tool-musicxml2hum.cpp @@ -982,9 +982,9 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, MxmlMeasure* xmeasure; vector measuredata; vector* > sevents; - int i; + size_t i; - for (i=0; i<(int)partdata.size(); i++) { + for (i=0; i curtime(partdata.size()); vector measuredurs(partdata.size()); - vector curindex(partdata.size(), 0); // assuming data in a measure... + vector curindex(partdata.size(), 0); // assuming data in a measure... HumNum nexttime = -1; vector> endingDirections(partdata.size()); HumNum tsdur; - for (i=0; i<(int)curtime.size(); i++) { + for (i=0; igetTimeSigDur(); if ((tsdur == 0) && (i > 0)) { tsdur = measuredata[i-1]->getTimeSigDur(); @@ -1021,27 +1021,28 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, // end rather than the start of the note. vector& events = measuredata[i]->getEventList(); xml_node hairpin = xml_node(NULL); - for (size_t j=events.size() - 1; j >= 0; j--) { - if (events[j]->getElementName() == "note") { + for (size_t j=events.size(); j > 0; j--) { + size_t index = j - 1; + if (events[index]->getElementName() == "note") { if (hairpin) { - events[j]->setHairpinEnding(hairpin); + events[index]->setHairpinEnding(hairpin); hairpin = xml_node(NULL); } break; - } else if (events[j]->getElementName() == "direction") { + } else if (events[index]->getElementName() == "direction") { stringstream ss; ss.str(""); - events[j]->getNode().print(ss); + events[index]->getNode().print(ss); if (ss.str().find("wedge") != string::npos) { if (ss.str().find("stop") != string::npos) { - hairpin = events[j]->getNode(); + hairpin = events[index]->getNode(); } } } } if (VoiceDebugQ) { - for (int j=0; j<(int)events.size(); j++) { + for (size_t j=0; jgetStartTime(); cerr << "\tSTi: " << events[j]->getStaffIndex(); @@ -1079,23 +1080,24 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum, allend = true; processtime = nexttime; nexttime = -1; - for (i = (int)partdata.size()-1; i >= 0; i--) { - if (curindex[i] >= (int)(*sevents[i]).size()) { + for (i = partdata.size(); i > 0; i--) { + size_t index = i - 1; + if (curindex[index] >= (int)(*sevents[index]).size()) { continue; } - if ((*sevents[i])[curindex[i]].starttime == processtime) { - SimultaneousEvents* thing = &(*sevents[i])[curindex[i]]; + if ((*sevents[index])[curindex[index]].starttime == processtime) { + SimultaneousEvents* thing = &(*sevents[index])[curindex[index]]; nowevents.push_back(thing); - nowparts.push_back(i); - curindex[i]++; + nowparts.push_back(index); + curindex[index]++; } - if (curindex[i] < (int)(*sevents[i]).size()) { + if (curindex[index] < (int)(*sevents[index]).size()) { allend = false; if ((nexttime < 0) || - ((*sevents[i])[curindex[i]].starttime < nexttime)) { - nexttime = (*sevents[i])[curindex[i]].starttime; + ((*sevents[index])[curindex[index]].starttime < nexttime)) { + nexttime = (*sevents[index])[curindex[index]].starttime; } } }