summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2019-01-08 13:07:13 +1100
committerDamien Zammit <damien@zamaudio.com>2019-01-08 13:07:13 +1100
commitfd842e5b3b917a5ce83b13f467c21d2a7d0423af (patch)
tree4ad6956216bfb0ce6ad80f02a27dc7a446d34d14
parent88b6f56a79fe716af6f23144693c8142ad645219 (diff)
Fix uninitialized value bug with clang builds && fix all warningslegacy
-rw-r--r--ptfformat.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ptfformat.cc b/ptfformat.cc
index aca6f10..4c35e3f 100644
--- a/ptfformat.cc
+++ b/ptfformat.cc
@@ -548,7 +548,7 @@ PTFFormat::parserest5(void) {
uint64_t startbytes, lengthbytes, offsetbytes, somethingbytes, skipbytes;
uint16_t tracknumber = 0;
uint16_t findex;
- uint16_t rindex;
+ uint16_t rindex = 0;
unsigned char tag1[3];
unsigned char tag2[3];
unsigned char tag3[3];
@@ -1167,7 +1167,7 @@ PTFFormat::parsemidi(void) {
region_t r = { std::string(""), ridx, 0, 0, 0, w, m};
if ((mregion = std::find(begin, finish, r)) != finish) {
mtr.reg = *mregion;
- mtr.reg.startpos = labs(region_pos - mtr.reg.startpos);
+ mtr.reg.startpos = region_pos - mtr.reg.startpos;
miditracks.push_back(mtr);
}
}
@@ -1346,7 +1346,7 @@ PTFFormat::parsemidi12(void) {
region_t r = { std::string(""), ridx, 0, 0, 0, w, m};
if ((mregion = std::find(begin, finish, r)) != finish) {
mtr.reg = *mregion;
- mtr.reg.startpos = labs(region_pos - mtr.reg.startpos);
+ mtr.reg.startpos = region_pos - mtr.reg.startpos;
miditracks.push_back(mtr);
}
if (!jumpto(&k, ptfunxored, len, (const unsigned char *)"\xff\xff\xff\xff\xff\xff\xff\xff", 8)) {