Update imagemagick patch

winlibs · Mar 24, 2024 · 873e69d · 873e69d
1 parent 2a2e7b2
commit 873e69d
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/patches/imagemagick.patch b/patches/imagemagick.patch
@@ -3,30 +3,30 @@
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/configure/CommandLineInfo.cpp b/configure/CommandLineInfo.cpp
-index 7df7c40..77103d0 100644
+index c212e91..7f045bf 100644
 --- a/configure/CommandLineInfo.cpp
 +++ b/configure/CommandLineInfo.cpp
-@@ -140,8 +140,8 @@ void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast
-     _useOpenMP=false;
-   else if (_wcsicmp(pszParam, L"noWizard") == 0)
-     _noWizard=true;
--  else if (_wcsicmp(pszParam, L"openCL") == 0)
--    _useOpenCL=true;
-+  else if (_wcsicmp(pszParam, L"noOpenCL") == 0)
-+    _useOpenCL=false;
-   else if (_wcsicmp(pszParam, L"Q8") == 0)
-     _quantumDepth=Q8;
-   else if (_wcsicmp(pszParam, L"Q16") == 0)
+@@ -165,8 +165,8 @@ void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast
+     _noWizard=true;
+   else if (_wcsicmp(pszParam, L"LimitedPolicy") == 0)
+     _policyConfig=PolicyConfig::LIMITED;
+-  else if (_wcsicmp(pszParam, L"openCL") == 0)
+-    _useOpenCL=true;
++  else if (_wcsicmp(pszParam, L"noOpenCL") == 0)
++    _useOpenCL=false;
+   else if (_wcsicmp(pszParam, L"OpenPolicy") == 0)
+     _policyConfig=PolicyConfig::OPEN;
+   else if (_wcsicmp(pszParam, L"Q8") == 0)
 diff --git a/configure/ProjectFile.cpp b/configure/ProjectFile.cpp
-index 16ac012..99208b5 100644
+index 0a68b9e..a9cb1d7 100644
 --- a/configure/ProjectFile.cpp
 +++ b/configure/ProjectFile.cpp
-@@ -600,8 +600,6 @@ void ProjectFile::writeItemDefinitionGroup(wofstream &file,const bool debug)
-     file << "      <WarningLevel>TurnOffAllWarnings</WarningLevel>" << endl;
-   else
-     file << "      <WarningLevel>Level" << _project->warningLevel() << "</WarningLevel>" << endl;
--  if (_project->treatWarningAsError())
--    file << "      <TreatWarningAsError>true</TreatWarningAsError>" << endl;
-   file << "      <SuppressStartupBanner>true</SuppressStartupBanner>" << endl;
-   file << "      <CompileAs>Default</CompileAs>" << endl;
-   file << "      <InlineFunctionExpansion>" << (debug ? "Disabled" : "AnySuitable") << "</InlineFunctionExpansion>" << endl;
+@@ -755,8 +755,6 @@ void ProjectFile::writeItemDefinitionGroup(wofstream &file,const bool debug)
+     file << "      <WarningLevel>TurnOffAllWarnings</WarningLevel>" << endl;
+   else
+     file << "      <WarningLevel>Level" << _project->warningLevel() << "</WarningLevel>" << endl;
+-  if (_project->treatWarningAsError())
+-    file << "      <TreatWarningAsError>true</TreatWarningAsError>" << endl;
+   file << "      <SuppressStartupBanner>true</SuppressStartupBanner>" << endl;
+   if (_project->compiler(_wizard->visualStudioVersion()) == Compiler::CPP)
+     file << "      <CompileAs>CompileAsCpp</CompileAs>" << endl;