Skip to content

Commit 873e69d

Browse files
committed
Update imagemagick patch
1 parent 2a2e7b2 commit 873e69d

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

patches/imagemagick.patch

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
2 files changed, 2 insertions(+), 4 deletions(-)
44

55
diff --git a/configure/CommandLineInfo.cpp b/configure/CommandLineInfo.cpp
6-
index 7df7c40..77103d0 100644
6+
index c212e91..7f045bf 100644
77
--- a/configure/CommandLineInfo.cpp
88
+++ b/configure/CommandLineInfo.cpp
9-
@@ -140,8 +140,8 @@ void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast
10-
_useOpenMP=false;
11-
else if (_wcsicmp(pszParam, L"noWizard") == 0)
12-
_noWizard=true;
13-
- else if (_wcsicmp(pszParam, L"openCL") == 0)
14-
- _useOpenCL=true;
15-
+ else if (_wcsicmp(pszParam, L"noOpenCL") == 0)
16-
+ _useOpenCL=false;
17-
else if (_wcsicmp(pszParam, L"Q8") == 0)
18-
_quantumDepth=Q8;
19-
else if (_wcsicmp(pszParam, L"Q16") == 0)
9+
@@ -165,8 +165,8 @@ void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast
10+
_noWizard=true;
11+
else if (_wcsicmp(pszParam, L"LimitedPolicy") == 0)
12+
_policyConfig=PolicyConfig::LIMITED;
13+
- else if (_wcsicmp(pszParam, L"openCL") == 0)
14+
- _useOpenCL=true;
15+
+ else if (_wcsicmp(pszParam, L"noOpenCL") == 0)
16+
+ _useOpenCL=false;
17+
else if (_wcsicmp(pszParam, L"OpenPolicy") == 0)
18+
_policyConfig=PolicyConfig::OPEN;
19+
else if (_wcsicmp(pszParam, L"Q8") == 0)
2020
diff --git a/configure/ProjectFile.cpp b/configure/ProjectFile.cpp
21-
index 16ac012..99208b5 100644
21+
index 0a68b9e..a9cb1d7 100644
2222
--- a/configure/ProjectFile.cpp
2323
+++ b/configure/ProjectFile.cpp
24-
@@ -600,8 +600,6 @@ void ProjectFile::writeItemDefinitionGroup(wofstream &file,const bool debug)
25-
file << " <WarningLevel>TurnOffAllWarnings</WarningLevel>" << endl;
26-
else
27-
file << " <WarningLevel>Level" << _project->warningLevel() << "</WarningLevel>" << endl;
28-
- if (_project->treatWarningAsError())
29-
- file << " <TreatWarningAsError>true</TreatWarningAsError>" << endl;
30-
file << " <SuppressStartupBanner>true</SuppressStartupBanner>" << endl;
31-
file << " <CompileAs>Default</CompileAs>" << endl;
32-
file << " <InlineFunctionExpansion>" << (debug ? "Disabled" : "AnySuitable") << "</InlineFunctionExpansion>" << endl;
24+
@@ -755,8 +755,6 @@ void ProjectFile::writeItemDefinitionGroup(wofstream &file,const bool debug)
25+
file << " <WarningLevel>TurnOffAllWarnings</WarningLevel>" << endl;
26+
else
27+
file << " <WarningLevel>Level" << _project->warningLevel() << "</WarningLevel>" << endl;
28+
- if (_project->treatWarningAsError())
29+
- file << " <TreatWarningAsError>true</TreatWarningAsError>" << endl;
30+
file << " <SuppressStartupBanner>true</SuppressStartupBanner>" << endl;
31+
if (_project->compiler(_wizard->visualStudioVersion()) == Compiler::CPP)
32+
file << " <CompileAs>CompileAsCpp</CompileAs>" << endl;

0 commit comments

Comments
 (0)