cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-26 17:11:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename color_image resources to dog

Browse Source 
As it's not always color.
This commit is contained in:
Ben Olden-Cooligan 2022-09-20 18:18:44 -07:00
parent 2d7b956b09
commit efa8d62cc0
58 changed files with 348 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NAPS2.App.Tests/Appium/ImportAndSaveTests.cs
View File

@ -45,7 +45,7 @@ public class ImportAndSaveTests : AppiumTests
PdfResources.word_p1,
PdfResources.word_p2,
PdfResources.word_patcht_p1,
ImageResources.color_image,
ImageResources.dog,
ImageResources.ocr_test);
PdfAsserts.AssertContainsTextOnce("ADVERTISEMENT.", path);
PdfAsserts.AssertContainsTextOnce("Page one.", path);

2
NAPS2.App.Tests/ConsoleAppTests.cs
View File

@ -8,7 +8,7 @@ public class ConsoleAppTests : ContextualTests
[Fact]
public void ConvertsImportedFile()
{
var importPath = CopyResourceToFile(ImageResources.color_image, "in.png");
var importPath = CopyResourceToFile(ImageResources.dog, "in.png");
var outputPath = Path.Combine(FolderPath, "out.jpg");
var args = $"-n 0 -i \"{importPath}\" -o \"{outputPath}\"";

2
NAPS2.Escl.Server/EsclApiController.cs
View File

@ -146,7 +146,7 @@ internal class EsclApiController : WebApiController
Response.ContentType = "image/jpeg";
Response.ContentEncoding = null;
using var stream = Response.OutputStream;
var bytes = File.ReadAllBytes(@"C:\Devel\VS\NAPS2.Future\NAPS2.Sdk.Tests\Resources\color_image.jpg");
var bytes = File.ReadAllBytes(@"C:\Devel\VS\NAPS2.Future\NAPS2.Sdk.Tests\Resources\dog.jpg");
stream.Write(bytes, 0, bytes.Length);
jobState.Status = JobStatus.Completed;
jobState.LastUpdated = Stopwatch.StartNew();

12
NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs
View File

@ -14,13 +14,13 @@ namespace NAPS2.Lib.Tests.Automation;
// TODO: Write tests for every option, or as many as possible
public class CommandLineIntegrationTests : ContextualTests
{
private static readonly byte[] Image1 = ImageResources.color_image;
private static readonly byte[] Image2 = ImageResources.color_image_h_n300;
private static readonly byte[] Image3 = ImageResources.color_image_h_p300;
private static readonly byte[] Image4 = ImageResources.color_image_s_n300;
private static readonly byte[] Image5 = ImageResources.color_image_s_p300;
private static readonly byte[] Image1 = ImageResources.dog;
private static readonly byte[] Image2 = ImageResources.dog_h_n300;
private static readonly byte[] Image3 = ImageResources.dog_h_p300;
private static readonly byte[] Image4 = ImageResources.dog_s_n300;
private static readonly byte[] Image5 = ImageResources.dog_s_p300;
// TODO: Figure out why 1bit causes failures, I assume it's just a test issue of some kind but idk
private static readonly byte[] Image6 = ImageResources.color_image_bw_24bit;
private static readonly byte[] Image6 = ImageResources.dog_bw_24bit;
private static readonly byte[] PatchT = ImageResources.patcht;
private readonly AutomationHelper _automationHelper;

6
NAPS2.Lib.Tests/Recovery/RecoveryManagerTests.cs
View File

@ -97,7 +97,7 @@ public class RecoveryManagerTests : ContextualTests
Assert.True(result);
Assert.Equal(2, images.Count);
ImageAsserts.Similar(ImageResources.color_image, images[0]);
ImageAsserts.Similar(ImageResources.dog, images[0]);
mockProgressCallback.Verify(callback => callback(0, 2));
mockProgressCallback.Verify(callback => callback(1, 2));
@ -154,7 +154,7 @@ public class RecoveryManagerTests : ContextualTests
Assert.True(result);
Assert.Single(images);
ImageAsserts.Similar(ImageResources.color_image, images[0]);
ImageAsserts.Similar(ImageResources.dog, images[0]);
mockProgressCallback.Verify(callback => callback(0, 2));
mockProgressCallback.Verify(callback => callback(1, 2));
@ -178,6 +178,6 @@ public class RecoveryManagerTests : ContextualTests
private ProcessedImage CreateRecoveryImage(ScanningContext recoveryContext)
{
return recoveryContext.CreateProcessedImage(ImageContext.Load(ImageResources.color_image));
return recoveryContext.CreateProcessedImage(ImageContext.Load(ImageResources.dog));
}
}

2
NAPS2.Sdk.Tests/ContextualTests.cs
View File

@ -34,7 +34,7 @@ public class ContextualTests : IDisposable
public ProcessedImage CreateScannedImage()
{
// TODO: A different placeholder image here?
return ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
return ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
}
public void SetUpOcr()

124
NAPS2.Sdk.Tests/ImageResources.Designer.cs generated
View File

@ -62,9 +62,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image {
internal static byte[] dog {
get {
object obj = ResourceManager.GetObject("color_image", resourceCulture);
object obj = ResourceManager.GetObject("dog", resourceCulture);
return ((byte[])(obj));
}
}
@ -72,9 +72,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_alpha {
internal static byte[] dog_alpha {
get {
object obj = ResourceManager.GetObject("color_image_alpha", resourceCulture);
object obj = ResourceManager.GetObject("dog_alpha", resourceCulture);
return ((byte[])(obj));
}
}
@ -82,9 +82,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_b_n300 {
internal static byte[] dog_b_n300 {
get {
object obj = ResourceManager.GetObject("color_image_b_n300", resourceCulture);
object obj = ResourceManager.GetObject("dog_b_n300", resourceCulture);
return ((byte[])(obj));
}
}
@ -92,9 +92,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_b_p300 {
internal static byte[] dog_b_p300 {
get {
object obj = ResourceManager.GetObject("color_image_b_p300", resourceCulture);
object obj = ResourceManager.GetObject("dog_b_p300", resourceCulture);
return ((byte[])(obj));
}
}
@ -102,9 +102,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_b_p300_thumb_256 {
internal static byte[] dog_b_p300_thumb_256 {
get {
object obj = ResourceManager.GetObject("color_image_b_p300_thumb_256", resourceCulture);
object obj = ResourceManager.GetObject("dog_b_p300_thumb_256", resourceCulture);
return ((byte[])(obj));
}
}
@ -112,9 +112,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_bw {
internal static byte[] dog_bw {
get {
object obj = ResourceManager.GetObject("color_image_bw", resourceCulture);
object obj = ResourceManager.GetObject("dog_bw", resourceCulture);
return ((byte[])(obj));
}
}
@ -122,9 +122,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_bw_24bit {
internal static byte[] dog_bw_24bit {
get {
object obj = ResourceManager.GetObject("color_image_bw_24bit", resourceCulture);
object obj = ResourceManager.GetObject("dog_bw_24bit", resourceCulture);
return ((byte[])(obj));
}
}
@ -132,9 +132,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_bw_invertpal {
internal static byte[] dog_bw_invertpal {
get {
object obj = ResourceManager.GetObject("color_image_bw_invertpal", resourceCulture);
object obj = ResourceManager.GetObject("dog_bw_invertpal", resourceCulture);
return ((byte[])(obj));
}
}
@ -142,9 +142,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_bw_jpg {
internal static byte[] dog_bw_jpg {
get {
object obj = ResourceManager.GetObject("color_image_bw_jpg", resourceCulture);
object obj = ResourceManager.GetObject("dog_bw_jpg", resourceCulture);
return ((byte[])(obj));
}
}
@ -152,9 +152,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_bw_p300 {
internal static byte[] dog_bw_p300 {
get {
object obj = ResourceManager.GetObject("color_image_bw_p300", resourceCulture);
object obj = ResourceManager.GetObject("dog_bw_p300", resourceCulture);
return ((byte[])(obj));
}
}
@ -162,9 +162,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_c_5_10_15_20 {
internal static byte[] dog_c_5_10_15_20 {
get {
object obj = ResourceManager.GetObject("color_image_c_5_10_15_20", resourceCulture);
object obj = ResourceManager.GetObject("dog_c_5_10_15_20", resourceCulture);
return ((byte[])(obj));
}
}
@ -172,9 +172,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_c_n300 {
internal static byte[] dog_c_n300 {
get {
object obj = ResourceManager.GetObject("color_image_c_n300", resourceCulture);
object obj = ResourceManager.GetObject("dog_c_n300", resourceCulture);
return ((byte[])(obj));
}
}
@ -182,9 +182,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_c_p300 {
internal static byte[] dog_c_p300 {
get {
object obj = ResourceManager.GetObject("color_image_c_p300", resourceCulture);
object obj = ResourceManager.GetObject("dog_c_p300", resourceCulture);
return ((byte[])(obj));
}
}
@ -192,9 +192,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_h_n300 {
internal static byte[] dog_h_n300 {
get {
object obj = ResourceManager.GetObject("color_image_h_n300", resourceCulture);
object obj = ResourceManager.GetObject("dog_h_n300", resourceCulture);
return ((byte[])(obj));
}
}
@ -202,9 +202,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_h_p300 {
internal static byte[] dog_h_p300 {
get {
object obj = ResourceManager.GetObject("color_image_h_p300", resourceCulture);
object obj = ResourceManager.GetObject("dog_h_p300", resourceCulture);
return ((byte[])(obj));
}
}
@ -212,9 +212,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_huge {
internal static byte[] dog_huge {
get {
object obj = ResourceManager.GetObject("color_image_huge", resourceCulture);
object obj = ResourceManager.GetObject("dog_huge", resourceCulture);
return ((byte[])(obj));
}
}
@ -222,9 +222,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_huge_png {
internal static byte[] dog_huge_png {
get {
object obj = ResourceManager.GetObject("color_image_huge_png", resourceCulture);
object obj = ResourceManager.GetObject("dog_huge_png", resourceCulture);
return ((byte[])(obj));
}
}
@ -232,9 +232,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_low_quality {
internal static byte[] dog_low_quality {
get {
object obj = ResourceManager.GetObject("color_image_low_quality", resourceCulture);
object obj = ResourceManager.GetObject("dog_low_quality", resourceCulture);
return ((byte[])(obj));
}
}
@ -242,9 +242,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_mask {
internal static byte[] dog_mask {
get {
object obj = ResourceManager.GetObject("color_image_mask", resourceCulture);
object obj = ResourceManager.GetObject("dog_mask", resourceCulture);
return ((byte[])(obj));
}
}
@ -252,9 +252,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_png {
internal static byte[] dog_png {
get {
object obj = ResourceManager.GetObject("color_image_png", resourceCulture);
object obj = ResourceManager.GetObject("dog_png", resourceCulture);
return ((byte[])(obj));
}
}
@ -262,9 +262,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_r_180 {
internal static byte[] dog_r_180 {
get {
object obj = ResourceManager.GetObject("color_image_r_180", resourceCulture);
object obj = ResourceManager.GetObject("dog_r_180", resourceCulture);
return ((byte[])(obj));
}
}
@ -272,9 +272,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_r_n45 {
internal static byte[] dog_r_n45 {
get {
object obj = ResourceManager.GetObject("color_image_r_n45", resourceCulture);
object obj = ResourceManager.GetObject("dog_r_n45", resourceCulture);
return ((byte[])(obj));
}
}
@ -282,9 +282,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_r_p46 {
internal static byte[] dog_r_p46 {
get {
object obj = ResourceManager.GetObject("color_image_r_p46", resourceCulture);
object obj = ResourceManager.GetObject("dog_r_p46", resourceCulture);
return ((byte[])(obj));
}
}
@ -292,9 +292,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_r_p90 {
internal static byte[] dog_r_p90 {
get {
object obj = ResourceManager.GetObject("color_image_r_p90", resourceCulture);
object obj = ResourceManager.GetObject("dog_r_p90", resourceCulture);
return ((byte[])(obj));
}
}
@ -302,9 +302,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_s_n300 {
internal static byte[] dog_s_n300 {
get {
object obj = ResourceManager.GetObject("color_image_s_n300", resourceCulture);
object obj = ResourceManager.GetObject("dog_s_n300", resourceCulture);
return ((byte[])(obj));
}
}
@ -312,9 +312,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_s_p300 {
internal static byte[] dog_s_p300 {
get {
object obj = ResourceManager.GetObject("color_image_s_p300", resourceCulture);
object obj = ResourceManager.GetObject("dog_s_p300", resourceCulture);
return ((byte[])(obj));
}
}
@ -322,9 +322,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_sc_50pct {
internal static byte[] dog_sc_50pct {
get {
object obj = ResourceManager.GetObject("color_image_sc_50pct", resourceCulture);
object obj = ResourceManager.GetObject("dog_sc_50pct", resourceCulture);
return ((byte[])(obj));
}
}
@ -332,9 +332,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_sh_n1000 {
internal static byte[] dog_sh_n1000 {
get {
object obj = ResourceManager.GetObject("color_image_sh_n1000", resourceCulture);
object obj = ResourceManager.GetObject("dog_sh_n1000", resourceCulture);
return ((byte[])(obj));
}
}
@ -342,9 +342,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_sh_p1000 {
internal static byte[] dog_sh_p1000 {
get {
object obj = ResourceManager.GetObject("color_image_sh_p1000", resourceCulture);
object obj = ResourceManager.GetObject("dog_sh_p1000", resourceCulture);
return ((byte[])(obj));
}
}
@ -352,9 +352,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_thumb_256 {
internal static byte[] dog_thumb_256 {
get {
object obj = ResourceManager.GetObject("color_image_thumb_256", resourceCulture);
object obj = ResourceManager.GetObject("dog_thumb_256", resourceCulture);
return ((byte[])(obj));
}
}
@ -362,9 +362,9 @@ namespace NAPS2.Sdk.Tests {
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] color_image_tiff {
internal static byte[] dog_tiff {
get {
object obj = ResourceManager.GetObject("color_image_tiff", resourceCulture);
object obj = ResourceManager.GetObject("dog_tiff", resourceCulture);
return ((byte[])(obj));
}
}

124
NAPS2.Sdk.Tests/ImageResources.resx
View File

@ -118,74 +118,74 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="color_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_bw" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_bw.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_bw" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_bw.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_bw_24bit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_bw_24bit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_bw_24bit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_bw_24bit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_bw_jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_bw.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_bw_jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_bw.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_bw_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_bw_p300.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_bw_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_bw_p300.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_bw_invertpal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_bw_invertpal.bmp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_bw_invertpal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_bw_invertpal.bmp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_b_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_b_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_b_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_b_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_b_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_b_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_b_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_b_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_c_5_10_15_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_c_5_10_15_20.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_c_5_10_15_20" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_c_5_10_15_20.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_c_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_c_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_c_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_c_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_c_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_c_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_c_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_c_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_h_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_h_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_h_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_h_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_h_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_h_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_h_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_h_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_r_180" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_r_180.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_r_180" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_r_180.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_r_n45" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_r_n45.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_r_n45" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_r_n45.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_r_p46" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_r_p46.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_r_p46" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_r_p46.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_r_p90" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_r_p90.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_r_p90" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_r_p90.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_sc_50pct" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_sc_50pct.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_sc_50pct" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_sc_50pct.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_sh_n1000" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_sh_n1000.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_sh_n1000" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_sh_n1000.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_sh_p1000" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_sh_p1000.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_sh_p1000" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_sh_p1000.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_s_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_s_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_s_n300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_s_n300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_s_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_s_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_s_p300" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_s_p300.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_thumb_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_thumb_256.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_thumb_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_thumb_256.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="deskewed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\deskewed.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -199,8 +199,8 @@
<data name="stock_cat" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\stock-cat.jpeg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_b_p300_thumb_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_b_p300_thumb_256.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_b_p300_thumb_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_b_p300_thumb_256.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="patcht" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\patcht.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -211,25 +211,25 @@
<data name="image_upc_barcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\image_upc_barcode.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_low_quality" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_low_quality.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_low_quality" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_low_quality.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_alpha" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_alpha.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_alpha" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_alpha.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_mask.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_mask.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_huge" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_huge.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_huge" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_huge.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_huge_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_huge.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_huge_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_huge.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="color_image_tiff" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\color_image_set.tiff;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="dog_tiff" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\dog_set.tiff;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

2
NAPS2.Sdk.Tests/Images/BarcodeTests.cs
View File

@ -40,7 +40,7 @@ public class BarcodeTests : ContextualTests
[Fact]
public void DetectNothing()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var detection = BarcodeDetector.Detect(image, new BarcodeDetectionOptions
{
DetectBarcodes = true,

4
NAPS2.Sdk.Tests/Images/CopyBitwiseImageOpTests.cs
View File

@ -9,7 +9,7 @@ public class CopyBitwiseImageOpTests : ContextualTests
[Fact]
public void DestChannel_ColorToColor()
{
var original = LoadImage(ImageResources.color_image);
var original = LoadImage(ImageResources.dog);
var destR = original.CopyBlank();
var destB = original.CopyBlank();
@ -33,7 +33,7 @@ public class CopyBitwiseImageOpTests : ContextualTests
[Fact]
public void DestChannel_GrayscaleToColor()
{
var color = LoadImage(ImageResources.color_image);
var color = LoadImage(ImageResources.dog);
var original = color.CopyWithPixelFormat(ImagePixelFormat.Gray8);
var dest = color.CopyBlank();

4
NAPS2.Sdk.Tests/Images/GdiImageTests.cs
View File

@ -27,14 +27,14 @@ public class GdiImageTests
[PlatformFact(include: PlatformFlags.Windows)]
public void LoadInvertedPaletteBlackAndWhiteImage()
{
var bitmap = new Bitmap(new MemoryStream(ImageResources.color_image_bw_invertpal));
var bitmap = new Bitmap(new MemoryStream(ImageResources.dog_bw_invertpal));
var image = new GdiImage(new GdiImageContext(), bitmap);
Assert.True(image.FixedPixelFormat);
Assert.Equal(ImagePixelFormat.BW1, image.PixelFormat);
Assert.Equal(Color.Black.ToArgb(), image.Bitmap.Palette.Entries[0].ToArgb());
Assert.Equal(Color.White.ToArgb(), image.Bitmap.Palette.Entries[1].ToArgb());
ImageAsserts.Similar(ImageResources.color_image_bw, image, ImageAsserts.NULL_RMSE_THRESHOLD);
ImageAsserts.Similar(ImageResources.dog_bw, image, ImageAsserts.NULL_RMSE_THRESHOLD);
}
[PlatformFact(include: PlatformFlags.Windows)]

32
NAPS2.Sdk.Tests/Images/ImageExportHelperTests.cs
View File

@ -15,90 +15,90 @@ public class ImageExportHelperTests : ContextualTests
[Fact]
public void SaveSmallestFormat_BlackAndWhite()
{
var bw = LoadImage(ImageResources.color_image_bw).PerformTransform(new BlackWhiteTransform());
var bw = LoadImage(ImageResources.dog_bw).PerformTransform(new BlackWhiteTransform());
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, bw, BitDepth.BlackAndWhite, false, -1, out var format);
AssertPng(format, fullPath, ImageResources.color_image_bw);
AssertPng(format, fullPath, ImageResources.dog_bw);
}
[Fact]
public void SaveSmallestFormat_BlackAndWhiteWithColorBitDepth()
{
var bw = LoadImage(ImageResources.color_image_bw).PerformTransform(new BlackWhiteTransform());
var bw = LoadImage(ImageResources.dog_bw).PerformTransform(new BlackWhiteTransform());
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, bw, BitDepth.Color, false, -1, out var format);
AssertPng(format, fullPath, ImageResources.color_image_bw);
AssertPng(format, fullPath, ImageResources.dog_bw);
}
[Fact]
public void SaveSmallestFormat_ColorWithBlackWhiteBitDepth()
{
var color = LoadImage(ImageResources.color_image);
var color = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, color, BitDepth.BlackAndWhite, false, -1, out var format);
AssertPng(format, fullPath, ImageResources.color_image_bw, ImageAsserts.XPLAT_RMSE_THRESHOLD);
AssertPng(format, fullPath, ImageResources.dog_bw, ImageAsserts.XPLAT_RMSE_THRESHOLD);
}
[Fact]
public void SaveSmallestFormat_ColorHighQuality()
{
var color = LoadImage(ImageResources.color_image);
var color = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, color, BitDepth.Color, true, -1, out var format);
AssertPng(format, fullPath, ImageResources.color_image);
AssertPng(format, fullPath, ImageResources.dog);
}
[Fact]
public void SaveSmallestFormat_SmallerPng()
{
var bw = LoadImage(ImageResources.color_image_bw_24bit);
var bw = LoadImage(ImageResources.dog_bw_24bit);
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, bw, BitDepth.Color, false, -1, out var format);
AssertPng(format, fullPath, ImageResources.color_image_bw);
AssertPng(format, fullPath, ImageResources.dog_bw);
}
[Fact]
public void SaveSmallestFormat_OriginalPng()
{
var color = LoadImage(ImageResources.color_image_png);
var color = LoadImage(ImageResources.dog_png);
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, color, BitDepth.Color, false, -1, out var format);
AssertPng(format, fullPath, ImageResources.color_image);
AssertPng(format, fullPath, ImageResources.dog);
}
[Fact]
public void SaveSmallestFormat_SmallerJpeg()
{
var color = LoadImage(ImageResources.color_image_png);
var color = LoadImage(ImageResources.dog_png);
color.OriginalFileFormat = ImageFileFormat.Unspecified;
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, color, BitDepth.Color, false, -1, out var format);
AssertJpeg(format, fullPath, ImageResources.color_image);
AssertJpeg(format, fullPath, ImageResources.dog);
}
[Fact]
public void SaveSmallestFormat_OriginalJpeg()
{
var color = LoadImage(ImageResources.color_image_bw_jpg);
var color = LoadImage(ImageResources.dog_bw_jpg);
var path = Path.Combine(FolderPath, "test");
var fullPath = _helper.SaveSmallestFormat(path, color, BitDepth.Color, false, -1, out var format);
AssertJpeg(format, fullPath, ImageResources.color_image_bw);
AssertJpeg(format, fullPath, ImageResources.dog_bw);
}
private void AssertPng(ImageFileFormat format, string fullPath, byte[] expectedImage,

36
NAPS2.Sdk.Tests/Images/ImageSerializerTests.cs
View File

@ -20,7 +20,7 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get());
using var sourceImage = ScanningContext.CreateProcessedImage(
LoadImage(ImageResources.color_image), // TODO: Use an actual grayscale image
LoadImage(ImageResources.dog), // TODO: Use an actual grayscale image
BitDepth.Grayscale,
true,
-1,
@ -33,7 +33,7 @@ public class ImageSerializerTests : ContextualTests
Assert.Equal(300, Assert.IsType<BrightnessTransform>(destImage.TransformState.Transforms[0]).Brightness);
Assert.True(destImage.Metadata.Lossless);
Assert.Equal(BitDepth.Grayscale, destImage.Metadata.BitDepth);
ImageAsserts.Similar(ImageResources.color_image_b_p300, destImage.Render());
ImageAsserts.Similar(ImageResources.dog_b_p300, destImage.Render());
}
[Theory]
@ -45,14 +45,14 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get(),
FileStorageManager.CreateFolder(Path.Combine(FolderPath, "dest")));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var serializedImage = ImageSerializer.Serialize(sourceImage, new SerializeImageOptions());
using var destImage = ImageSerializer.Deserialize(destContext, serializedImage, new DeserializeImageOptions());
Assert.IsType<ImageFileStorage>(destImage.Storage);
// Check that disposing the original doesn't interfere with rendering, i.e. not using the same backing file
sourceImage.Dispose();
ImageAsserts.Similar(ImageResources.color_image, destImage.Render());
ImageAsserts.Similar(ImageResources.dog, destImage.Render());
}
[Theory]
@ -63,14 +63,14 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get());
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var serializedImage = ImageSerializer.Serialize(sourceImage, new SerializeImageOptions());
using var destImage = ImageSerializer.Deserialize(destContext, serializedImage, new DeserializeImageOptions());
Assert.IsAssignableFrom<IMemoryImage>(destImage.Storage);
// Check that disposing the original doesn't interfere with rendering, i.e. not using the same image
sourceImage.Dispose();
ImageAsserts.Similar(ImageResources.color_image, destImage.Render());
ImageAsserts.Similar(ImageResources.dog, destImage.Render());
}
[Fact]
@ -81,7 +81,7 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get(),
FileStorageManager.CreateFolder(Path.Combine(FolderPath, "dest")));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var serializedImage = ImageSerializer.Serialize(sourceImage, new SerializeImageOptions());
using var destImage = ImageSerializer.Deserialize(destContext, serializedImage, new DeserializeImageOptions
{
@ -91,7 +91,7 @@ public class ImageSerializerTests : ContextualTests
var sourceStorage = Assert.IsType<ImageFileStorage>(sourceImage.Storage);
var destStorage = Assert.IsType<ImageFileStorage>(destImage.Storage);
Assert.Equal(sourceStorage.FullPath, destStorage.FullPath);
ImageAsserts.Similar(ImageResources.color_image, destImage.Render());
ImageAsserts.Similar(ImageResources.dog, destImage.Render());
destImage.Dispose();
Assert.True(File.Exists(sourceStorage.FullPath));
@ -107,7 +107,7 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get(),
FileStorageManager.CreateFolder(Path.Combine(FolderPath, "dest")));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var serializedImage = ImageSerializer.Serialize(sourceImage, new SerializeImageOptions
{
TransferOwnership = true
@ -117,7 +117,7 @@ public class ImageSerializerTests : ContextualTests
var sourceStorage = Assert.IsType<ImageFileStorage>(sourceImage.Storage);
var destStorage = Assert.IsType<ImageFileStorage>(destImage.Storage);
Assert.Equal(sourceStorage.FullPath, destStorage.FullPath);
ImageAsserts.Similar(ImageResources.color_image, destImage.Render());
ImageAsserts.Similar(ImageResources.dog, destImage.Render());
sourceImage.Dispose();
Assert.True(File.Exists(sourceStorage.FullPath));
@ -133,7 +133,7 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get(),
FileStorageManager.CreateFolder(Path.Combine(FolderPath, "dest")));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var serializedImage = ImageSerializer.Serialize(sourceImage, new SerializeImageOptions
{
CrossDevice = true
@ -142,7 +142,7 @@ public class ImageSerializerTests : ContextualTests
sourceImage.Dispose();
using var destImage = ImageSerializer.Deserialize(destContext, serializedImage, new DeserializeImageOptions());
ImageAsserts.Similar(ImageResources.color_image, destImage.Render());
ImageAsserts.Similar(ImageResources.dog, destImage.Render());
}
[Fact]
@ -188,7 +188,7 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get(),
FileStorageManager.CreateFolder(Path.Combine(FolderPath, "dest")));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var serializedImage = ImageSerializer.Serialize(sourceImage, new SerializeImageOptions());
using var destImage = ImageSerializer.Deserialize(destContext, serializedImage, new DeserializeImageOptions
{
@ -206,7 +206,7 @@ public class ImageSerializerTests : ContextualTests
{
new StorageConfig.File().Apply(this);
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var clone = sourceImage.Clone();
Assert.Throws<ArgumentException>(() => ImageSerializer.Serialize(sourceImage, new SerializeImageOptions
{
@ -217,7 +217,7 @@ public class ImageSerializerTests : ContextualTests
[Fact]
public void TransferOwnership_DisposesMemory()
{
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
ImageSerializer.Serialize(sourceImage, new SerializeImageOptions
{
TransferOwnership = true
@ -319,7 +319,7 @@ public class ImageSerializerTests : ContextualTests
using var destContext = new ScanningContext(TestImageContextFactory.Get());
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var imageWithThumbnail = sourceImage.WithPostProcessingData(new PostProcessingData
{
Thumbnail = sourceImage.Render().PerformTransform(new ThumbnailTransform(256)),
@ -336,7 +336,7 @@ public class ImageSerializerTests : ContextualTests
#if NET6_0_OR_GREATER
Assert.Equal(256, destImage.PostProcessingData.Thumbnail?.Width);
#else
ImageAsserts.Similar(ImageResources.color_image_thumb_256, destImage.PostProcessingData.Thumbnail,
ImageAsserts.Similar(ImageResources.dog_thumb_256, destImage.PostProcessingData.Thumbnail,
ImageAsserts.XPLAT_RMSE_THRESHOLD, ignoreResolution: true);
#endif
}
@ -346,7 +346,7 @@ public class ImageSerializerTests : ContextualTests
{
using var destContext = new ScanningContext(TestImageContextFactory.Get());
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var sourceImage = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var imageWithThumbnail = sourceImage.WithPostProcessingData(new PostProcessingData
{
Thumbnail = sourceImage.Render().PerformTransform(new ThumbnailTransform(256)),

36
NAPS2.Sdk.Tests/Images/LoadSaveTests.cs
View File

@ -98,21 +98,21 @@ public class LoadSaveTests : ContextualTests
public void LoadFromWrongExtension()
{
// Actually a jpeg
var path = CopyResourceToFile(ImageResources.color_image, "image.png");
var path = CopyResourceToFile(ImageResources.dog, "image.png");
var image = ImageContext.Load(path);
Assert.Equal(ImageFileFormat.Jpeg, image.OriginalFileFormat);
ImageAsserts.Similar(ImageResources.color_image, image);
ImageAsserts.Similar(ImageResources.dog, image);
}
[Fact]
public void LoadFramesFromWrongExtension()
{
// Actually a jpeg
var path = CopyResourceToFile(ImageResources.color_image, "image.tiff");
var path = CopyResourceToFile(ImageResources.dog, "image.tiff");
var images = ImageContext.LoadFrames(path, out _).ToList();
Assert.Single(images);
Assert.Equal(ImageFileFormat.Jpeg, images[0].OriginalFileFormat);
ImageAsserts.Similar(ImageResources.color_image, images[0]);
ImageAsserts.Similar(ImageResources.dog, images[0]);
}
private static byte[] GetResource(string resource) =>
@ -123,39 +123,39 @@ public class LoadSaveTests : ContextualTests
{
new object[]
{
ImageFileFormat.Png, ".png", "color_image_alpha",
new[] { "color_image_alpha" }, new[] { ImagePixelFormat.ARGB32 }, false
ImageFileFormat.Png, ".png", "dog_alpha",
new[] { "dog_alpha" }, new[] { ImagePixelFormat.ARGB32 }, false
},
new object[]
{
ImageFileFormat.Png, ".png", "color_image_png",
new[] { "color_image" }, new[] { ImagePixelFormat.RGB24 }, false
ImageFileFormat.Png, ".png", "dog_png",
new[] { "dog" }, new[] { ImagePixelFormat.RGB24 }, false
},
new object[]
{
ImageFileFormat.Png, ".png", "color_image_bw",
new[] { "color_image_bw" }, new[] { ImagePixelFormat.BW1 }, false
ImageFileFormat.Png, ".png", "dog_bw",
new[] { "dog_bw" }, new[] { ImagePixelFormat.BW1 }, false
},
// TODO: Update resources for more pixel format tests
new object[]
{
ImageFileFormat.Jpeg, ".jpg", "color_image",
new[] { "color_image" }, new[] { ImagePixelFormat.RGB24 }, false
ImageFileFormat.Jpeg, ".jpg", "dog",
new[] { "dog" }, new[] { ImagePixelFormat.RGB24 }, false
},
new object[]
{
ImageFileFormat.Jpeg, ".jpg", "color_image_bw_jpg",
new[] { "color_image_bw" }, new[] { ImagePixelFormat.Gray8 }, false
ImageFileFormat.Jpeg, ".jpg", "dog_bw_jpg",
new[] { "dog_bw" }, new[] { ImagePixelFormat.Gray8 }, false
},
new object[]
{
ImageFileFormat.Bmp, ".bmp", "color_image_bw_invertpal",
new[] { "color_image_bw" }, new[] { ImagePixelFormat.BW1 }, true
ImageFileFormat.Bmp, ".bmp", "dog_bw_invertpal",
new[] { "dog_bw" }, new[] { ImagePixelFormat.BW1 }, true
},
new object[]
{
ImageFileFormat.Tiff, ".tiff", "color_image_tiff",
new[] { "color_image", "color_image_h_p300", "stock_cat" },
ImageFileFormat.Tiff, ".tiff", "dog_tiff",
new[] { "dog", "dog_h_p300", "stock_cat" },
new[] { ImagePixelFormat.RGB24, ImagePixelFormat.RGB24, ImagePixelFormat.RGB24 }, false
},
};

32
NAPS2.Sdk.Tests/Images/MemoryImageTests.cs
View File

@ -17,19 +17,19 @@ public class MemoryImageTests : ContextualTests
[Fact]
public void Save()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test.jpg");
image.Save(path, ImageFileFormat.Jpeg);
var loaded = TestImageContextFactory.Get().Load(path);
ImageAsserts.Similar(ImageResources.color_image, loaded);
ImageAsserts.Similar(ImageResources.dog, loaded);
}
[Fact]
public void SaveWithQuality()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var highQualityPath = Path.Combine(FolderPath, "highq.jpg");
var lowQualityPath = Path.Combine(FolderPath, "lowq.jpg");
@ -39,30 +39,30 @@ public class MemoryImageTests : ContextualTests
var highQuality = TestImageContextFactory.Get().Load(highQualityPath);
var lowQuality = TestImageContextFactory.Get().Load(lowQualityPath);
ImageAsserts.Similar(ImageResources.color_image, highQuality);
ImageAsserts.Similar(ImageResources.dog, highQuality);
// Rather than comparing to a reference image (which doesn't work consistently cross-platform), we just assert
// that we're a little bit off from the original image. i.e. that quality does *something*
ImageAsserts.NotSimilar(ImageResources.color_image, lowQuality);
ImageAsserts.Similar(ImageResources.color_image, lowQuality, 5.0);
ImageAsserts.NotSimilar(ImageResources.dog, lowQuality);
ImageAsserts.Similar(ImageResources.dog, lowQuality, 5.0);
}
[Fact]
public void SaveToStream()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test.jpg");
using var stream = new FileStream(path, FileMode.CreateNew);
image.Save(stream, ImageFileFormat.Jpeg);
var loaded = TestImageContextFactory.Get().Load(stream);
ImageAsserts.Similar(ImageResources.color_image, loaded);
ImageAsserts.Similar(ImageResources.dog, loaded);
}
[Fact]
public void SaveWithQualityToStream()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var highQualityStream = new MemoryStream();
var lowQualityStream = new MemoryStream();
@ -72,30 +72,30 @@ public class MemoryImageTests : ContextualTests
var highQuality = TestImageContextFactory.Get().Load(highQualityStream);
var lowQuality = TestImageContextFactory.Get().Load(lowQualityStream);
ImageAsserts.Similar(ImageResources.color_image, highQuality);
ImageAsserts.Similar(ImageResources.dog, highQuality);
// Rather than comparing to a reference image (which doesn't work consistently cross-platform), we just assert
// that we're a little bit off from the original image. i.e. that quality does *something*
ImageAsserts.NotSimilar(ImageResources.color_image, lowQuality);
ImageAsserts.Similar(ImageResources.color_image, lowQuality, 5.0);
ImageAsserts.NotSimilar(ImageResources.dog, lowQuality);
ImageAsserts.Similar(ImageResources.dog, lowQuality, 5.0);
}
[Fact]
public void SaveWithUnspecifiedFormatToPng()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test.png");
image.Save(path);
var loaded = TestImageContextFactory.Get().Load(path);
Assert.Equal(ImageFileFormat.Png, loaded.OriginalFileFormat);
ImageAsserts.Similar(ImageResources.color_image, loaded, ImageAsserts.NULL_RMSE_THRESHOLD);
ImageAsserts.Similar(ImageResources.dog, loaded, ImageAsserts.NULL_RMSE_THRESHOLD);
}
[Fact]
public void SaveWithUnspecifiedFormatToJpeg()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test.jpg");
image.Save(path);
@ -107,7 +107,7 @@ public class MemoryImageTests : ContextualTests
[Fact]
public void SaveWithUnspecifiedFormatToStream()
{
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var path = Path.Combine(FolderPath, "test.png");
using var stream = new FileStream(path, FileMode.CreateNew);

2
NAPS2.Sdk.Tests/Images/ProcessedImageTests.cs
View File

@ -9,7 +9,7 @@ public class ProcessedImageTests : ContextualTests
[Fact]
public void Construct()
{
var storage = LoadImage(ImageResources.color_image);
var storage = LoadImage(ImageResources.dog);
var metadata1 = new ImageMetadata(BitDepth.Color, false);
var postProcessingData1 = new PostProcessingData();

10
NAPS2.Sdk.Tests/Images/RenderTests.cs
View File

@ -12,12 +12,12 @@ public class RenderTests : ContextualTests
{
config.Apply(this);
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var processedImage = ScanningContext.CreateProcessedImage(image);
var rendered = processedImage.Render();
ImageAsserts.Similar(ImageResources.color_image, rendered);
ImageAsserts.Similar(ImageResources.dog, rendered);
}
[Theory]
@ -27,7 +27,7 @@ public class RenderTests : ContextualTests
config.Apply(this);
// TODO: Have an actual gray image to load
var image = LoadImage(ImageResources.color_image);
var image = LoadImage(ImageResources.dog);
var grayImage = image.CopyWithPixelFormat(ImagePixelFormat.Gray8);
var processedImage = ScanningContext.CreateProcessedImage(grayImage);
@ -42,12 +42,12 @@ public class RenderTests : ContextualTests
{
config.Apply(this);
var image = LoadImage(ImageResources.color_image_bw);
var image = LoadImage(ImageResources.dog_bw);
image = image.PerformTransform(new BlackWhiteTransform());
var processedImage = ScanningContext.CreateProcessedImage(image);
var rendered = processedImage.Render();
ImageAsserts.Similar(ImageResources.color_image_bw, rendered);
ImageAsserts.Similar(ImageResources.dog_bw, rendered);
}
}

28
NAPS2.Sdk.Tests/Images/TiffWriterTests.cs
View File

@ -19,10 +19,10 @@ public class TiffWriterTests : ContextualTests
public void SaveSinglePageTiffToFile()
{
var path = Path.Combine(FolderPath, "image.tiff");
var original = LoadImage(ImageResources.color_image);
var original = LoadImage(ImageResources.dog);
_tiffWriter.SaveTiff(new[] { original }, path);
AssertTiff(path, ImageResources.color_image);
AssertTiff(path, ImageResources.dog);
}
[Fact]
@ -31,23 +31,23 @@ public class TiffWriterTests : ContextualTests
var path = Path.Combine(FolderPath, "image.tiff");
var original = new[]
{
LoadImage(ImageResources.color_image),
LoadImage(ImageResources.color_image_bw),
LoadImage(ImageResources.dog),
LoadImage(ImageResources.dog_bw),
LoadImage(ImageResources.stock_cat)
};
_tiffWriter.SaveTiff(original, path);
AssertTiff(path, ImageResources.color_image, ImageResources.color_image_bw, ImageResources.stock_cat);
AssertTiff(path, ImageResources.dog, ImageResources.dog_bw, ImageResources.stock_cat);
}
[Fact]
public void SaveSinglePageTiffToStream()
{
var stream = new MemoryStream();
var original = LoadImage(ImageResources.color_image);
var original = LoadImage(ImageResources.dog);
_tiffWriter.SaveTiff(new[] { original }, stream);
AssertTiff(stream, ImageResources.color_image);
AssertTiff(stream, ImageResources.dog);
}
[Fact]
@ -56,33 +56,33 @@ public class TiffWriterTests : ContextualTests
var stream = new MemoryStream();
var original = new[]
{
LoadImage(ImageResources.color_image),
LoadImage(ImageResources.color_image_bw),
LoadImage(ImageResources.dog),
LoadImage(ImageResources.dog_bw),
LoadImage(ImageResources.stock_cat)
};
_tiffWriter.SaveTiff(original, stream);
AssertTiff(stream, ImageResources.color_image, ImageResources.color_image_bw, ImageResources.stock_cat);
AssertTiff(stream, ImageResources.dog, ImageResources.dog_bw, ImageResources.stock_cat);
}
[Fact]
public void SaveBlackAndWhiteTiff()
{
var path = Path.Combine(FolderPath, "image.tiff");
var original = LoadImage(ImageResources.color_image_bw);
var original = LoadImage(ImageResources.dog_bw);
_tiffWriter.SaveTiff(new[] { original }, path);
AssertTiff(path, ImageResources.color_image_bw);
AssertTiff(path, ImageResources.dog_bw);
}
[Fact]
public void SaveColorTiffWithG4()
{
var path = Path.Combine(FolderPath, "image.tiff");
var original = LoadImage(ImageResources.color_image);
var original = LoadImage(ImageResources.dog);
_tiffWriter.SaveTiff(new[] { original }, path, TiffCompressionType.Ccitt4);
AssertTiff(path, ImageResources.color_image_bw);
AssertTiff(path, ImageResources.dog_bw);
}
private void AssertTiff(string path, params byte[][] expectedImages)

136
NAPS2.Sdk.Tests/Images/TransformTests.cs
View File

@ -15,8 +15,8 @@ public class TransformTests : ContextualTests
[Fact]
public void BrightnessNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new BrightnessTransform());
@ -26,8 +26,8 @@ public class TransformTests : ContextualTests
[Fact]
public void BrightnessP300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_b_p300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_b_p300);
actual = actual.PerformTransform(new BrightnessTransform(300));
@ -37,8 +37,8 @@ public class TransformTests : ContextualTests
[Fact]
public void BrightnessN300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_b_n300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_b_n300);
actual = actual.PerformTransform(new BrightnessTransform(-300));
@ -48,8 +48,8 @@ public class TransformTests : ContextualTests
[Fact]
public void ContrastNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new TrueContrastTransform());
@ -59,8 +59,8 @@ public class TransformTests : ContextualTests
[Fact]
public void ContrastP300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_c_p300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_c_p300);
actual = actual.PerformTransform(new TrueContrastTransform(300));
@ -70,8 +70,8 @@ public class TransformTests : ContextualTests
[Fact]
public void ContrastN300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_c_n300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_c_n300);
actual = actual.PerformTransform(new TrueContrastTransform(-300));
@ -81,8 +81,8 @@ public class TransformTests : ContextualTests
[Fact]
public void HueNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new HueTransform());
@ -92,8 +92,8 @@ public class TransformTests : ContextualTests
[Fact]
public void HueP300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_h_p300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_h_p300);
actual = actual.PerformTransform(new HueTransform(300));
@ -103,8 +103,8 @@ public class TransformTests : ContextualTests
[Fact]
public void HueN300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_h_n300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_h_n300);
actual = actual.PerformTransform(new HueTransform(-300));
@ -114,8 +114,8 @@ public class TransformTests : ContextualTests
[Fact]
public void SaturationNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new SaturationTransform());
@ -125,8 +125,8 @@ public class TransformTests : ContextualTests
[Fact]
public void SaturationP300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_s_p300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_s_p300);
actual = actual.PerformTransform(new SaturationTransform(300));
@ -136,8 +136,8 @@ public class TransformTests : ContextualTests
[Fact]
public void SaturationN300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_s_n300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_s_n300);
actual = actual.PerformTransform(new SaturationTransform(-300));
@ -147,8 +147,8 @@ public class TransformTests : ContextualTests
[Fact]
public void SharpenNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new SharpenTransform());
@ -158,8 +158,8 @@ public class TransformTests : ContextualTests
[Fact]
public void SharpenP300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_sh_p1000);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_sh_p1000);
actual = actual.PerformTransform(new SharpenTransform(1000));
@ -169,8 +169,8 @@ public class TransformTests : ContextualTests
[Fact]
public void SharpenN300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_sh_n1000);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_sh_n1000);
actual = actual.PerformTransform(new SharpenTransform(-1000));
@ -180,8 +180,8 @@ public class TransformTests : ContextualTests
[Fact]
public void RotationNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new RotationTransform());
@ -191,8 +191,8 @@ public class TransformTests : ContextualTests
[Fact]
public void RotationP90()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_r_p90);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_r_p90);
actual = actual.PerformTransform(new RotationTransform(90));
@ -202,8 +202,8 @@ public class TransformTests : ContextualTests
[Fact]
public void RotationP46()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_r_p46);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_r_p46);
actual = actual.PerformTransform(new RotationTransform(46));
@ -213,8 +213,8 @@ public class TransformTests : ContextualTests
[Fact]
public void RotationN45()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_r_n45);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_r_n45);
actual = actual.PerformTransform(new RotationTransform(-45));
@ -225,9 +225,9 @@ public class TransformTests : ContextualTests
[Fact]
public void Rotation180()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage actual2 = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_r_180);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage actual2 = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_r_180);
actual = actual.PerformTransform(new RotationTransform(180));
actual2 = actual2.PerformTransform(new RotationTransform(-180));
@ -241,8 +241,8 @@ public class TransformTests : ContextualTests
[Fact]
public void ScaleNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new ScaleTransform());
@ -252,8 +252,8 @@ public class TransformTests : ContextualTests
[Fact]
public void Scale50Percent()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_sc_50pct);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_sc_50pct);
actual = actual.PerformTransform(new ScaleTransform(0.5));
@ -264,7 +264,7 @@ public class TransformTests : ContextualTests
[MemberData(nameof(CommutativeGrayTransforms))]
public void GrayTransformsAreCommutative(Transform transform)
{
IMemoryImage original = LoadImage(ImageResources.color_image);
IMemoryImage original = LoadImage(ImageResources.dog);
var actual = original.CopyWithPixelFormat(ImagePixelFormat.Gray8);
actual = actual.PerformTransform(transform);
@ -279,8 +279,8 @@ public class TransformTests : ContextualTests
[Fact]
public void Scale1000Percent()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_huge);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_huge);
actual = actual.PerformTransform(new ScaleTransform(10));
@ -290,8 +290,8 @@ public class TransformTests : ContextualTests
[Fact]
public void CropNull()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new CropTransform());
@ -301,8 +301,8 @@ public class TransformTests : ContextualTests
[Fact]
public void Crop()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_c_5_10_15_20);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_c_5_10_15_20);
actual = actual.PerformTransform(new CropTransform(10, 20, 15, 5));
@ -312,8 +312,8 @@ public class TransformTests : ContextualTests
[Fact]
public void CropBlackWhiteBeforeAfter()
{
IMemoryImage first = LoadImage(ImageResources.color_image);
IMemoryImage second = LoadImage(ImageResources.color_image);
IMemoryImage first = LoadImage(ImageResources.dog);
IMemoryImage second = LoadImage(ImageResources.dog);
first = first.PerformTransform(new BlackWhiteTransform());
first = first.PerformTransform(new CropTransform(10, 20, 15, 5));
@ -326,8 +326,8 @@ public class TransformTests : ContextualTests
[Fact]
public void CropWithOriginal()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_c_5_10_15_20);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_c_5_10_15_20);
actual = actual.PerformTransform(new CropTransform(10, 20, 15, 5, actual.Width, actual.Height));
@ -337,8 +337,8 @@ public class TransformTests : ContextualTests
[Fact]
public void CropWithDifferentOriginal()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_c_5_10_15_20);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_c_5_10_15_20);
actual = ImageContext.PerformTransform(actual,
new CropTransform(20, 40, 30, 10, actual.Width * 2, actual.Height * 2));
@ -349,8 +349,8 @@ public class TransformTests : ContextualTests
[Fact]
public void CropOutOfBounds()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog);
actual = actual.PerformTransform(new CropTransform(-1, -1, -1, -1));
@ -360,8 +360,8 @@ public class TransformTests : ContextualTests
[Fact]
public void BlackWhite()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_bw);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_bw);
actual = actual.PerformTransform(new BlackWhiteTransform());
Assert.Equal(ImagePixelFormat.BW1, actual.LogicalPixelFormat);
@ -374,8 +374,8 @@ public class TransformTests : ContextualTests
[Fact]
public void BlackWhiteP300()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_bw_p300);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_bw_p300);
actual = actual.PerformTransform(new BlackWhiteTransform(300));
Assert.Equal(ImagePixelFormat.BW1, actual.LogicalPixelFormat);
@ -386,8 +386,8 @@ public class TransformTests : ContextualTests
[Fact]
public void ColorBitDepth()
{
IMemoryImage actual = LoadImage(ImageResources.color_image_bw);
IMemoryImage expected = LoadImage(ImageResources.color_image_bw_24bit);
IMemoryImage actual = LoadImage(ImageResources.dog_bw);
IMemoryImage expected = LoadImage(ImageResources.dog_bw_24bit);
actual = actual.PerformTransform(new ColorBitDepthTransform());
Assert.Equal(ImagePixelFormat.RGB24, actual.PixelFormat);
@ -398,8 +398,8 @@ public class TransformTests : ContextualTests
[Fact]
public void Thumbnail()
{
IMemoryImage actual = LoadImage(ImageResources.color_image);
IMemoryImage expected = LoadImage(ImageResources.color_image_thumb_256);
IMemoryImage actual = LoadImage(ImageResources.dog);
IMemoryImage expected = LoadImage(ImageResources.dog_thumb_256);
actual = actual.PerformTransform(new ThumbnailTransform(256));

18
NAPS2.Sdk.Tests/ImportExport/ImageImporterTests.cs
View File

@ -45,7 +45,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task ImportJpegImage()
{
var filePath = CopyResourceToFile(ImageResources.color_image, "image.jpg");
var filePath = CopyResourceToFile(ImageResources.dog, "image.jpg");
var source = _imageImporter.Import(filePath, new ImportParams(), (current, max) => { }, CancellationToken.None);
var result = await source.ToList();
@ -67,7 +67,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task ImportTiffImage()
{
var filePath = CopyResourceToFile(ImageResources.color_image_tiff, "image.tiff");
var filePath = CopyResourceToFile(ImageResources.dog_tiff, "image.tiff");
var source = _imageImporter.Import(filePath, new ImportParams(), (current, max) => { }, CancellationToken.None);
var result = await source.ToList();
@ -76,7 +76,7 @@ public class ImageImporterTests : ContextualTests
AssertUsesRecoveryStorage(result[0].Storage, "00001.jpg");
Assert.False(result[0].Metadata.Lossless);
Assert.Equal(BitDepth.Color, result[0].Metadata.BitDepth);
ImageAsserts.Similar(ImageResources.color_image, result[0]);
ImageAsserts.Similar(ImageResources.dog, result[0]);
AssertUsesRecoveryStorage(result[2].Storage, "00003.jpg");
Assert.False(result[2].Metadata.Lossless);
@ -93,7 +93,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task ImportWithThumbnailGeneration()
{
var filePath = CopyResourceToFile(ImageResources.color_image, "image.jpg");
var filePath = CopyResourceToFile(ImageResources.dog, "image.jpg");
var source = _imageImporter.Import(filePath, new ImportParams { ThumbnailSize = 256 }, (current, max) => { },
CancellationToken.None);
@ -107,7 +107,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task SingleFrameProgress()
{
var filePath = CopyResourceToFile(ImageResources.color_image, "image.jpg");
var filePath = CopyResourceToFile(ImageResources.dog, "image.jpg");
var progressMock = new Mock<ProgressHandler>();
@ -123,7 +123,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task MultiFrameProgress()
{
var filePath = CopyResourceToFile(ImageResources.color_image_tiff, "image.tiff");
var filePath = CopyResourceToFile(ImageResources.dog_tiff, "image.tiff");
var progressMock = new Mock<ProgressHandler>();
var source = _imageImporter.Import(filePath, new ImportParams(), progressMock.Object, CancellationToken.None);
@ -146,7 +146,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task SingleFrameCancellation()
{
var filePath = CopyResourceToFile(ImageResources.color_image, "image.jpg");
var filePath = CopyResourceToFile(ImageResources.dog, "image.jpg");
var cts = new CancellationTokenSource();
var source = _imageImporter.Import(filePath, new ImportParams(), (current, max) => { }, cts.Token);
@ -159,7 +159,7 @@ public class ImageImporterTests : ContextualTests
[PlatformFact(exclude: PlatformFlags.Mac)]
public async Task MultiFrameCancellation()
{
var filePath = CopyResourceToFile(ImageResources.color_image_tiff, "image.tiff");
var filePath = CopyResourceToFile(ImageResources.dog_tiff, "image.tiff");
var cts = new CancellationTokenSource();
var source = _imageImporter.Import(filePath, new ImportParams(), (current, max) => { }, cts.Token);
@ -197,7 +197,7 @@ public class ImageImporterTests : ContextualTests
[Fact]
public async Task ImportInUseFile()
{
var filePath = CopyResourceToFile(ImageResources.color_image, "image.png");
var filePath = CopyResourceToFile(ImageResources.dog, "image.png");
using var stream = File.OpenWrite(filePath);
var source = _imageImporter.Import(filePath, new ImportParams(), (current, max) => { }, CancellationToken.None);

16
NAPS2.Sdk.Tests/ImportExport/ImportPostProcessorTests.cs
View File

@ -17,7 +17,7 @@ public class ImportPostProcessorTests : ContextualTests
[Fact]
public void NoPostProcessing()
{
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var image2 =
_importPostProcessor.AddPostProcessingData(image, null, null, new BarcodeDetectionOptions(), false);
@ -32,7 +32,7 @@ public class ImportPostProcessorTests : ContextualTests
[Fact]
public void DisposesOriginalImageWithNoPostProcessing()
{
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var image2 =
_importPostProcessor.AddPostProcessingData(image, null, null, new BarcodeDetectionOptions(), true);
@ -44,7 +44,7 @@ public class ImportPostProcessorTests : ContextualTests
[Fact]
public void ThumbnailRendering()
{
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var image2 =
_importPostProcessor.AddPostProcessingData(image, null, 256, new BarcodeDetectionOptions(), false);
@ -56,7 +56,7 @@ public class ImportPostProcessorTests : ContextualTests
#if NET6_0_OR_GREATER
Assert.Equal(256, actual.Width);
#else
ImageAsserts.Similar(ImageResources.color_image_thumb_256, actual, ImageAsserts.XPLAT_RMSE_THRESHOLD,
ImageAsserts.Similar(ImageResources.dog_thumb_256, actual, ImageAsserts.XPLAT_RMSE_THRESHOLD,
ignoreResolution: true);
#endif
}
@ -64,7 +64,7 @@ public class ImportPostProcessorTests : ContextualTests
[Fact]
public void ThumbnailRenderingWithTransform()
{
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
using var image2 = image.WithTransform(new BrightnessTransform(300));
using var image3 =
_importPostProcessor.AddPostProcessingData(image2, null, 256, new BarcodeDetectionOptions(), false);
@ -80,7 +80,7 @@ public class ImportPostProcessorTests : ContextualTests
#if NET6_0_OR_GREATER
Assert.Equal(256, actual.Width);
#else
ImageAsserts.Similar(ImageResources.color_image_b_p300_thumb_256, actual, ImageAsserts.XPLAT_RMSE_THRESHOLD,
ImageAsserts.Similar(ImageResources.dog_b_p300_thumb_256, actual, ImageAsserts.XPLAT_RMSE_THRESHOLD,
ignoreResolution: true);
#endif
}
@ -88,7 +88,7 @@ public class ImportPostProcessorTests : ContextualTests
[Fact]
public void ThumbnailRenderingWithPrerenderedImageAndDisposingOriginal()
{
using var rendered = LoadImage(ImageResources.color_image);
using var rendered = LoadImage(ImageResources.dog);
using var image = ScanningContext.CreateProcessedImage(rendered);
using var image2 =
_importPostProcessor.AddPostProcessingData(image, rendered, 256, new BarcodeDetectionOptions(), true);
@ -101,7 +101,7 @@ public class ImportPostProcessorTests : ContextualTests
#if NET6_0_OR_GREATER
Assert.Equal(256, actual.Width);
#else
ImageAsserts.Similar(ImageResources.color_image_thumb_256, actual, ImageAsserts.XPLAT_RMSE_THRESHOLD,
ImageAsserts.Similar(ImageResources.dog_thumb_256, actual, ImageAsserts.XPLAT_RMSE_THRESHOLD,
ignoreResolution: true);
#endif
Assert.False(IsDisposed(rendered));

12
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfBenchmarkTests.cs
View File

@ -9,7 +9,7 @@ public class PdfBenchmarkTests : ContextualTests
public async Task PdfSharpExport300()
{
var filePath = Path.Combine(FolderPath, "test");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image), BitDepth.Color,
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog), BitDepth.Color,
false, -1, Enumerable.Empty<Transform>());
var pdfExporter = new PdfExporter(ScanningContext);
@ -23,7 +23,7 @@ public class PdfBenchmarkTests : ContextualTests
public async Task PdfSharpExportHuge()
{
var filePath = Path.Combine(FolderPath, "test");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image_huge),
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog_huge),
BitDepth.Color, false, -1, Enumerable.Empty<Transform>());
var pdfExporter = new PdfExporter(ScanningContext);
@ -34,7 +34,7 @@ public class PdfBenchmarkTests : ContextualTests
public async Task PdfSharpExportHugePng()
{
var filePath = Path.Combine(FolderPath, "test");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image_huge_png),
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog_huge_png),
BitDepth.Color, true, -1, Enumerable.Empty<Transform>());
var pdfExporter = new PdfExporter(ScanningContext);
@ -45,7 +45,7 @@ public class PdfBenchmarkTests : ContextualTests
public async Task PdfiumExport300()
{
var filePath = Path.Combine(FolderPath, "test");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image), BitDepth.Color,
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog), BitDepth.Color,
false, -1, Enumerable.Empty<Transform>());
var pdfExporter = new PdfiumPdfExporter(ScanningContext);
@ -59,7 +59,7 @@ public class PdfBenchmarkTests : ContextualTests
public async Task PdfiumExportHuge()
{
var filePath = Path.Combine(FolderPath, "test");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image_huge),
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog_huge),
BitDepth.Color, false, -1, Enumerable.Empty<Transform>());
var pdfExporter = new PdfiumPdfExporter(ScanningContext);
@ -70,7 +70,7 @@ public class PdfBenchmarkTests : ContextualTests
public async Task PdfiumExportHugePng()
{
var filePath = Path.Combine(FolderPath, "test");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image_huge_png),
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog_huge_png),
BitDepth.Color, true, -1, Enumerable.Empty<Transform>());
var pdfExporter = new PdfiumPdfExporter(ScanningContext);

34
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfExportTests.cs
View File

@ -20,11 +20,11 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
await _exporter.Export(filePath, new[] { image }, new PdfExportParams());
PdfAsserts.AssertImages(filePath, ImageResources.color_image);
PdfAsserts.AssertImages(filePath, ImageResources.dog);
PdfAsserts.AssertImageFilter(filePath, 0, "DCTDecode");
}
@ -36,11 +36,11 @@ public class PdfExporterTests : ContextualTests
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(
LoadImage(ImageResources.color_image_png), BitDepth.Color, true, -1);
LoadImage(ImageResources.dog_png), BitDepth.Color, true, -1);
await _exporter.Export(filePath, new[] { image }, new PdfExportParams());
PdfAsserts.AssertImages(filePath, ImageResources.color_image);
PdfAsserts.AssertImages(filePath, ImageResources.dog);
PdfAsserts.AssertImageFilter(filePath, 0, "FlateDecode");
}
@ -52,12 +52,12 @@ public class PdfExporterTests : ContextualTests
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(
LoadImage(ImageResources.color_image_alpha), BitDepth.Color, false, -1);
LoadImage(ImageResources.dog_alpha), BitDepth.Color, false, -1);
await _exporter.Export(filePath, new[] { image }, new PdfExportParams());
// TODO: This assert is broken as pdfium rendering doesn't work for images with masks yet
// PdfAsserts.AssertImages(filePath, ImageResources.color_image_alpha);
// PdfAsserts.AssertImages(filePath, ImageResources.dog_alpha);
PdfAsserts.AssertImageFilter(filePath, 0, "FlateDecode");
}
@ -69,12 +69,12 @@ public class PdfExporterTests : ContextualTests
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(
LoadImage(ImageResources.color_image_mask), BitDepth.Color, false, -1);
LoadImage(ImageResources.dog_mask), BitDepth.Color, false, -1);
await _exporter.Export(filePath, new[] { image }, new PdfExportParams());
// TODO: This assert is broken as pdfium rendering doesn't work for images with masks yet
// PdfAsserts.AssertImages(filePath, ImageResources.color_image_alpha);
// PdfAsserts.AssertImages(filePath, ImageResources.dog_alpha);
PdfAsserts.AssertImageFilter(filePath, 0, "FlateDecode");
}
@ -85,12 +85,12 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
var storageImage = LoadImage(ImageResources.color_image_bw);
var storageImage = LoadImage(ImageResources.dog_bw);
using var image = ScanningContext.CreateProcessedImage(storageImage);
await _exporter.Export(filePath, new[] { image }, new PdfExportParams());
PdfAsserts.AssertImages(filePath, ImageResources.color_image_bw);
PdfAsserts.AssertImages(filePath, ImageResources.dog_bw);
PdfAsserts.AssertImageFilter(filePath, 0, "CCITTFaxDecode");
}
@ -101,12 +101,12 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image_bw_24bit),
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog_bw_24bit),
BitDepth.BlackAndWhite, true, -1);
await _exporter.Export(filePath, new[] { image }, new PdfExportParams());
PdfAsserts.AssertImages(filePath, ImageResources.color_image_bw);
PdfAsserts.AssertImages(filePath, ImageResources.dog_bw);
PdfAsserts.AssertImageFilter(filePath, 0, "CCITTFaxDecode");
}
@ -117,7 +117,7 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var metadata = new PdfMetadata
{
Author = "author",
@ -139,7 +139,7 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var metadata = new PdfMetadata
{
Author = "מְחַבֵּר",
@ -161,7 +161,7 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
await _exporter.Export(filePath, new[] { image }, new PdfExportParams
{
@ -183,7 +183,7 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var metadata = new PdfMetadata
{
Author = "author",
@ -214,7 +214,7 @@ public class PdfExporterTests : ContextualTests
storageConfig.Apply(this);
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var metadata = new PdfMetadata
{
Author = "מְחַבֵּר",

4
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfImportExportTests.cs
View File

@ -42,7 +42,7 @@ public class PdfImportExportTests : ContextualTests
var images = await _importer.Import(_importPath).ToList();
Assert.Equal(2, images.Count);
var toInsert = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
var toInsert = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var newImages = new List<ProcessedImage>
{
images[0],
@ -51,7 +51,7 @@ public class PdfImportExportTests : ContextualTests
};
await _exporter.Export(_exportPath, newImages, new PdfExportParams());
PdfAsserts.AssertImages(_exportPath, PdfResources.word_p1, ImageResources.color_image, PdfResources.word_p2);
PdfAsserts.AssertImages(_exportPath, PdfResources.word_p1, ImageResources.dog, PdfResources.word_p2);
}
[Theory]

10
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfImportTests.cs
View File

@ -46,7 +46,7 @@ public class PdfImportTests : ContextualTests
Assert.Single(images);
storageConfig.AssertJpegStorage(images[0].Storage);
ImageAsserts.Similar(ImageResources.color_image, images[0].Render());
ImageAsserts.Similar(ImageResources.dog, images[0].Render());
}
[Theory]
@ -60,7 +60,7 @@ public class PdfImportTests : ContextualTests
Assert.Single(images);
storageConfig.AssertPngStorage(images[0].Storage);
ImageAsserts.Similar(ImageResources.color_image, images[0].Render());
ImageAsserts.Similar(ImageResources.dog, images[0].Render());
}
[Theory]
@ -74,7 +74,7 @@ public class PdfImportTests : ContextualTests
Assert.Single(images);
storageConfig.AssertPngStorage(images[0].Storage);
ImageAsserts.Similar(ImageResources.color_image_bw, images[0].Render());
ImageAsserts.Similar(ImageResources.dog_bw, images[0].Render());
}
[Theory]
@ -87,7 +87,7 @@ public class PdfImportTests : ContextualTests
var images = await _importer.Import(importPath, new ImportParams { Password = "hello" }).ToList();
Assert.Single(images);
ImageAsserts.Similar(ImageResources.color_image, images[0].Render());
ImageAsserts.Similar(ImageResources.dog, images[0].Render());
}
[Theory]
@ -105,7 +105,7 @@ public class PdfImportTests : ContextualTests
var images = await importer.Import(importPath).ToList();
Assert.Single(images);
ImageAsserts.Similar(ImageResources.color_image, images[0].Render());
ImageAsserts.Similar(ImageResources.dog, images[0].Render());
}
[Fact]

