diff --git a/release/files_common b/release/files_common index 4cc8b58d23..a835fa06d2 100644 --- a/release/files_common +++ b/release/files_common @@ -374,7 +374,7 @@ selfdrive/camerad/cameras/camera_qcom.h selfdrive/camerad/cameras/debayer.cl selfdrive/camerad/cameras/sensor_i2c.h -selfdrive/camerad/transforms/rgb_to_yuv.c +selfdrive/camerad/transforms/rgb_to_yuv.cc selfdrive/camerad/transforms/rgb_to_yuv.h selfdrive/camerad/transforms/rgb_to_yuv.cl selfdrive/camerad/transforms/rgb_to_yuv_test.cc diff --git a/selfdrive/camerad/SConscript b/selfdrive/camerad/SConscript index 2d2716a870..feb55a59e8 100644 --- a/selfdrive/camerad/SConscript +++ b/selfdrive/camerad/SConscript @@ -34,7 +34,7 @@ env.SharedLibrary('snapshot/visionipc', env.Program('camerad', [ 'main.cc', 'cameras/camera_common.cc', - 'transforms/rgb_to_yuv.c', + 'transforms/rgb_to_yuv.cc', 'imgproc/utils.cc', cameras, ], LIBS=libs) diff --git a/selfdrive/camerad/transforms/rgb_to_yuv.c b/selfdrive/camerad/transforms/rgb_to_yuv.cc similarity index 100% rename from selfdrive/camerad/transforms/rgb_to_yuv.c rename to selfdrive/camerad/transforms/rgb_to_yuv.cc diff --git a/selfdrive/camerad/transforms/rgb_to_yuv.h b/selfdrive/camerad/transforms/rgb_to_yuv.h index 7989580345..05d5c5ece4 100644 --- a/selfdrive/camerad/transforms/rgb_to_yuv.h +++ b/selfdrive/camerad/transforms/rgb_to_yuv.h @@ -1,5 +1,4 @@ -#ifndef RGB_TO_YUV_H -#define RGB_TO_YUV_H +#pragma once #include #include @@ -10,10 +9,6 @@ #include #endif -#ifdef __cplusplus -extern "C" { -#endif - typedef struct { int width, height; cl_kernel rgb_to_yuv_krnl; @@ -24,9 +19,3 @@ void rgb_to_yuv_init(RGBToYUVState* s, cl_context ctx, cl_device_id device_id, i void rgb_to_yuv_destroy(RGBToYUVState* s); void rgb_to_yuv_queue(RGBToYUVState* s, cl_command_queue q, cl_mem rgb_cl, cl_mem yuv_cl); - -#ifdef __cplusplus -} -#endif - -#endif // RGB_TO_YUV_H