Fixup for AppVeyor compiler version

imazen · Nov 28, 2017 · f80bfd3 · f80bfd3
1 parent 900348b
commit f80bfd3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Plugins/Faces/FeatureDetectionBase.cs b/Plugins/Faces/FeatureDetectionBase.cs
@@ -66,7 +66,8 @@ public FeatureDetectionBase()
 
         protected TR BorrowCascade<TR>(string fileNameKey, Func<CvHaarClassifierCascade, TR> operation)
         {
-            if (fileNames != null && fileNames.TryGetValue(fileNameKey, out var name) == true) {
+            string name;
+            if (fileNames != null && fileNames.TryGetValue(fileNameKey, out name) == true) {
                 if (name != null) {
                     return CascadePool.Shared.Borrow(name, operation, 10000);
                 }

diff --git a/Plugins/Faces/ImageResizer.Plugins.Faces.csproj b/Plugins/Faces/ImageResizer.Plugins.Faces.csproj
@@ -151,9 +151,7 @@
     <None Include="packages.config" />
     <None Include="readme.md" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Faces2\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/Plugins/Faces/Pools.cs b/Plugins/Faces/Pools.cs
@@ -107,7 +107,8 @@ public TR Borrow<TR>(string key, Func<T,TR> operation, int timeoutMs)
         TR BorrowItemInternal<TR>(string key, Func<T, TR> operation)
         {
             var bag = pool.GetOrAdd(key, name => new ConcurrentBag<T>());
-            if (bag.TryTake(out var c))
+            T c;
+            if (bag.TryTake(out c))
             {
                 return RunAndReturnToBag(bag, c, operation);
             }