Skip to content

Commit cffa163

Browse files
author
Wayfarer
committed
Sync back all the changes from another project
1 parent d52ff49 commit cffa163

104 files changed

Lines changed: 2612 additions & 635 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CoreLibrary.sln‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Loader", "Loader\Loader.csp
7575
EndProject
7676
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contracts", "Contracts\Contracts.csproj", "{5C27BC5D-113F-4EE6-A476-B91E18829F62}"
7777
EndProject
78-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImagingTests", "ImagingTests\ImagingTests.csproj", "{5ECA640F-1980-4BFB-89B1-AA681738D7D8}"
79-
EndProject
8078
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mathematics.Constants", "Mathematics.Constants\Mathematics.Constants.csproj", "{F26B0C2D-C08D-47CA-8068-A0EDF8F6B62E}"
8179
EndProject
8280
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.StateExecutive.Builder", "Core.StateExecutive.Builder\Core.StateExecutive.Builder.csproj", "{7D6E1410-13B4-422D-905C-B95BC063D00D}"
@@ -105,6 +103,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Images", "Common.Ima
105103
EndProject
106104
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.ExtendedObject.Tests", "Common.ExtendedObject.Tests\Common.ExtendedObject.Tests.csproj", "{126B9D84-76EF-40DA-8EAC-21A699B93629}"
107105
EndProject
106+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imaging.Texture", "Imaging.Texture\Imaging.Texture.csproj", "{1D239297-471E-4250-9FD3-F4F267A60CDE}"
107+
EndProject
108+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imaging.Texture.Tests", "Imaging.Texture.Tests\Imaging.Texture.Tests.csproj", "{03B8988A-2516-C2E8-0E28-9A2DC86418C0}"
109+
EndProject
110+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imaging.Tests", "Imaging.Tests\Imaging.Tests.csproj", "{02BA1DC5-4549-4175-9EFA-BD75F8577CF5}"
111+
EndProject
108112
Global
109113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
110114
Debug|Any CPU = Debug|Any CPU
@@ -219,10 +223,6 @@ Global
219223
{5C27BC5D-113F-4EE6-A476-B91E18829F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
220224
{5C27BC5D-113F-4EE6-A476-B91E18829F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
221225
{5C27BC5D-113F-4EE6-A476-B91E18829F62}.Release|Any CPU.Build.0 = Release|Any CPU
222-
{5ECA640F-1980-4BFB-89B1-AA681738D7D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
223-
{5ECA640F-1980-4BFB-89B1-AA681738D7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
224-
{5ECA640F-1980-4BFB-89B1-AA681738D7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
225-
{5ECA640F-1980-4BFB-89B1-AA681738D7D8}.Release|Any CPU.Build.0 = Release|Any CPU
226226
{F26B0C2D-C08D-47CA-8068-A0EDF8F6B62E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
227227
{F26B0C2D-C08D-47CA-8068-A0EDF8F6B62E}.Debug|Any CPU.Build.0 = Debug|Any CPU
228228
{F26B0C2D-C08D-47CA-8068-A0EDF8F6B62E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -279,6 +279,18 @@ Global
279279
{126B9D84-76EF-40DA-8EAC-21A699B93629}.Debug|Any CPU.Build.0 = Debug|Any CPU
280280
{126B9D84-76EF-40DA-8EAC-21A699B93629}.Release|Any CPU.ActiveCfg = Release|Any CPU
281281
{126B9D84-76EF-40DA-8EAC-21A699B93629}.Release|Any CPU.Build.0 = Release|Any CPU
282+
{1D239297-471E-4250-9FD3-F4F267A60CDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
283+
{1D239297-471E-4250-9FD3-F4F267A60CDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
284+
{1D239297-471E-4250-9FD3-F4F267A60CDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
285+
{1D239297-471E-4250-9FD3-F4F267A60CDE}.Release|Any CPU.Build.0 = Release|Any CPU
286+
{03B8988A-2516-C2E8-0E28-9A2DC86418C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
287+
{03B8988A-2516-C2E8-0E28-9A2DC86418C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
288+
{03B8988A-2516-C2E8-0E28-9A2DC86418C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
289+
{03B8988A-2516-C2E8-0E28-9A2DC86418C0}.Release|Any CPU.Build.0 = Release|Any CPU
290+
{02BA1DC5-4549-4175-9EFA-BD75F8577CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
291+
{02BA1DC5-4549-4175-9EFA-BD75F8577CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
292+
{02BA1DC5-4549-4175-9EFA-BD75F8577CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
293+
{02BA1DC5-4549-4175-9EFA-BD75F8577CF5}.Release|Any CPU.Build.0 = Release|Any CPU
282294
EndGlobalSection
283295
GlobalSection(SolutionProperties) = preSolution
284296
HideSolutionNode = FALSE

‎ImageCompare/ImageCompare.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
21-
<_Parameter1>ImagingTests</_Parameter1>
21+
<_Parameter1>Imaging.Tests</_Parameter1>
2222
</AssemblyAttribute>
2323
</ItemGroup>
2424

ImagingTests/DirectBitmapCoreTests.cs renamed to Imaging.Tests/DirectBitmapCoreTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
/*
22
* COPYRIGHT: See COPYING in the top level directory
3-
* PROJECT: ImagingTests
3+
* PROJECT: Imaging.Tests.Tests
44
* FILE: DirectBitmapCoreTests.cs
55
* PURPOSE: Test for blending in DirectBitmapCore.
66
* PROGRAMER: Peter Geinitz (Wayfarer)
77
*/
88

9-
using Imaging;
10-
11-
namespace ImagingTests
9+
namespace Imaging.Tests
1210
{
1311
/// <summary>
1412
/// Core tests for DirectBitmapCore, especially the BlendInt method which is critical for correct blending behavior in DirectBitmap and DirectBitmapImage.

ImagingTests/DirectBitmapImageTests.cs renamed to Imaging.Tests/DirectBitmapImageTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
/*
22
* COPYRIGHT: See COPYING in the top level directory
3-
* PROJECT: ImagingTests
3+
* PROJECT: Imaging.Tests
44
* FILE: DirectBitmapImageTests.cs
55
* PURPOSE: Custom Image Class, some tests for validations
66
* PROGRAMER: Peter Geinitz (Wayfarer)
77
*/
88

99
using System.Windows.Media;
10-
using Imaging;
1110
using Mathematics;
1211

13-
namespace ImagingTests
12+
namespace Imaging.Tests
1413
{
1514
/// <summary>
1615
/// DirectBitmapImage test cases

ImagingTests/DirectBitmapTests.cs renamed to Imaging.Tests/DirectBitmapTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* COPYRIGHT: See COPYING in the top-level directory
3-
* PROJECT: ImagingTests
3+
* PROJECT: Imaging.Tests.Tests
44
* FILE: DirectBitmapTests.cs
55
* PURPOSE: Validate some functions in DirectBitmap
66
* PROGRAMMER: Peter Geinitz (Wayfarer)
@@ -9,9 +9,8 @@
99
using System.Diagnostics;
1010
using System.Drawing;
1111
using ImageCompare;
12-
using Imaging;
1312

14-
namespace ImagingTests
13+
namespace Imaging.Tests
1514
{
1615
/// <summary>
1716
/// Some basic tests to validate some functions in DirectBitmap, including color matching and performance comparisons with System.Drawing. These tests ensure that DirectBitmap correctly manipulates pixel data and performs efficiently for common drawing operations.

ImagingTests/HelperMethods.cs renamed to Imaging.Tests/HelperMethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
using Mathematics;
1010

11-
namespace ImagingTests
11+
namespace Imaging.Tests
1212
{
1313
/// <summary>
1414
/// The helper methods class.

ImagingTests/Image/LayerOne.png renamed to Imaging.Tests/Image/LayerOne.png

File renamed without changes.

ImagingTests/Image/Layertwo.png renamed to Imaging.Tests/Image/Layertwo.png

File renamed without changes.

ImagingTests/Image/ResultOne.png renamed to Imaging.Tests/Image/ResultOne.png

File renamed without changes.

ImagingTests/Image/Tile.png renamed to Imaging.Tests/Image/Tile.png

File renamed without changes.

0 commit comments

Comments
 (0)