4
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfiumPdfExporterTests.cs
View File

@ -10,11 +10,11 @@ public class PdfiumPdfExporterTests : ContextualTests
public async Task ExportSingleImage()
{
var filePath = Path.Combine(FolderPath, "test.pdf");
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.color_image));
using var image = ScanningContext.CreateProcessedImage(LoadImage(ImageResources.dog));
var pdfExporter = new PdfiumPdfExporter(ScanningContext);
await pdfExporter.Export(filePath, new[] { image }, new PdfExportParams());
PdfAsserts.AssertImages(filePath, ImageResources.color_image);
PdfAsserts.AssertImages(filePath, ImageResources.dog);
}
}

2
NAPS2.Sdk.Tests/ImportExport/Pdf/PdfiumPdfRendererTests.cs
View File

@ -27,7 +27,7 @@ public class PdfiumPdfRendererTests : ContextualTests
Assert.Single(images);
// This also verifies that the renderer gets the actual image dpi (72)
ImageAsserts.Similar(ImageResources.color_image, images[0]);
ImageAsserts.Similar(ImageResources.dog, images[0]);
}
[Fact]

0
NAPS2.Sdk.Tests/Resources/color_image.jpg → NAPS2.Sdk.Tests/Resources/dog.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

0
NAPS2.Sdk.Tests/Resources/color_image.png → NAPS2.Sdk.Tests/Resources/dog.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 KiB

