From d61a31f33567a47bec44cb461ea6c0df3534a5b6 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Thu, 1 Oct 2020 16:08:03 +0600 Subject: [PATCH 1/2] Update to new SDK-style MSbuild project files --- .../Contrast-based-adaptive-deadzone.csproj | 55 +++----------- .../Properties/AssemblyInfo.cs | 22 ------ .../Contrast-based-adaptive-sharpening.csproj | 54 +++----------- .../Properties/AssemblyInfo.cs | 22 ------ .../Properties/AssemblyInfo.cs | 22 ------ .../Wavelet-image-upscaling.csproj | 55 +++----------- TurboWavelets-Test/Properties/AssemblyInfo.cs | 22 ------ TurboWavelets-Test/TurboWavelets-Test.csproj | 72 ++++--------------- TurboWavelets-Test/packages.config | 4 -- TurboWavelets/Properties/AssemblyInfo.cs | 22 ------ TurboWavelets/TurboWavelets.csproj | 49 ++----------- 11 files changed, 53 insertions(+), 346 deletions(-) delete mode 100644 TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Properties/AssemblyInfo.cs delete mode 100644 TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Properties/AssemblyInfo.cs delete mode 100644 TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Properties/AssemblyInfo.cs delete mode 100644 TurboWavelets-Test/Properties/AssemblyInfo.cs delete mode 100644 TurboWavelets-Test/packages.config delete mode 100644 TurboWavelets/Properties/AssemblyInfo.cs diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj index a3eea41..86636e0 100644 --- a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj +++ b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj @@ -1,53 +1,18 @@ - - + + - Debug - AnyCPU - 10.0.0 - 2.0 - {01E65A1A-8C95-4E79-90E6-E40EFCCAF332} - Exe - Contrastbasedadaptivedeadzone - Contrast-based-adaptive-deadzone - 0.2 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - true - - - full - true - bin\Release - prompt - 4 - true + net4 true + TurbowaveletsSamples + + benutzer + - - - - - - - - - - - - {1E7A9FFF-4D2D-4608-98CF-051E3F883266} - TurboWavelets - + - \ No newline at end of file + + diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Properties/AssemblyInfo.cs b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Properties/AssemblyInfo.cs deleted file mode 100644 index 5944d8c..0000000 --- a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. -[assembly: AssemblyTitle ("Contrast-based-adaptive-deadzone")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("benutzer")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj index e04eaee..b36aef3 100644 --- a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj +++ b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj @@ -1,50 +1,18 @@ - - + + - Debug - AnyCPU - 10.0.0 - 2.0 - {08BA1610-AC76-4528-9902-0CE354A42083} - Exe - Contrastbasedadaptivesharpening - Contrast-based-adaptive-sharpening - 0.2 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - true - - - full - true - bin\Release - prompt - 4 - true + net4 true + TurbowaveletsSamples + + benutzer + - - - - - - - + - - - {1E7A9FFF-4D2D-4608-98CF-051E3F883266} - TurboWavelets - + - \ No newline at end of file + + diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Properties/AssemblyInfo.cs b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Properties/AssemblyInfo.cs deleted file mode 100644 index 464221a..0000000 --- a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. -[assembly: AssemblyTitle ("Contrast-based-adaptive-sharpening")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("benutzer")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Properties/AssemblyInfo.cs b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Properties/AssemblyInfo.cs deleted file mode 100644 index 88d9a48..0000000 --- a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. -[assembly: AssemblyTitle ("Wavelet-image-upscaling")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("benutzer")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj index a78e460..86636e0 100644 --- a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj +++ b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj @@ -1,53 +1,18 @@ - - + + - Debug - AnyCPU - 10.0.0 - 2.0 - {824F0C83-9719-4068-9B64-8CD79C56E28A} - Exe - Waveletimageupscaling - Wavelet-image-upscaling - 0.2 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - true - - - full - true - bin\Release - prompt - 4 - true + net4 true + TurbowaveletsSamples + + benutzer + - - - - - - - - - - - - {1E7A9FFF-4D2D-4608-98CF-051E3F883266} - TurboWavelets - + - \ No newline at end of file + + diff --git a/TurboWavelets-Test/Properties/AssemblyInfo.cs b/TurboWavelets-Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 7c5fa2e..0000000 --- a/TurboWavelets-Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. -[assembly: AssemblyTitle ("TurboWavelets-Test")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Stefan Moebius")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/TurboWavelets-Test/TurboWavelets-Test.csproj b/TurboWavelets-Test/TurboWavelets-Test.csproj index 7caa2d0..16c9f36 100644 --- a/TurboWavelets-Test/TurboWavelets-Test.csproj +++ b/TurboWavelets-Test/TurboWavelets-Test.csproj @@ -1,63 +1,21 @@ - - + + - Debug - AnyCPU - 10.0.0 - 2.0 - {5C7CD59F-8311-41F2-93D4-058913CEEA91} - Library - TurboWavelets - TurboWaveletsTests - 0.2 + net4 + TurboWaveletsTests + + Stefan Moebius + false - - true - full - false - bin\Debug - DEBUG - prompt - 4 - true - - - true - bin\Release - prompt - 4 - false - - - - - ..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll - - - - - - - TurboWavelets\Biorthogonal53Wavelet1DStatic.cs - - - TurboWavelets\Biorthogonal53Wavelet2D.cs - - - TurboWavelets\OrderWavelet2D.cs - - - TurboWavelets\Wavelet2D.cs - - - TurboWavelets\HaarWavelet2D.cs - - - + - + + + + - + - \ No newline at end of file + + diff --git a/TurboWavelets-Test/packages.config b/TurboWavelets-Test/packages.config deleted file mode 100644 index f0375e8..0000000 --- a/TurboWavelets-Test/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/TurboWavelets/Properties/AssemblyInfo.cs b/TurboWavelets/Properties/AssemblyInfo.cs deleted file mode 100644 index 7de9c07..0000000 --- a/TurboWavelets/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. -[assembly: AssemblyTitle ("TurboWavelets")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Stefan Moebius")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/TurboWavelets/TurboWavelets.csproj b/TurboWavelets/TurboWavelets.csproj index 2624775..a25c014 100644 --- a/TurboWavelets/TurboWavelets.csproj +++ b/TurboWavelets/TurboWavelets.csproj @@ -1,44 +1,9 @@ - - + + - Debug - AnyCPU - 10.0.0 - 2.0 - {1E7A9FFF-4D2D-4608-98CF-051E3F883266} - Library - TurboWavelets - TurboWavelets - 0.2 + net4 + + Stefan Moebius - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false - true - - - true - bin\Release - prompt - 4 - false - - - - - - - - - - - - - - \ No newline at end of file + + From e4e8f183a78978c014a40f593589b092c2e3a90d Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Thu, 1 Oct 2020 16:20:56 +0600 Subject: [PATCH 2/2] Update project --- .../Contrast-based-adaptive-deadzone.csproj | 3 ++- .../Contrast-based-adaptive-deadzone/Program.cs | 2 +- .../Contrast-based-adaptive-sharpening.csproj | 1 + .../Contrast-based-adaptive-sharpening/Program.cs | 2 +- .../Wavelet-image-upscaling/Wavelet-image-upscaling/Program.cs | 2 +- .../Wavelet-image-upscaling/Wavelet-image-upscaling.csproj | 3 ++- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj index 86636e0..dbbb52a 100644 --- a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj +++ b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone.csproj @@ -1,7 +1,8 @@ - + net4 + Exe true TurbowaveletsSamples diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Program.cs b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Program.cs index 83015d7..6e98e00 100644 --- a/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Program.cs +++ b/TurboWavelets-Samples/Contrast-based-adaptive-deadzone/Contrast-based-adaptive-deadzone/Program.cs @@ -29,7 +29,7 @@ private static void applyAdaptiveDeadzone (float[,] array, int numCoeffs) public static void Main (string[] args) { - Bitmap bmp = new Bitmap ("../../sample.png"); + Bitmap bmp = new Bitmap ("../../../sample.png"); float[,] yArray = new float[bmp.Width, bmp.Height]; float[,] cbArray = new float[bmp.Width, bmp.Height]; float[,] crArray = new float[bmp.Width, bmp.Height]; diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj index b36aef3..dbbb52a 100644 --- a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj +++ b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening.csproj @@ -2,6 +2,7 @@ net4 + Exe true TurbowaveletsSamples diff --git a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Program.cs b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Program.cs index 2fd0991..1b38b7f 100644 --- a/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Program.cs +++ b/TurboWavelets-Samples/Contrast-based-adaptive-sharpening/Contrast-based-adaptive-sharpening/Program.cs @@ -32,7 +32,7 @@ private static void applyAdaptiveShapening (float[,] array, float position) public static void Main (string[] args) { - Bitmap bmp = new Bitmap ("../../sample.png"); + Bitmap bmp = new Bitmap ("../../../sample.png"); float[,] yArray = new float[bmp.Width, bmp.Height]; float[,] cbArray = new float[bmp.Width, bmp.Height]; float[,] crArray = new float[bmp.Width, bmp.Height]; diff --git a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Program.cs b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Program.cs index 0c15e9d..6292299 100644 --- a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Program.cs +++ b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Program.cs @@ -10,7 +10,7 @@ class WaveletImageUpscalingClass public static void Main (string[] args) { - Bitmap bmp = new Bitmap ("../../sample.png"); + Bitmap bmp = new Bitmap ("../../../sample.png"); Bitmap bmp2 = new Bitmap (2 * bmp.Width, 2 * bmp.Height, PixelFormat.Format32bppArgb); float[,] yArray2 = new float[bmp2.Width, bmp2.Height]; diff --git a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj index 86636e0..dbbb52a 100644 --- a/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj +++ b/TurboWavelets-Samples/Wavelet-image-upscaling/Wavelet-image-upscaling/Wavelet-image-upscaling.csproj @@ -1,7 +1,8 @@ - + net4 + Exe true TurbowaveletsSamples