Skip to content
Snippets Groups Projects
Commit 4838ef58 authored by Michael Borisov's avatar Michael Borisov
Browse files

Fixed a few memory leaks

Added HDF5 DLLs compatible with Visual Studio 2013
Cleaned up .gitignore wrt VS2013 support
parent 4a987eae
No related branches found
No related tags found
No related merge requests found
......@@ -54,7 +54,7 @@ Builds/VisualStudio2013/ipch
Builds/VisualStudio2013/open-ephys.sdf
Builds/VisualStudio2013/open-ephys.opensdf
Builds/VisualStudio2013/open-ephys.suo
Builds/VisualStudio2013/open-ephys.v11.suo
Builds/VisualStudio2013/open-ephys.v12.suo
Builds/VisualStudio2013/open-ephys.vcxproj.user
Builds/VisualStudio2013/windowState.xml
Builds/VisualStudio2013/pipetest.bit
......
File deleted
......@@ -93,7 +93,7 @@
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>copy &quot;..\..\Resources\DLLs\*.dll&quot; &quot;$(OutDir)&quot;</Command>
<Command>copy &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)&quot;</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -141,7 +141,7 @@
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>copy &quot;..\..\Resources\DLLs\*.dll&quot; &quot;$(OutDir)&quot;</Command>
<Command>copy &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)&quot;</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -58,10 +58,10 @@ AudioResamplingNode::AudioResamplingNode()
AudioResamplingNode::~AudioResamplingNode()
{
filter = 0;
deleteAndZero(destBuffer);
delete[] continuousDataBuffer;
deleteAndZero(tempBuffer);
deleteAndZero(destBuffer);
delete filter;
}
......
......@@ -65,7 +65,7 @@ RecordNode::RecordNode()
RecordNode::~RecordNode()
{
delete eventChannel; // Memory leak fixed by Michael Borisov
}
void RecordNode::setChannel(Channel* ch)
......
......@@ -80,6 +80,7 @@ EditorViewport::EditorViewport()
EditorViewport::~EditorViewport()
{
deleteAllChildren();
delete signalChainManager;
}
void EditorViewport::signalChainCanBeEdited(bool t)
......
......@@ -110,12 +110,12 @@
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="1" optimisation="1" targetName="open-ephys" binaryPath="Builds\VisualStudio2013\Debug\bin"
headerPath="../../Resources/windows-libs/HDF5/include" libraryPath="../../Resources/windows-libs/HDF5/lib/x86"
wholeProgramOptimisation="1" postbuildCommand="copy &quot;..\..\Resources\DLLs\*.dll&quot; &quot;$(OutDir)&quot;"
wholeProgramOptimisation="1" postbuildCommand="copy &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)&quot;"
fastMath="1"/>
<CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="0" optimisation="3" targetName="open-ephys" binaryPath="Builds\VisualStudio2013\Release\bin"
headerPath="../../Resources/windows-libs/HDF5/include" libraryPath="../../Resources/windows-libs/HDF5/lib/x86"
postbuildCommand="copy &quot;..\..\Resources\DLLs\*.dll&quot; &quot;$(OutDir)&quot;"
postbuildCommand="copy &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)&quot;"
fastMath="1"/>
</CONFIGURATIONS>
<MODULEPATHS>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment