From c20599c5c615fdaacc558314ebafb8ade906068d Mon Sep 17 00:00:00 2001
From: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date: Wed, 13 May 2015 14:16:46 -0400
Subject: [PATCH] Memory optimization in AffdexMe

---
 AffdexMe/AffdexMe.csproj    | 19 ++++++++++++-------
 AffdexMe/MainWindow.xaml    |  5 ++---
 AffdexMe/MainWindow.xaml.cs |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/AffdexMe/AffdexMe.csproj b/AffdexMe/AffdexMe.csproj
index fce5f81..a176850 100644
--- a/AffdexMe/AffdexMe.csproj
+++ b/AffdexMe/AffdexMe.csproj
@@ -37,14 +37,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-  
-    <Reference Include="Affdex" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-      <HintPath>..\..\Program Files (x86)\Affectiva\Affdex SDK\bin\debug\Affdex.dll</HintPath>
+    <Reference Include="Affdex, Version=1.0.5589.23093, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>c:\Program Files (x86)\Affectiva\Affdex SDK\bin\release\Affdex.dll</HintPath>
     </Reference>
-    <Reference Include="Affdex" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <HintPath>..\..\Program Files (x86)\Affectiva\Affdex SDK\bin\release\Affdex.dll</HintPath>
-    </Reference>
-
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -105,7 +101,16 @@
     <Resource Include="$(ProjectDir)Resources\AffectivaLogo1.png" />
     <Resource Include="$(ProjectDir)Resources\AffdexMe_Logo.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="affdex-native.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/AffdexMe/MainWindow.xaml b/AffdexMe/MainWindow.xaml
index 264d2ab..3412242 100644
--- a/AffdexMe/MainWindow.xaml
+++ b/AffdexMe/MainWindow.xaml
@@ -144,8 +144,7 @@
             <StackPanel Name="stackPanelClassifiers" Orientation="Vertical" Background="Transparent" Height="130" HorizontalAlignment="Stretch" VerticalAlignment="Top" >
                 
                 <Grid Name="gridClassifierDisplay" VerticalAlignment="Stretch" Background="Transparent" Margin="0,5,0,0"
-                      Width="{Binding ElementName=stackPanelClassifiers, Path=ActualWidth}"
-                      Height="{Binding ElementName=stackPanelClassifiers, Path=ActualHeight}" >
+                      Width="auto" Height="130px" >
                     
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.36*" />
@@ -237,7 +236,7 @@
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <Button Name="btnStartCamera" Style="{StaticResource CustomButtonStyle}" HorizontalAlignment="Center" Margin="0,0,5,0" VerticalAlignment="Top" Width="55" Content="Start" />
                         <Button Name="btnResetCamera" Style="{StaticResource CustomButtonStyle}" HorizontalAlignment="Center" Margin="0,0,5,0" VerticalAlignment="Top" Width="56" Content="Reset" />
-                        <Button Name="btnShowPoints" Style="{StaticResource CustomButtonStyle}" HorizontalAlignment="Center" Margin="0,0,5,0" VerticalAlignment="Top" Width="80" Content="Show Points" />
+                        <Button Name="btnShowPoints" Style="{StaticResource CustomButtonStyle}" HorizontalAlignment="Center" Margin="0,0,5,0" VerticalAlignment="Top" Width="90" Content="Show Points" />
                         <Button Name="btnStopCamera" Style="{StaticResource CustomButtonStyle}" HorizontalAlignment="Center" Margin="0,0,5,0" VerticalAlignment="Top" Width="55" Content="Stop" />
                         <Button Name="btnExit" Style="{StaticResource CustomButtonStyle}" HorizontalAlignment="Center" Margin="0,0,5,0" VerticalAlignment="Bottom" Width="55" Content="Exit" />
                     </StackPanel>
diff --git a/AffdexMe/MainWindow.xaml.cs b/AffdexMe/MainWindow.xaml.cs
index 9052a1b..79f2e83 100644
--- a/AffdexMe/MainWindow.xaml.cs
+++ b/AffdexMe/MainWindow.xaml.cs
@@ -28,7 +28,7 @@ namespace AffdexMe
         /// <summary>
         /// Location of AffdexSDK Licence file
         /// </summary>
-        private const String AFFDEX_LICENSE_FILE = "C:\\Affectiva\\Build\\AffdexfaceWindows\\bin\\affdex.license";
+        private const String AFFDEX_LICENSE_FILE = "C:\\Program Files (x86)\\Affectiva\\Affdex SDK\\affdex.license";
 
         #region Member Variables and Enums