Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Passtests arm #2509

Merged
merged 1 commit into from
Mar 30, 2016
Merged

Passtests arm #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libmscore/durationtype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Ms {

class TDuration {
public:
enum class DurationType : char {
enum class DurationType : signed char {
V_LONG, V_BREVE, V_WHOLE, V_HALF, V_QUARTER, V_EIGHTH, V_16TH,
V_32ND, V_64TH, V_128TH, V_256TH, V_512TH, V_1024TH,
V_ZERO, V_MEASURE, V_INVALID
Expand Down
4 changes: 2 additions & 2 deletions libmscore/interval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ namespace Ms {
//---------------------------------------------------------

struct Interval {
char diatonic;
char chromatic;
signed char diatonic;
signed char chromatic;

Interval();
Interval(int a, int b);
Expand Down
2 changes: 1 addition & 1 deletion midi/midifile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ bool MidiFile::read(QIODevice* in)
}
else { // ticks per second = fps * ticks per frame
_isDivisionInTps = true;
const int framesPerSecond = -firstByte;
const int framesPerSecond = -((signed char) firstByte);
const int ticksPerFrame = secondByte;
if (framesPerSecond == 29)
_division = qRound(29.97 * ticksPerFrame);
Expand Down
2 changes: 1 addition & 1 deletion mscore/capella.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@ void ChordObj::read()
char c = cap->readChar();
bool bit7 = c & 0x80;
bool bit6 = c & 0x40;
n.pitch = c;
n.pitch = (signed char) c;
if (bit7 != bit6) {
n.explAlteration = 2;
n.pitch ^= 0x80;
Expand Down
2 changes: 1 addition & 1 deletion mscore/capella.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ struct Verse {
};

struct CNote {
char pitch;
signed char pitch;
int explAlteration; // 1 force, 2 suppress
int headType;
int alteration;
Expand Down
2 changes: 1 addition & 1 deletion mscore/importgtp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void GuitarPro::read(void* p, qint64 len)

int GuitarPro::readChar()
{
char c;
signed char c;
read(&c, 1);
return c;
}
Expand Down
4 changes: 2 additions & 2 deletions mscore/importmidi/importmidi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ void MTrack::processMeta(int tick, const MidiEvent& mm)
qDebug("processMeta: no staff");
return;
}
const uchar* data = (uchar*)mm.edata();
const uchar* data = mm.edata();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: I removed this (uchar_) because it is superfluous, since both edata() and data are uchar_ already.

Score* cs = staff->score();

switch (mm.metaType()) {
Expand All @@ -290,7 +290,7 @@ void MTrack::processMeta(int tick, const MidiEvent& mm)
break;
case META_KEY_SIGNATURE:
{
const int key = ((const char*)data)[0];
const signed char key = ((const signed char*)data)[0];
if (key < -7 || key > 7) {
qDebug("ImportMidi: illegal key %d", key);
break;
Expand Down