From 8a95106e51cef5a6b6e871b8b119e81b15127761 Mon Sep 17 00:00:00 2001 From: Hermann Hubschle Date: Fri, 6 Aug 2021 10:42:18 -0400 Subject: [PATCH 1/5] Fix dest ROI --- NPP/NPPImage_16uC1.cs | 2 +- NPP/NPPImage_16uC1_Ctx.cs | 2 +- NPP/NPPImage_16uC3.cs | 2 +- NPP/NPPImage_16uC3_Ctx.cs | 2 +- NPP/NPPImage_32fC1.cs | 2 +- NPP/NPPImage_32fC1_Ctx.cs | 2 +- NPP/NPPImage_32fC3.cs | 2 +- NPP/NPPImage_32fC3_Ctx.cs | 2 +- NPP/NPPImage_8uC1.cs | 2 +- NPP/NPPImage_8uC1_Ctx.cs | 2 +- NPP/NPPImage_8uC3.cs | 2 +- NPP/NPPImage_8uC3_Ctx.cs | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NPP/NPPImage_16uC1.cs b/NPP/NPPImage_16uC1.cs index d022592a..ab1c3c5a 100644 --- a/NPP/NPPImage_16uC1.cs +++ b/NPP/NPPImage_16uC1.cs @@ -4936,7 +4936,7 @@ public void GetFilterGaussPyramidLayerUpBorderDstROI(float nRate, out NppiSize p /// The border type operation to be applied at source image border boundaries. public void FilterGaussPyramidLayerDownBorder(NPPImage_16uC1 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_16u_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC1_Ctx.cs b/NPP/NPPImage_16uC1_Ctx.cs index 54634655..f46caf7d 100644 --- a/NPP/NPPImage_16uC1_Ctx.cs +++ b/NPP/NPPImage_16uC1_Ctx.cs @@ -4875,7 +4875,7 @@ public void CFAToRGB(NPPImage_16uC4 dest, NppiBayerGridPosition eGrid, Interpola /// NPP stream context. public void FilterGaussPyramidLayerDownBorder(NPPImage_16uC1 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_16u_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC3.cs b/NPP/NPPImage_16uC3.cs index 08507c53..056fc730 100644 --- a/NPP/NPPImage_16uC3.cs +++ b/NPP/NPPImage_16uC3.cs @@ -5327,7 +5327,7 @@ public void GetFilterGaussPyramidLayerUpBorderDstROI(float nRate, out NppiSize p /// The border type operation to be applied at source image border boundaries. public void FilterGaussPyramidLayerDownBorder(NPPImage_16uC3 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_16u_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC3_Ctx.cs b/NPP/NPPImage_16uC3_Ctx.cs index 06d541ab..738873f6 100644 --- a/NPP/NPPImage_16uC3_Ctx.cs +++ b/NPP/NPPImage_16uC3_Ctx.cs @@ -5264,7 +5264,7 @@ public void GradientColorToGray(NPPImage_16uC1 dest, NppiNorm eNorm, NppStreamCo /// NPP stream context. public void FilterGaussPyramidLayerDownBorder(NPPImage_16uC3 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_16u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_16u_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC1.cs b/NPP/NPPImage_32fC1.cs index 67c4babe..c39e5b20 100644 --- a/NPP/NPPImage_32fC1.cs +++ b/NPP/NPPImage_32fC1.cs @@ -4859,7 +4859,7 @@ public void GetFilterGaussPyramidLayerUpBorderDstROI(float nRate, out NppiSize p /// The border type operation to be applied at source image border boundaries. public void FilterGaussPyramidLayerDownBorder(NPPImage_32fC1 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_32f_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC1_Ctx.cs b/NPP/NPPImage_32fC1_Ctx.cs index d1f03c64..00b43fe8 100644 --- a/NPP/NPPImage_32fC1_Ctx.cs +++ b/NPP/NPPImage_32fC1_Ctx.cs @@ -4790,7 +4790,7 @@ public void FilterGaussBorder(NPPImage_32fC1 dst, CudaDeviceVariable Kern /// NPP stream context. public void FilterGaussPyramidLayerDownBorder(NPPImage_32fC1 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_32f_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC3.cs b/NPP/NPPImage_32fC3.cs index b929677b..86cabfae 100644 --- a/NPP/NPPImage_32fC3.cs +++ b/NPP/NPPImage_32fC3.cs @@ -5040,7 +5040,7 @@ public void GetFilterGaussPyramidLayerUpBorderDstROI(float nRate, out NppiSize p /// The border type operation to be applied at source image border boundaries. public void FilterGaussPyramidLayerDownBorder(NPPImage_32fC3 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_32f_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC3_Ctx.cs b/NPP/NPPImage_32fC3_Ctx.cs index c9b564f7..8ab61d29 100644 --- a/NPP/NPPImage_32fC3_Ctx.cs +++ b/NPP/NPPImage_32fC3_Ctx.cs @@ -4955,7 +4955,7 @@ public void GradientColorToGray(NPPImage_32fC1 dest, NppiNorm eNorm, NppStreamCo /// NPP stream context. public void FilterGaussPyramidLayerDownBorder(NPPImage_32fC3 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_32f_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_32f_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC1.cs b/NPP/NPPImage_8uC1.cs index b16d9691..6d7bf4cc 100644 --- a/NPP/NPPImage_8uC1.cs +++ b/NPP/NPPImage_8uC1.cs @@ -5876,7 +5876,7 @@ public void GetFilterGaussPyramidLayerUpBorderDstROI(float nRate, out NppiSize p /// The border type operation to be applied at source image border boundaries. public void FilterGaussPyramidLayerDownBorder(NPPImage_8uC1 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_8u_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC1_Ctx.cs b/NPP/NPPImage_8uC1_Ctx.cs index 15a948dd..3ebdda7d 100644 --- a/NPP/NPPImage_8uC1_Ctx.cs +++ b/NPP/NPPImage_8uC1_Ctx.cs @@ -5872,7 +5872,7 @@ public void CFAToRGB(NPPImage_8uC4 dest, NppiBayerGridPosition eGrid, Interpolat /// NPP stream context. public void FilterGaussPyramidLayerDownBorder(NPPImage_8uC1 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_8u_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC3.cs b/NPP/NPPImage_8uC3.cs index fa50213f..b1fa9376 100644 --- a/NPP/NPPImage_8uC3.cs +++ b/NPP/NPPImage_8uC3.cs @@ -7636,7 +7636,7 @@ public void GetFilterGaussPyramidLayerUpBorderDstROI(float nRate, out NppiSize p /// The border type operation to be applied at source image border boundaries. public void FilterGaussPyramidLayerDownBorder(NPPImage_8uC3 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_8u_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC3_Ctx.cs b/NPP/NPPImage_8uC3_Ctx.cs index 17263765..ad4d4c78 100644 --- a/NPP/NPPImage_8uC3_Ctx.cs +++ b/NPP/NPPImage_8uC3_Ctx.cs @@ -7723,7 +7723,7 @@ public void GradientColorToGray(NPPImage_8uC1 dest, NppiNorm eNorm, NppStreamCon /// NPP stream context. public void FilterGaussPyramidLayerDownBorder(NPPImage_8uC3 dest, float nRate, int nFilterTaps, CudaDeviceVariable pKernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, _sizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussPyramid.nppiFilterGaussPyramidLayerDownBorder_8u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, nRate, nFilterTaps, pKernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussPyramidLayerDownBorder_8u_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } From 91c893e37443743014617de6f033533ae9dad547 Mon Sep 17 00:00:00 2001 From: hhubschle Date: Fri, 6 Aug 2021 15:37:52 -0400 Subject: [PATCH 2/5] Fix hard-coded path --- ManagedCUDA/ManagedCuda.netCore.csproj | 4 ++-- NPP/NPP.netCore.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ManagedCUDA/ManagedCuda.netCore.csproj b/ManagedCUDA/ManagedCuda.netCore.csproj index d798b424..893b2b0c 100644 --- a/ManagedCUDA/ManagedCuda.netCore.csproj +++ b/ManagedCUDA/ManagedCuda.netCore.csproj @@ -16,7 +16,7 @@ true - J:\ManagedCuda\managedCuda.netCore\ManagedCUDA\ManagedCuda.netCore.xml + ..\managedCuda.netCore\ManagedCUDA\ManagedCuda.netCore.xml @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/NPP/NPP.netCore.csproj b/NPP/NPP.netCore.csproj index 66dce5b5..670cad30 100644 --- a/NPP/NPP.netCore.csproj +++ b/NPP/NPP.netCore.csproj @@ -12,7 +12,7 @@ - J:\ManagedCuda\managedCuda.netCore\NPP\NPP.netCore.xml + ..\managedCuda.netCore\NPP\NPP.netCore.xml From d6738002d43bf9256a5d042052d3a6964043a918 Mon Sep 17 00:00:00 2001 From: hhubschle Date: Fri, 6 Aug 2021 15:38:09 -0400 Subject: [PATCH 3/5] Ignore binary files --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 273891fd..eecce998 100644 --- a/.gitignore +++ b/.gitignore @@ -46,9 +46,14 @@ Temporary Items *.dll *.exe +**/build/ +**/obj/ +**/bin/ + + # Program debug database *.pdb # Files containing private data NuGetPackage.ps1 -NuGetPush.ps1 \ No newline at end of file +NuGetPush.ps1 From 5bbd8d5e37f4dc379372f2207b166911e3fb8b23 Mon Sep 17 00:00:00 2001 From: hhubschle Date: Sun, 8 Aug 2021 13:15:40 -0400 Subject: [PATCH 4/5] Roi fixes. --- NPP/NPPImage_16sC1.cs | 4 ++-- NPP/NPPImage_16sC1_Ctx.cs | 4 ++-- NPP/NPPImage_16sC3.cs | 4 ++-- NPP/NPPImage_16sC3_Ctx.cs | 4 ++-- NPP/NPPImage_16sC4.cs | 8 ++++---- NPP/NPPImage_16sC4_Ctx.cs | 8 ++++---- NPP/NPPImage_16uC1.cs | 4 ++-- NPP/NPPImage_16uC1_Ctx.cs | 4 ++-- NPP/NPPImage_16uC3.cs | 4 ++-- NPP/NPPImage_16uC3_Ctx.cs | 4 ++-- NPP/NPPImage_16uC4.cs | 8 ++++---- NPP/NPPImage_16uC4_Ctx.cs | 8 ++++---- NPP/NPPImage_32fC1.cs | 4 ++-- NPP/NPPImage_32fC1_Ctx.cs | 4 ++-- NPP/NPPImage_32fC3.cs | 4 ++-- NPP/NPPImage_32fC3_Ctx.cs | 4 ++-- NPP/NPPImage_32fC4.cs | 8 ++++---- NPP/NPPImage_32fC4_Ctx.cs | 8 ++++---- NPP/NPPImage_8uC1.cs | 4 ++-- NPP/NPPImage_8uC1_Ctx.cs | 4 ++-- NPP/NPPImage_8uC3.cs | 4 ++-- NPP/NPPImage_8uC3_Ctx.cs | 4 ++-- NPP/NPPImage_8uC4.cs | 8 ++++---- NPP/NPPImage_8uC4_Ctx.cs | 8 ++++---- 24 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NPP/NPPImage_16sC1.cs b/NPP/NPPImage_16sC1.cs index c6378a63..b674c33d 100644 --- a/NPP/NPPImage_16sC1.cs +++ b/NPP/NPPImage_16sC1.cs @@ -2808,7 +2808,7 @@ public void ColorTwist(float[,] aTwist) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16sC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_C1R", status)); NPPException.CheckNppStatus(status, this); } @@ -3145,7 +3145,7 @@ public void FilterGauss(NPPImage_16sC1 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16sC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16sC1_Ctx.cs b/NPP/NPPImage_16sC1_Ctx.cs index 6b5e4bb3..5fea3e92 100644 --- a/NPP/NPPImage_16sC1_Ctx.cs +++ b/NPP/NPPImage_16sC1_Ctx.cs @@ -2822,7 +2822,7 @@ public void ColorTwist(float[,] aTwist, NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_16sC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -3162,7 +3162,7 @@ public void FilterGauss(NPPImage_16sC1 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_16sC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16sC3.cs b/NPP/NPPImage_16sC3.cs index 601b08cb..f1358322 100644 --- a/NPP/NPPImage_16sC3.cs +++ b/NPP/NPPImage_16sC3.cs @@ -2994,7 +2994,7 @@ public void FilterSobelVertBorder(NPPImage_16sC3 dest, NppiBorderType eBorderTyp /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16sC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_C3R", status)); NPPException.CheckNppStatus(status, this); } @@ -3329,7 +3329,7 @@ public void FilterGauss(NPPImage_16sC3 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16sC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16sC3_Ctx.cs b/NPP/NPPImage_16sC3_Ctx.cs index aa6e3c2b..6737944c 100644 --- a/NPP/NPPImage_16sC3_Ctx.cs +++ b/NPP/NPPImage_16sC3_Ctx.cs @@ -3014,7 +3014,7 @@ public void FilterSobelVertBorder(NPPImage_16sC3 dest, NppiBorderType eBorderTyp /// NPP stream context. public void FilterGaussBorder(NPPImage_16sC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -3352,7 +3352,7 @@ public void FilterGauss(NPPImage_16sC3 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_16sC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16sC4.cs b/NPP/NPPImage_16sC4.cs index 14f7ad4f..9a0a117c 100644 --- a/NPP/NPPImage_16sC4.cs +++ b/NPP/NPPImage_16sC4.cs @@ -4920,7 +4920,7 @@ public void FilterSobelVertBorderA(NPPImage_16sC4 dest, NppiBorderType eBorderTy /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16sC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -4941,7 +4941,7 @@ public void FilterGaussBorder(NPPImage_16sC4 dest, MaskSize eMaskSize, NppiBorde /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_16sC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_AC4R", status)); NPPException.CheckNppStatus(status, this); } @@ -5522,7 +5522,7 @@ public void FilterGauss(NPPImage_16sC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16sC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -5547,7 +5547,7 @@ public void FilterGaussA(NPPImage_16sC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_16sC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_AC4R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16sC4_Ctx.cs b/NPP/NPPImage_16sC4_Ctx.cs index fa1d7bc7..bff7654a 100644 --- a/NPP/NPPImage_16sC4_Ctx.cs +++ b/NPP/NPPImage_16sC4_Ctx.cs @@ -5055,7 +5055,7 @@ public void FilterSobelVertBorderA(NPPImage_16sC4 dest, NppiBorderType eBorderTy /// NPP stream context. public void FilterGaussBorder(NPPImage_16sC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -5077,7 +5077,7 @@ public void FilterGaussBorder(NPPImage_16sC4 dest, MaskSize eMaskSize, NppiBorde /// NPP stream context. public void FilterGaussBorderA(NPPImage_16sC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16s_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16s_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -5661,7 +5661,7 @@ public void FilterGauss(NPPImage_16sC4 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_16sC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -5688,7 +5688,7 @@ public void FilterGaussA(NPPImage_16sC4 dst, CudaDeviceVariable Kernel, N /// NPP stream context. public void FilterGaussBorderA(NPPImage_16sC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16s_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16s_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC1.cs b/NPP/NPPImage_16uC1.cs index ab1c3c5a..37199057 100644 --- a/NPP/NPPImage_16uC1.cs +++ b/NPP/NPPImage_16uC1.cs @@ -4572,7 +4572,7 @@ public void ColorTwist(float[,] aTwist) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16uC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_C1R", status)); NPPException.CheckNppStatus(status, this); } @@ -4846,7 +4846,7 @@ public void FilterGauss(NPPImage_16uC1 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16uC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC1_Ctx.cs b/NPP/NPPImage_16uC1_Ctx.cs index f46caf7d..052d05da 100644 --- a/NPP/NPPImage_16uC1_Ctx.cs +++ b/NPP/NPPImage_16uC1_Ctx.cs @@ -4547,7 +4547,7 @@ public void ColorTwist(float[,] aTwist, NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_16uC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -4819,7 +4819,7 @@ public void FilterGauss(NPPImage_16uC1 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_16uC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC3.cs b/NPP/NPPImage_16uC3.cs index 056fc730..c6becbd1 100644 --- a/NPP/NPPImage_16uC3.cs +++ b/NPP/NPPImage_16uC3.cs @@ -4982,7 +4982,7 @@ public void FilterBorder(NPPImage_16uC3 dest, CudaDeviceVariable pKernel, /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16uC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_C3R", status)); NPPException.CheckNppStatus(status, this); } @@ -5257,7 +5257,7 @@ public void FilterGauss(NPPImage_16uC3 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16uC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC3_Ctx.cs b/NPP/NPPImage_16uC3_Ctx.cs index 738873f6..a3549f62 100644 --- a/NPP/NPPImage_16uC3_Ctx.cs +++ b/NPP/NPPImage_16uC3_Ctx.cs @@ -4955,7 +4955,7 @@ public void FilterBorder(NPPImage_16uC3 dest, CudaDeviceVariable pKernel, /// NPP stream context. public void FilterGaussBorder(NPPImage_16uC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -5228,7 +5228,7 @@ public void FilterGauss(NPPImage_16uC3 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_16uC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC4.cs b/NPP/NPPImage_16uC4.cs index e8ea3c74..c096b8e4 100644 --- a/NPP/NPPImage_16uC4.cs +++ b/NPP/NPPImage_16uC4.cs @@ -6953,7 +6953,7 @@ public void FilterBorderA(NPPImage_16uC4 dest, CudaDeviceVariable pKernel /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -6974,7 +6974,7 @@ public void FilterGaussBorder(NPPImage_16uC4 dest, MaskSize eMaskSize, NppiBorde /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_16uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_AC4R", status)); NPPException.CheckNppStatus(status, this); } @@ -7433,7 +7433,7 @@ public void FilterGauss(NPPImage_16uC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_16uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -7458,7 +7458,7 @@ public void FilterGaussA(NPPImage_16uC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_16uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_AC4R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_16uC4_Ctx.cs b/NPP/NPPImage_16uC4_Ctx.cs index 9e618674..b5254077 100644 --- a/NPP/NPPImage_16uC4_Ctx.cs +++ b/NPP/NPPImage_16uC4_Ctx.cs @@ -7052,7 +7052,7 @@ public void FilterBorderA(NPPImage_16uC4 dest, CudaDeviceVariable pKernel /// NPP stream context. public void FilterGaussBorder(NPPImage_16uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -7074,7 +7074,7 @@ public void FilterGaussBorder(NPPImage_16uC4 dest, MaskSize eMaskSize, NppiBorde /// NPP stream context. public void FilterGaussBorderA(NPPImage_16uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_16u_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_16u_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -7526,7 +7526,7 @@ public void FilterGauss(NPPImage_16uC4 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_16uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -7553,7 +7553,7 @@ public void FilterGaussA(NPPImage_16uC4 dst, CudaDeviceVariable Kernel, N /// NPP stream context. public void FilterGaussBorderA(NPPImage_16uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_16u_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_16u_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC1.cs b/NPP/NPPImage_32fC1.cs index c39e5b20..6226bbe2 100644 --- a/NPP/NPPImage_32fC1.cs +++ b/NPP/NPPImage_32fC1.cs @@ -4545,7 +4545,7 @@ public void ColorTwist(float[,] aTwist) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_32fC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_C1R", status)); NPPException.CheckNppStatus(status, this); } @@ -4802,7 +4802,7 @@ public void FilterGauss(NPPImage_32fC1 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_32fC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC1_Ctx.cs b/NPP/NPPImage_32fC1_Ctx.cs index 00b43fe8..44e7d97b 100644 --- a/NPP/NPPImage_32fC1_Ctx.cs +++ b/NPP/NPPImage_32fC1_Ctx.cs @@ -4516,7 +4516,7 @@ public void ColorTwist(float[,] aTwist, NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_32fC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -4772,7 +4772,7 @@ public void FilterGauss(NPPImage_32fC1 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_32fC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC3.cs b/NPP/NPPImage_32fC3.cs index 86cabfae..1a74e039 100644 --- a/NPP/NPPImage_32fC3.cs +++ b/NPP/NPPImage_32fC3.cs @@ -4714,7 +4714,7 @@ public int AverageRelativeErrorGetBufferHostSize() /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_32fC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_C3R", status)); NPPException.CheckNppStatus(status, this); } @@ -4970,7 +4970,7 @@ public void FilterGauss(NPPImage_32fC3 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_32fC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC3_Ctx.cs b/NPP/NPPImage_32fC3_Ctx.cs index 8ab61d29..9d8bf8eb 100644 --- a/NPP/NPPImage_32fC3_Ctx.cs +++ b/NPP/NPPImage_32fC3_Ctx.cs @@ -4664,7 +4664,7 @@ public int AverageRelativeErrorGetBufferHostSize(NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_32fC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -4919,7 +4919,7 @@ public void FilterGauss(NPPImage_32fC3 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_32fC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC4.cs b/NPP/NPPImage_32fC4.cs index 5202a83e..aff3b97a 100644 --- a/NPP/NPPImage_32fC4.cs +++ b/NPP/NPPImage_32fC4.cs @@ -6491,7 +6491,7 @@ public void FilterSobelVertBorderA(NPPImage_32fC4 dest, NppiBorderType eBorderTy /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_32fC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -6512,7 +6512,7 @@ public void FilterGaussBorder(NPPImage_32fC4 dest, MaskSize eMaskSize, NppiBorde /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_32fC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_AC4R", status)); NPPException.CheckNppStatus(status, this); } @@ -6976,7 +6976,7 @@ public void FilterGauss(NPPImage_32fC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_32fC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -7001,7 +7001,7 @@ public void FilterGaussA(NPPImage_32fC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_32fC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_AC4R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_32fC4_Ctx.cs b/NPP/NPPImage_32fC4_Ctx.cs index 98af6e6f..095dc3a0 100644 --- a/NPP/NPPImage_32fC4_Ctx.cs +++ b/NPP/NPPImage_32fC4_Ctx.cs @@ -6555,7 +6555,7 @@ public void FilterSobelVertBorderA(NPPImage_32fC4 dest, NppiBorderType eBorderTy /// NPP stream context. public void FilterGaussBorder(NPPImage_32fC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -6577,7 +6577,7 @@ public void FilterGaussBorder(NPPImage_32fC4 dest, MaskSize eMaskSize, NppiBorde /// NPP stream context. public void FilterGaussBorderA(NPPImage_32fC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_32f_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_32f_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -7038,7 +7038,7 @@ public void FilterGauss(NPPImage_32fC4 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorder(NPPImage_32fC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -7065,7 +7065,7 @@ public void FilterGaussA(NPPImage_32fC4 dst, CudaDeviceVariable Kernel, N /// NPP stream context. public void FilterGaussBorderA(NPPImage_32fC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_32f_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_32f_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC1.cs b/NPP/NPPImage_8uC1.cs index 6d7bf4cc..a12f52a9 100644 --- a/NPP/NPPImage_8uC1.cs +++ b/NPP/NPPImage_8uC1.cs @@ -5450,7 +5450,7 @@ public void ColorTwist(float[,] aTwist) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_8uC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_C1R", status)); NPPException.CheckNppStatus(status, this); } @@ -5785,7 +5785,7 @@ public void FilterGauss(NPPImage_8uC1 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_8uC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C1R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_C1R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC1_Ctx.cs b/NPP/NPPImage_8uC1_Ctx.cs index 3ebdda7d..658bff48 100644 --- a/NPP/NPPImage_8uC1_Ctx.cs +++ b/NPP/NPPImage_8uC1_Ctx.cs @@ -5478,7 +5478,7 @@ public void ColorTwist(float[,] aTwist, NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_8uC1 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -5816,7 +5816,7 @@ public void FilterGauss(NPPImage_8uC1 dst, CudaDeviceVariable Kernel, Npp /// NPP stream context. public void FilterGaussBorder(NPPImage_8uC1 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C1R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C1R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_C1R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC3.cs b/NPP/NPPImage_8uC3.cs index b1fa9376..eb47a1d3 100644 --- a/NPP/NPPImage_8uC3.cs +++ b/NPP/NPPImage_8uC3.cs @@ -7193,7 +7193,7 @@ public int AverageRelativeErrorGetBufferHostSize() /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_8uC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_C3R", status)); NPPException.CheckNppStatus(status, this); } @@ -7530,7 +7530,7 @@ public void FilterGauss(NPPImage_8uC3 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_8uC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C3R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C3R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_C3R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC3_Ctx.cs b/NPP/NPPImage_8uC3_Ctx.cs index ad4d4c78..d9945147 100644 --- a/NPP/NPPImage_8uC3_Ctx.cs +++ b/NPP/NPPImage_8uC3_Ctx.cs @@ -7309,7 +7309,7 @@ public int AverageRelativeErrorGetBufferHostSize(NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_8uC3 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -7649,7 +7649,7 @@ public void FilterGauss(NPPImage_8uC3 dst, CudaDeviceVariable Kernel, Npp /// NPP stream context. public void FilterGaussBorder(NPPImage_8uC3 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C3R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C3R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_C3R_Ctx", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC4.cs b/NPP/NPPImage_8uC4.cs index a864e963..0120aa85 100644 --- a/NPP/NPPImage_8uC4.cs +++ b/NPP/NPPImage_8uC4.cs @@ -8670,7 +8670,7 @@ public int AverageRelativeErrorGetBufferHostSize() /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_8uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -8691,7 +8691,7 @@ public void FilterGaussBorder(NPPImage_8uC4 dest, MaskSize eMaskSize, NppiBorder /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_8uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_AC4R", status)); NPPException.CheckNppStatus(status, this); } @@ -9274,7 +9274,7 @@ public void FilterGauss(NPPImage_8uC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorder(NPPImage_8uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_C4R", status)); NPPException.CheckNppStatus(status, this); } @@ -9299,7 +9299,7 @@ public void FilterGaussA(NPPImage_8uC4 dst, CudaDeviceVariable Kernel) /// The border type operation to be applied at source image border boundaries. public void FilterGaussBorderA(NPPImage_8uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType) { - status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_AC4R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); + status = NPPNativeMethods.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_AC4R(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_AC4R", status)); NPPException.CheckNppStatus(status, this); } diff --git a/NPP/NPPImage_8uC4_Ctx.cs b/NPP/NPPImage_8uC4_Ctx.cs index db827aaa..272e7bc2 100644 --- a/NPP/NPPImage_8uC4_Ctx.cs +++ b/NPP/NPPImage_8uC4_Ctx.cs @@ -8848,7 +8848,7 @@ public int AverageRelativeErrorGetBufferHostSize(NppStreamContext nppStreamCtx) /// NPP stream context. public void FilterGaussBorder(NPPImage_8uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -8870,7 +8870,7 @@ public void FilterGaussBorder(NPPImage_8uC4 dest, MaskSize eMaskSize, NppiBorder /// NPP stream context. public void FilterGaussBorderA(NPPImage_8uC4 dest, MaskSize eMaskSize, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussBorder_8u_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dest.DevicePointerRoi, dest.Pitch, dest.SizeRoi, eMaskSize, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussBorder_8u_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -9456,7 +9456,7 @@ public void FilterGauss(NPPImage_8uC4 dst, CudaDeviceVariable Kernel, Npp /// NPP stream context. public void FilterGaussBorder(NPPImage_8uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_C4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_C4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } @@ -9483,7 +9483,7 @@ public void FilterGaussA(NPPImage_8uC4 dst, CudaDeviceVariable Kernel, Np /// NPP stream context. public void FilterGaussBorderA(NPPImage_8uC4 dst, CudaDeviceVariable Kernel, NppiBorderType eBorderType, NppStreamContext nppStreamCtx) { - status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_AC4R_Ctx(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); + status = NPPNativeMethods_Ctx.NPPi.FilterGaussBorder.nppiFilterGaussAdvancedBorder_8u_AC4R_Ctx(_devPtrRoi, _pitch, _sizeRoi, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, Kernel.Size, Kernel.DevicePointer, eBorderType, nppStreamCtx); Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterGaussAdvancedBorder_8u_AC4R_Ctx", status)); NPPException.CheckNppStatus(status, this); } From 2610f1c725768a11f483973c3900b06e6b942404 Mon Sep 17 00:00:00 2001 From: hhubschle Date: Sun, 29 Aug 2021 19:00:44 -0400 Subject: [PATCH 5/5] Add unsafe versions of MinMax --- NPP/NPPImage_16uC1.cs | 12 ++++++++++++ NPP/NPPImage_32fC1.cs | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/NPP/NPPImage_16uC1.cs b/NPP/NPPImage_16uC1.cs index 37199057..9aab2758 100644 --- a/NPP/NPPImage_16uC1.cs +++ b/NPP/NPPImage_16uC1.cs @@ -1827,6 +1827,18 @@ public void MinMax(CudaDeviceVariable min, CudaDeviceVariable ma Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiMinMax_16u_C1R", status)); NPPException.CheckNppStatus(status, this); } + /// + /// Image pixel minimum and maximum. No additional buffer is allocated. + /// + /// Allocated device memory with size of at least 1 * sizeof(ushort) + /// Allocated device memory with size of at least 1 * sizeof(ushort) + /// Allocated device memory with size of at + public void MinMaxUnsafe(CudaDeviceVariable min, CudaDeviceVariable max, CudaDeviceVariable buffer) + { + status = NPPNativeMethods.NPPi.MinMaxNew.nppiMinMax_16u_C1R(_devPtrRoi, _pitch, _sizeRoi, min.DevicePointer, max.DevicePointer, buffer.DevicePointer); + Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiMinMax_16u_C1R", status)); + NPPException.CheckNppStatus(status, this); + } #endregion #region MinMaxIndex diff --git a/NPP/NPPImage_32fC1.cs b/NPP/NPPImage_32fC1.cs index 6226bbe2..a34d4dcc 100644 --- a/NPP/NPPImage_32fC1.cs +++ b/NPP/NPPImage_32fC1.cs @@ -1607,6 +1607,19 @@ public void MinMax(CudaDeviceVariable min, CudaDeviceVariable max, Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiMinMax_32f_C1R", status)); NPPException.CheckNppStatus(status, this); } + + /// + /// Image pixel minimum and maximum. No additional buffer is allocated. + /// + /// Allocated device memory with size of at least 1 * sizeof(float) + /// Allocated device memory with size of at least 1 * sizeof(float) + /// Allocated device memory with size of at + public void MinMaxUnsafe(CudaDeviceVariable min, CudaDeviceVariable max, CudaDeviceVariable buffer) + { + status = NPPNativeMethods.NPPi.MinMaxNew.nppiMinMax_32f_C1R(_devPtrRoi, _pitch, _sizeRoi, min.DevicePointer, max.DevicePointer, buffer.DevicePointer); + Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiMinMax_32f_C1R", status)); + NPPException.CheckNppStatus(status, this); + } #endregion #region MinMaxIndex @@ -4689,6 +4702,13 @@ public void FilterLaplaceBorder(NPPImage_32fC1 dst, MaskSize eMaskSize, NppiBord Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterLaplaceBorder_32f_C1R", status)); NPPException.CheckNppStatus(status, this); } + //public void FilterLaplaceBorder(NPPImage_32fC1 dst, MaskSize eMaskSize, NppiBorderType eBorderType, NppiRect filterArea = new NppiRect()) + //{ + // if (filterArea.IsEmpty) + // status = NPPNativeMethods.NPPi.FixedFilters.nppiFilterLaplaceBorder_32f_C1R(_devPtr, _pitch, _sizeOriginal, _pointRoi, dst.DevicePointerRoi, dst.Pitch, _sizeRoi, eMaskSize, eBorderType); + // Debug.WriteLine(String.Format("{0:G}, {1}: {2}", DateTime.Now, "nppiFilterLaplaceBorder_32f_C1R", status)); + // NPPException.CheckNppStatus(status, this); + //} ///