From 1c96ab00ef59d13b56ece8b668afd6d2b2b1aa18 Mon Sep 17 00:00:00 2001
From: Victor Efimov <tp7ptr@gmail.com>
Date: Fri, 13 Dec 2013 07:59:19 +1100
Subject: [PATCH] Fix in-place filters doing MEMSET instead of COPY

---
 common/build/common.vcxproj       | 6 ++++--
 common/clip/clip.h                | 1 -
 masktools/build/masktools.vcxproj | 2 ++
 masktools/common/params/params.h  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/build/common.vcxproj b/common/build/common.vcxproj
index 1261e04..37cc31b 100644
--- a/common/build/common.vcxproj
+++ b/common/build/common.vcxproj
@@ -315,8 +315,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release-avs26|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>C:\Soft\Boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -328,6 +328,8 @@
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat />
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)common.lib</OutputFile>
diff --git a/common/clip/clip.h b/common/clip/clip.h
index 7b1349f..8f6a26d 100644
--- a/common/clip/clip.h
+++ b/common/clip/clip.h
@@ -19,7 +19,6 @@ class Clip {
    Clip() : nFrames(-1), nWidth(-1), nHeight(-1), C(COLORSPACE_NONE) { }
    Clip(int nWidth, int nHeight, int nFrames, Colorspace colorspace) : nFrames(nFrames), nWidth(nWidth), nHeight(nHeight), C(colorspace) { }
    Clip(const Clip *clip) : nFrames(clip ? clip->frame_count() : -1), nWidth(clip ? clip->width() : -1), nHeight(clip ? clip->height() : -1), C(clip ? clip->colorspace() : COLORSPACE_NONE) { }
-   virtual ~Clip() { assert( !is_refed() ); }
    int width() const { return nWidth; }
    int height() const { return nHeight; }
    int frame_count() const { return nFrames; }
diff --git a/masktools/build/masktools.vcxproj b/masktools/build/masktools.vcxproj
index 58d0e8c..ae19e17 100644
--- a/masktools/build/masktools.vcxproj
+++ b/masktools/build/masktools.vcxproj
@@ -285,6 +285,8 @@
       <AssemblerOutput>AssemblyCode</AssemblerOutput>
       <AssemblerListingLocation>$(IntDir)\asm\</AssemblerListingLocation>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/masktools/common/params/params.h b/masktools/common/params/params.h
index e11fd9d..d730965 100644
--- a/masktools/common/params/params.h
+++ b/masktools/common/params/params.h
@@ -23,7 +23,7 @@ class Operator {
 public:
 
    Operator() : mode(NONE), nValue(-1) {}
-   Operator(Mode mode, int nValue) : mode(mode), nValue(mode == MEMSET ? nValue : -1) {}
+   Operator(Mode mode, int nValue = -1) : mode(mode), nValue(mode == MEMSET ? nValue : -1) {}
    Operator(int nValue)
    {
       this->nValue = -1;