Browse Source

Making project build on Mono

Former-commit-id: 78fbbc22918ba951d74ac2b16a1c996b0ca21661
af/merge-core
James South 12 years ago
parent
commit
44677a1012
  1. 1
      src/ImageProcessor/ImageProcessor.csproj
  2. 4
      src/ImageProcessor/Imaging/Formats/FormatBase.cs

1
src/ImageProcessor/ImageProcessor.csproj

@ -13,6 +13,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<UseMSBuildEngine>False</UseMSBuildEngine>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

4
src/ImageProcessor/Imaging/Formats/FormatBase.cs

@ -90,7 +90,11 @@ namespace ImageProcessor.Imaging.Formats
/// </returns> /// </returns>
public virtual Image Load(Stream stream) public virtual Image Load(Stream stream)
{ {
#if !__MonoCS__
return Image.FromStream(stream, true); return Image.FromStream(stream, true);
#else
return Image.FromStream(stream);
#endif
} }
/// <summary> /// <summary>

Loading…
Cancel
Save