diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-14 11:48:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 11:48:59 +0100 |
| commit | adeae2deae12a01a490cd650f2a52e653d298c4e (patch) | |
| tree | 94772e9337145255fa42ef07c33a155723e547e3 | |
| parent | 55d9c31dcb1703d105185a88c3c60c099f67a51d (diff) | |
| parent | 916e576021ca6bd25171105faa2e13341fc1c82f (diff) | |
Merge pull request #46990 from gongpha/check-in-camera-feed
Check if an input image wasn't Image on several functions in CameraFeed
| -rw-r--r-- | servers/camera/camera_feed.cpp | 10 | ||||
| -rw-r--r-- | servers/camera/camera_feed.h | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/servers/camera/camera_feed.cpp b/servers/camera/camera_feed.cpp index be812cf62d..eab4c61591 100644 --- a/servers/camera/camera_feed.cpp +++ b/servers/camera/camera_feed.cpp @@ -184,9 +184,10 @@ CameraFeed::~CameraFeed() { #endif } -void CameraFeed::set_RGB_img(Ref<Image> p_rgb_img) { +void CameraFeed::set_RGB_img(const Ref<Image> &p_rgb_img) { // FIXME: Disabled during Vulkan refactoring, should be ported. #if 0 + ERR_FAIL_COND(p_rgb_img.is_null()); if (active) { RenderingServer *vs = RenderingServer::get_singleton(); @@ -207,9 +208,10 @@ void CameraFeed::set_RGB_img(Ref<Image> p_rgb_img) { #endif } -void CameraFeed::set_YCbCr_img(Ref<Image> p_ycbcr_img) { +void CameraFeed::set_YCbCr_img(const Ref<Image> &p_ycbcr_img) { // FIXME: Disabled during Vulkan refactoring, should be ported. #if 0 + ERR_FAIL_COND(p_ycbcr_img.is_null()); if (active) { RenderingServer *vs = RenderingServer::get_singleton(); @@ -230,9 +232,11 @@ void CameraFeed::set_YCbCr_img(Ref<Image> p_ycbcr_img) { #endif } -void CameraFeed::set_YCbCr_imgs(Ref<Image> p_y_img, Ref<Image> p_cbcr_img) { +void CameraFeed::set_YCbCr_imgs(const Ref<Image> &p_y_img, const Ref<Image> &p_cbcr_img) { // FIXME: Disabled during Vulkan refactoring, should be ported. #if 0 + ERR_FAIL_COND(p_y_img.is_null()); + ERR_FAIL_COND(p_cbcr_img.is_null()); if (active) { RenderingServer *vs = RenderingServer::get_singleton(); diff --git a/servers/camera/camera_feed.h b/servers/camera/camera_feed.h index fc02af4249..eb4ef155bc 100644 --- a/servers/camera/camera_feed.h +++ b/servers/camera/camera_feed.h @@ -100,9 +100,9 @@ public: virtual ~CameraFeed(); FeedDataType get_datatype() const; - void set_RGB_img(Ref<Image> p_rgb_img); - void set_YCbCr_img(Ref<Image> p_ycbcr_img); - void set_YCbCr_imgs(Ref<Image> p_y_img, Ref<Image> p_cbcr_img); + void set_RGB_img(const Ref<Image> &p_rgb_img); + void set_YCbCr_img(const Ref<Image> &p_ycbcr_img); + void set_YCbCr_imgs(const Ref<Image> &p_y_img, const Ref<Image> &p_cbcr_img); // FIXME: Disabled during Vulkan refactoring, should be ported. #if 0 void allocate_texture(int p_width, int p_height, Image::Format p_format, RenderingServer::TextureType p_texture_type, FeedDataType p_data_type); |