diff --git a/src/ImageProcessor.UnitTests/ImageFactoryUnitTests.cs b/src/ImageProcessor.UnitTests/ImageFactoryUnitTests.cs
index a63f95ff2..1fc782073 100644
--- a/src/ImageProcessor.UnitTests/ImageFactoryUnitTests.cs
+++ b/src/ImageProcessor.UnitTests/ImageFactoryUnitTests.cs
@@ -51,5 +51,38 @@ namespace ImageProcessor.UnitTests
Assert.IsNotNull(imageFactory.Image);
}
}
+
+ /// >
+ /// Tests the loading of image from a memory stream
+ ///
+ ///
+ /// The file Name.
+ ///
+ ///
+ /// The expected mime type.
+ ///
+ [Test]
+ [TestCase("Chrysanthemum.jpg", "image/jpeg")]
+ [TestCase("Desert.jpg", "image/jpeg")]
+ [TestCase("cmyk.png", "image/png")]
+ [TestCase("Penguins.bmp", "image/bmp")]
+ [TestCase("Penguins.gif", "image/gif")]
+ public void TestLoadImageFromMemory(string fileName, string expectedMime)
+ {
+ string testPhoto = Path.Combine(this.localPath, string.Format("../../Images/{0}", fileName));
+ byte[] photoBytes = File.ReadAllBytes(testPhoto);
+
+ // ImageProcessor
+ using (MemoryStream inStream = new MemoryStream(photoBytes))
+ {
+ using (ImageFactory imageFactory = new ImageFactory())
+ {
+ imageFactory.Load(inStream);
+ Assert.AreEqual(null, imageFactory.ImagePath);
+ Assert.AreEqual(expectedMime, imageFactory.CurrentImageFormat.MimeType);
+ Assert.IsNotNull(imageFactory.Image);
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj b/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj
index 981d8ded5..111f5e03c 100644
--- a/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj
+++ b/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj
@@ -1,67 +1,58 @@
-
+
Debug
AnyCPU
- {633B1C4C-4823-47BE-9A01-A665F3118C8C}
+ {03CA9055-F997-428C-BF28-F50F991777C6}
Library
- Properties
ImageProcessor.UnitTests
ImageProcessor.UnitTests
- v4.0
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
+
+
..\
true
-
+ v4.5
true
full
false
- bin\Debug\
- DEBUG;TRACE
+ bin\Debug
+ DEBUG;
prompt
4
+ false
+ false
- pdbonly
+ full
true
- bin\Release\
- TRACE
+ bin\Release
prompt
4
+ false
+ false
+
+
..\packages\NUnit.2.6.3\lib\nunit.framework.dll
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {D011A778-59C8-4BFA-A770-C350216BF161}
+ ImageProcessor.Web_NET45
+
- {3b5dd734-fb7a-487d-8ce6-55e7af9aea7e}
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}
ImageProcessor
@@ -208,32 +199,121 @@
-
-
-
-
-
+
+
+ Images\Chrysanthemum.jpg
+ PreserveNewest
+
+
+ Images\Desert.jpg
+ PreserveNewest
+
+
+ Images\Hydrangeas.jpg
+ PreserveNewest
+
+
+ Images\Jellyfish.jpg
+ PreserveNewest
+
+
+ Images\Koala.jpg
+ PreserveNewest
+
+
+ Images\Lighthouse.jpg
+ PreserveNewest
+
+
+ Images\Penguins-200.jpg
+ PreserveNewest
+
+
+ Images\Penguins-8.png
+ PreserveNewest
+
+
+ Images\Penguins.bmp
+ PreserveNewest
+
+
+ Images\Penguins.gif
+ PreserveNewest
+
+
+ Images\Penguins.jpg
+ PreserveNewest
+
+
+ Images\Penguins.png
+ PreserveNewest
+
+
+ Images\Penguins.tif
+ PreserveNewest
+
+
+ Images\Tulips.jpg
+ PreserveNewest
+
+
+ Images\bus.jpg
+ PreserveNewest
+
+
+ Images\cmyk.jpg
+ PreserveNewest
+
+
+ Images\cmyk.png
+ PreserveNewest
+
+
+ Images\jrt.jpg
+ PreserveNewest
+
+
+ Images\meter.gif
+ PreserveNewest
+
+
+ Images\rocks.jpg
+ PreserveNewest
+
+
+ Images\rotate.jpg
+ PreserveNewest
+
+
+ Images\sample1.jpg
+ PreserveNewest
+
+
+ Images\srgb.jpg
+ PreserveNewest
+
+
+ Images\srgb.png
+ PreserveNewest
+
+
+ Images\text.png
+ PreserveNewest
+
+
+ Images\thor.jpg
+ PreserveNewest
+
+
+ Images\udendørs-374.jpg
+ PreserveNewest
+
+
+ Images\udendørs.jpg
+ PreserveNewest
+
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
-
+
@@ -241,11 +321,4 @@
-
\ No newline at end of file
diff --git a/src/ImageProcessor_Mono.sln b/src/ImageProcessor_Mono.sln
index 7d47a2ca6..8b1e0fb37 100644
--- a/src/ImageProcessor_Mono.sln
+++ b/src/ImageProcessor_Mono.sln
@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C427A497-74DC-49B1-8420-D6E68354F29B}"
- ProjectSection(SolutionItems) = preProject
- ImageProcessor.vsmdi = ImageProcessor.vsmdi
- Local.testsettings = Local.testsettings
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E656CDE-124D-4FAF-837C-0EF1E192D418}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -24,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web_NET45",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessorConsole", "ImageProcessorConsole\ImageProcessorConsole.csproj", "{7BF5274B-56A7-4B62-8105-E9BDF25BAFE7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.UnitTests", "ImageProcessor.UnitTests\ImageProcessor.UnitTests.csproj", "{03CA9055-F997-428C-BF28-F50F991777C6}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
All|Any CPU = All|Any CPU
@@ -37,6 +33,24 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {03CA9055-F997-428C-BF28-F50F991777C6}.All|Any CPU.ActiveCfg = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.All|Any CPU.Build.0 = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.All|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.All|Mixed Platforms.Build.0 = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.All|x86.ActiveCfg = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.All|x86.Build.0 = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Debug|x86.Build.0 = Debug|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Release|x86.ActiveCfg = Release|Any CPU
+ {03CA9055-F997-428C-BF28-F50F991777C6}.Release|x86.Build.0 = Release|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Any CPU.ActiveCfg = All|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Any CPU.Build.0 = All|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.ActiveCfg = All|Any CPU