After

Width:  |  Height:  |  Size: 448 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_alpha.png → NAPS2.Sdk.Tests/Resources/dog_alpha.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 410 KiB

After

Width:  |  Height:  |  Size: 410 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_b_n300.jpg → NAPS2.Sdk.Tests/Resources/dog_b_n300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_b_p300.jpg → NAPS2.Sdk.Tests/Resources/dog_b_p300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_b_p300_thumb_256.jpg → NAPS2.Sdk.Tests/Resources/dog_b_p300_thumb_256.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_bw.jpg → NAPS2.Sdk.Tests/Resources/dog_bw.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_bw.png → NAPS2.Sdk.Tests/Resources/dog_bw.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_bw_24bit.png → NAPS2.Sdk.Tests/Resources/dog_bw_24bit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_bw_invertpal.bmp → NAPS2.Sdk.Tests/Resources/dog_bw_invertpal.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_bw_p300.png → NAPS2.Sdk.Tests/Resources/dog_bw_p300.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_c_5_10_15_20.jpg → NAPS2.Sdk.Tests/Resources/dog_c_5_10_15_20.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_c_n300.jpg → NAPS2.Sdk.Tests/Resources/dog_c_n300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_c_p300.jpg → NAPS2.Sdk.Tests/Resources/dog_c_p300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_h_n300.jpg → NAPS2.Sdk.Tests/Resources/dog_h_n300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_h_p300.jpg → NAPS2.Sdk.Tests/Resources/dog_h_p300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_huge.jpg → NAPS2.Sdk.Tests/Resources/dog_huge.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

