diff options
| author | John Glover <glover.john@gmail.com> | 2010-12-01 19:52:02 +0000 |
|---|---|---|
| committer | John Glover <glover.john@gmail.com> | 2010-12-01 19:52:02 +0000 |
| commit | e5625a21b62f11c7eccc0808a77766b50d973ea4 (patch) | |
| tree | b2b4787c2639c45ebcb617d62ae11e45f4c32e60 /sms/peakContinuation.c | |
| parent | 5e25edb1b78f28bee09bd7513a80fb500bbd59c4 (diff) | |
| download | simpl-e5625a21b62f11c7eccc0808a77766b50d973ea4.tar.gz simpl-e5625a21b62f11c7eccc0808a77766b50d973ea4.tar.bz2 simpl-e5625a21b62f11c7eccc0808a77766b50d973ea4.zip | |
Fixed some memory management problems in the SMS analysis process
Diffstat (limited to 'sms/peakContinuation.c')
| -rw-r--r-- | sms/peakContinuation.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sms/peakContinuation.c b/sms/peakContinuation.c index b514266..5e6426b 100644 --- a/sms/peakContinuation.c +++ b/sms/peakContinuation.c @@ -67,7 +67,7 @@ int GetNextClosestPeak(sfloat fGuideFreq, sfloat *pFFreqDistance, else { while(floor(fLowDistance) >= floor(*pFFreqDistance) && - iInitialPeak < pAnalParams->maxPeaks) + iInitialPeak < pAnalParams->maxPeaks) { iInitialPeak++; /* TODO: is this really the correct behaviour? Will ignore @@ -297,13 +297,14 @@ int GetBestPeak(SMS_Guide *pGuides, int iGuide, SMS_Peak *pSpectralPeaks, * \param pFCurrentMax last peak maximum * \return the number of the maximum peak */ -static int GetNextMax (SMS_Peak *pSpectralPeaks, sfloat *pFCurrentMax) +static int GetNextMax(SMS_Peak *pSpectralPeaks, SMS_AnalParams *pAnalParams, + sfloat *pFCurrentMax) { sfloat fPeakMag; sfloat fMaxMag = 0.; int iPeak, iMaxPeak = -1; - for (iPeak = 0; iPeak < SMS_MAX_NPEAKS; iPeak++) + for (iPeak = 0; iPeak < pAnalParams->maxPeaks; iPeak++) { fPeakMag = pSpectralPeaks[iPeak].fMag; @@ -330,7 +331,8 @@ static int GetNextMax (SMS_Peak *pSpectralPeaks, sfloat *pFCurrentMax) * \return \todo should this return something? */ static int GetStartingPeak(int iGuide, SMS_Guide *pGuides, int nGuides, - SMS_Peak *pSpectralPeaks, sfloat *pFCurrentMax) + SMS_Peak *pSpectralPeaks, SMS_AnalParams *pAnalParams, + sfloat *pFCurrentMax) { int iPeak = -1; short peakNotFound = 1; @@ -338,7 +340,7 @@ static int GetStartingPeak(int iGuide, SMS_Guide *pGuides, int nGuides, while (peakNotFound == 1 && *pFCurrentMax > 0) { /* \todo I don't think this ever returns -1, but check */ - if ((iPeak = GetNextMax(pSpectralPeaks, pFCurrentMax)) < 0) + if ((iPeak = GetNextMax(pSpectralPeaks, pAnalParams, pFCurrentMax)) < 0) return (-1); if (CheckForConflict (iPeak, pGuides, nGuides) < 0) @@ -425,7 +427,7 @@ int sms_peakContinuation(int iFrame, SMS_AnalParams *pAnalParams) if(GetStartingPeak(iGuide, pAnalParams->guides, pAnalParams->nGuides, pAnalParams->ppFrames[iFrame]->pSpectralPeaks, - &fCurrentMax) == -1) + pAnalParams, &fCurrentMax) == -1) break; } |