Skip to content

Bug fix for array comparison #971

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

Open
ag-fieldline wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bug fix for array comparison #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
691f295
Bug fix for array comparison
ag-fieldline May 9, 2024
6f92c0b
FIX warning: 'T* QScopedPointer<T, Cleanup>::take() [with T = MNELIB:…
ag-fieldline Nov 26, 2025
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
3 changes: 2 additions & 1 deletion src/libraries/fiff/fiff_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ inline qint32 FiffId::storageSize()
inline bool operator== (const FiffId &a, const FiffId &b)
{
return (a.version == b.version &&
a.machid == b.machid &&
a.machid[0] == b.machid[0] &&
a.machid[1] == b.machid[1] &&
a.time.secs == b.time.secs &&
a.time.usecs == b.time.usecs);
}
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/rtprocessing/averaging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ FiffEvoked RTPROCESSINGLIB::computeFilteredAverage(const FiffRawData& raw,
MatrixXd timesDummy;
MatrixXd times;

QScopedPointer<MNEEpochData> epoch(Q_NULLPTR);
std::unique_ptr<MNEEpochData> epoch(Q_NULLPTR);
int iFilterDelay = filterKernel.getFilterOrder()/2;

for (p = 0; p < count; ++p) {
Expand Down Expand Up @@ -184,10 +184,10 @@ FiffEvoked RTPROCESSINGLIB::computeFilteredAverage(const FiffRawData& raw,
//Check if data block has the same size as the previous one
if(!lstEpochDataList.isEmpty()) {
if(epoch->epoch.size() == lstEpochDataList.last()->epoch.size()) {
lstEpochDataList.append(MNEEpochData::SPtr(epoch.take()));//List takes ownwership of the pointer - no delete need
lstEpochDataList.append(MNEEpochData::SPtr(epoch.release()));//List takes ownwership of the pointer - no delete need
}
} else {
lstEpochDataList.append(MNEEpochData::SPtr(epoch.take()));//List takes ownwership of the pointer - no delete need
lstEpochDataList.append(MNEEpochData::SPtr(epoch.release()));//List takes ownwership of the pointer - no delete need
}
} else {
qWarning("[MNEEpochDataList::readEpochs] Can't read the event data segments.");
Expand Down
Loading