From 2bae33ec7c3b48cd4534e7c0aed2292135f40982 Mon Sep 17 00:00:00 2001 From: Rowan Border Date: Thu, 14 Sep 2023 15:08:58 +0100 Subject: [PATCH] update cuda includes for cuda 11 --- .../include/raw_image_pipeline/modules/color_calibration.hpp | 3 +++ .../include/raw_image_pipeline/modules/color_enhancer.hpp | 2 ++ .../include/raw_image_pipeline/modules/debayer.hpp | 2 ++ .../include/raw_image_pipeline/modules/flip.hpp | 2 ++ .../include/raw_image_pipeline/modules/gamma_correction.hpp | 3 +++ .../include/raw_image_pipeline/modules/undistortion.hpp | 3 +++ .../raw_image_pipeline/modules/vignetting_correction.hpp | 3 +++ .../include/raw_image_pipeline/modules/white_balance.hpp | 2 ++ .../include/raw_image_pipeline/raw_image_pipeline.hpp | 2 ++ .../convolutional_color_constancy.hpp | 4 ++++ 10 files changed, 26 insertions(+) diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/color_calibration.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/color_calibration.hpp index 30afe87..85f00d7 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/color_calibration.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/color_calibration.hpp @@ -11,6 +11,7 @@ #include #ifdef HAS_CUDA +#include #include #include #include @@ -66,6 +67,7 @@ class ColorCalibrationModule { void colorCorrection(cv::Mat& image); #ifdef HAS_CUDA +#include void colorCorrection(cv::cuda::GpuMat& image); #endif @@ -81,6 +83,7 @@ class ColorCalibrationModule { cv::Scalar color_calibration_bias_; #ifdef HAS_CUDA +#include Npp32f gpu_color_calibration_matrix_[3][4] = {{1.f, 0.f, 0.f, 0.f}, {0.f, 1.f, 0.f, 0.f}, {0.f, 0.f, 1.f, 0.f}}; #endif }; diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/color_enhancer.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/color_enhancer.hpp index eab0fec..232a629 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/color_enhancer.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/color_enhancer.hpp @@ -8,6 +8,7 @@ #include #ifdef HAS_CUDA +#include #include #include #endif @@ -48,6 +49,7 @@ class ColorEnhancerModule { private: void enhance(cv::Mat& image); #ifdef HAS_CUDA +#include void enhance(cv::cuda::GpuMat& image); #endif diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/debayer.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/debayer.hpp index 6428acb..1dcbcc8 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/debayer.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/debayer.hpp @@ -8,6 +8,7 @@ #include #ifdef HAS_CUDA +#include #include #include #endif @@ -56,6 +57,7 @@ class DebayerModule { void saveDebayeredImage(cv::Mat& image); #ifdef HAS_CUDA +#include void debayer(cv::cuda::GpuMat& image, std::string& encoding); void saveDebayeredImage(cv::cuda::GpuMat& image); #endif diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/flip.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/flip.hpp index 9415d7a..2a0206d 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/flip.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/flip.hpp @@ -8,6 +8,7 @@ #include #ifdef HAS_CUDA +#include #include #include #endif @@ -52,6 +53,7 @@ class FlipModule { void saveFlippedImage(cv::Mat& image); #ifdef HAS_CUDA +#include void flip(cv::cuda::GpuMat& image); void saveFlippedImage(cv::cuda::GpuMat& image); #endif diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/gamma_correction.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/gamma_correction.hpp index ab55aa6..e2c14e3 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/gamma_correction.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/gamma_correction.hpp @@ -8,6 +8,7 @@ #include #ifdef HAS_CUDA +#include #include #include #endif @@ -52,6 +53,7 @@ class GammaCorrectionModule { // Wrapper methods (GPU) //----------------------------------------------------------------------------- #ifdef HAS_CUDA +#include void gammaCorrectCustom(cv::cuda::GpuMat& image); void gammaCorrectDefault(cv::cuda::GpuMat& image); #endif @@ -75,6 +77,7 @@ class GammaCorrectionModule { cv::Mat cpu_lut_; #ifdef HAS_CUDA +#include cv::Ptr gpu_lut_; #endif }; diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/undistortion.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/undistortion.hpp index cfa78a2..7106f61 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/undistortion.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/undistortion.hpp @@ -11,6 +11,7 @@ #include #ifdef HAS_CUDA +#include #include #include #include @@ -91,6 +92,7 @@ class UndistortionModule { void saveUndistortedImage(cv::Mat& image); #ifdef HAS_CUDA +#include void undistort(cv::cuda::GpuMat& image); void saveUndistortedImage(cv::cuda::GpuMat& image); #endif @@ -127,6 +129,7 @@ class UndistortionModule { cv::Mat undistortion_map_y_; #ifdef HAS_CUDA +#include cv::cuda::GpuMat gpu_undistortion_map_x_; cv::cuda::GpuMat gpu_undistortion_map_y_; #endif diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/vignetting_correction.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/vignetting_correction.hpp index 2c5c6ce..2dc1a3f 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/vignetting_correction.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/vignetting_correction.hpp @@ -8,6 +8,7 @@ #include #ifdef HAS_CUDA +#include #include #include #endif @@ -45,6 +46,7 @@ class VignettingCorrectionModule { private: void correct(cv::Mat& image); #ifdef HAS_CUDA +#include void correct(cv::cuda::GpuMat& image); #endif @@ -60,6 +62,7 @@ class VignettingCorrectionModule { cv::Mat vignetting_mask_f_; cv::Mat image_f_; #ifdef HAS_CUDA +#include cv::cuda::GpuMat gpu_vignetting_mask_f_; cv::cuda::GpuMat gpu_image_f_; #endif diff --git a/raw_image_pipeline/include/raw_image_pipeline/modules/white_balance.hpp b/raw_image_pipeline/include/raw_image_pipeline/modules/white_balance.hpp index 451fc42..a620aaf 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/modules/white_balance.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/modules/white_balance.hpp @@ -16,6 +16,7 @@ #include #ifdef HAS_CUDA +#include #include #include #include @@ -98,6 +99,7 @@ class WhiteBalanceModule { // White balance wrapper methods (GPU) //----------------------------------------------------------------------------- #ifdef HAS_CUDA +#include void balanceWhiteSimple(cv::cuda::GpuMat& image); void balanceWhiteGreyWorld(cv::cuda::GpuMat& image); void balanceWhiteLearned(cv::cuda::GpuMat& image); diff --git a/raw_image_pipeline/include/raw_image_pipeline/raw_image_pipeline.hpp b/raw_image_pipeline/include/raw_image_pipeline/raw_image_pipeline.hpp index bc0e870..e2fac0c 100644 --- a/raw_image_pipeline/include/raw_image_pipeline/raw_image_pipeline.hpp +++ b/raw_image_pipeline/include/raw_image_pipeline/raw_image_pipeline.hpp @@ -10,6 +10,7 @@ #include #ifdef HAS_CUDA +#include #include #include #include @@ -177,6 +178,7 @@ class RawImagePipeline { } #ifdef HAS_CUDA +#include void saveDebugImage(const cv::cuda::GpuMat& image, const std::string& filename) const { cv::Mat tmp; image.download(tmp); diff --git a/raw_image_pipeline_white_balance/include/raw_image_pipeline_white_balance/convolutional_color_constancy.hpp b/raw_image_pipeline_white_balance/include/raw_image_pipeline_white_balance/convolutional_color_constancy.hpp index fe3b821..f93a4c0 100644 --- a/raw_image_pipeline_white_balance/include/raw_image_pipeline_white_balance/convolutional_color_constancy.hpp +++ b/raw_image_pipeline_white_balance/include/raw_image_pipeline_white_balance/convolutional_color_constancy.hpp @@ -23,6 +23,7 @@ inspired by Jonathan Barron's "Fast Fourier Color Constancy", CVPR, 2017 #include #ifdef HAS_CUDA +#include #include #include #endif @@ -47,6 +48,7 @@ class ConvolutionalColorConstancyWB { Model model_; #ifdef HAS_CUDA +#include Model gpu_model_; #endif @@ -106,6 +108,7 @@ class ConvolutionalColorConstancyWB { // Compute and apply RGB gains #ifdef HAS_CUDA +#include int computeResponseCuda(); void applyGainsCuda(cv::cuda::GpuMat& image); #endif @@ -117,6 +120,7 @@ class ConvolutionalColorConstancyWB { // Applies white balance #ifdef HAS_CUDA +#include void balanceWhite(const cv::cuda::GpuMat& src, cv::cuda::GpuMat& dst); #endif void balanceWhite(const cv::Mat& src, cv::Mat& dst);