LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix fret editing (uninitialized variable)

Browse source
This commit is contained in:
Werner Schweer 2013-02-06 17:39:05 +01:00
parent 2ee4a782e7
commit 32794e2c15
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libmscore/fret.cpp
View file

@ -57,6 +57,7 @@ FretDiagram::FretDiagram(const FretDiagram& f)
_frets = f._frets;
_fretOffset = f._fretOffset;
_maxFrets = f._maxFrets;
maxStrings = f.maxStrings;
_dots = 0;
_marker = 0;
_fingering = 0;
@ -86,9 +87,9 @@ FretDiagram::FretDiagram(const FretDiagram& f)
FretDiagram::~FretDiagram()
{
delete _dots;
delete _marker;
delete _fingering;
delete[] _dots;
delete[] _marker;
delete[] _fingering;
}
#if 1
@ -164,7 +165,7 @@ void FretDiagram::setStrings(int n)
memcpy(ndots, _dots, _strings);
for (int i = _strings; i < n; ++i)
ndots[i] = 0;
delete _dots;
delete[] _dots;
_dots = ndots;
}
if (_marker) {
@ -172,7 +173,7 @@ void FretDiagram::setStrings(int n)
memcpy(nmarker, _marker, _strings);
for (int i = _strings; i < n; ++i)
nmarker[i] = 0;
delete _marker;
delete[] _marker;
_marker = nmarker;
}
if (_fingering) {
@ -180,7 +181,7 @@ void FretDiagram::setStrings(int n)
memcpy(nfingering, _fingering, _strings);
for (int i = _strings; i < n; ++i)
nfingering[i] = 0;
delete _fingering;
delete[] _fingering;
_fingering = nfingering;
}
_strings = n;
@ -340,14 +341,6 @@ void FretDiagram::write(Xml& xml) const
void FretDiagram::read(XmlReader& e)
{
delete _dots;
delete _marker;
delete _fingering;
_dots = 0;
_marker = 0;
_fingering = 0;
_fretOffset = 0;
while (e.readNextStartElement()) {
const QStringRef& tag(e.name());
if (tag == "strings")
@ -503,16 +496,6 @@ void FretDiagram::readMusicXML(XmlReader& e)
{
qDebug("FretDiagram::readMusicXML");
// TODO: is this required ?
delete _dots;
delete _marker;
delete _fingering;
_dots = 0;
_marker = 0;
_fingering = 0;
_fretOffset = 0;
// end TODO: is this required ?
while (e.readNextStartElement()) {
const QStringRef& tag(e.name());
if (tag == "frame-frets") {

2
mscore/fretproperties.cpp
View file

@ -47,7 +47,7 @@ FretDiagramProperties::FretDiagramProperties(FretDiagram* _fd, QWidget* parent)
diagramScrollBar->setValue(fd->fretOffset());
connect(strings, SIGNAL(valueChanged(int)), SLOT(stringsChanged(int)));
connect(frets, SIGNAL(valueChanged(int)), SLOT(fretsChanged(int)));
connect(frets, SIGNAL(valueChanged(int)), SLOT(fretsChanged(int)));
connect(diagramScrollBar, SIGNAL(valueChanged(int)), SLOT(fretOffsetChanged(int)));
}