0
NAPS2.Sdk.Tests/Resources/color_image_huge.png → NAPS2.Sdk.Tests/Resources/dog_huge.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 MiB

After

Width:  |  Height:  |  Size: 8.2 MiB

0
NAPS2.Sdk.Tests/Resources/color_image_low_quality.jpg → NAPS2.Sdk.Tests/Resources/dog_low_quality.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_mask.png → NAPS2.Sdk.Tests/Resources/dog_mask.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 403 KiB

After

Width:  |  Height:  |  Size: 403 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_r_180.jpg → NAPS2.Sdk.Tests/Resources/dog_r_180.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_r_n45.jpg → NAPS2.Sdk.Tests/Resources/dog_r_n45.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_r_p46.jpg → NAPS2.Sdk.Tests/Resources/dog_r_p46.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_r_p90.jpg → NAPS2.Sdk.Tests/Resources/dog_r_p90.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_s_n300.jpg → NAPS2.Sdk.Tests/Resources/dog_s_n300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_s_p300.jpg → NAPS2.Sdk.Tests/Resources/dog_s_p300.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_sc_50pct.jpg → NAPS2.Sdk.Tests/Resources/dog_sc_50pct.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_set.tiff → NAPS2.Sdk.Tests/Resources/dog_set.tiff
View File

0
NAPS2.Sdk.Tests/Resources/color_image_sh_n1000.jpg → NAPS2.Sdk.Tests/Resources/dog_sh_n1000.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_sh_p1000.jpg → NAPS2.Sdk.Tests/Resources/dog_sh_p1000.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
NAPS2.Sdk.Tests/Resources/color_image_thumb_256.jpg → NAPS2.Sdk.Tests/Resources/dog_thumb_256.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB