Fix build error after merge utilpp.h to util.h (#19714)

* fix std::atomic build error

* remove include util.h
pull/19716/head
Dean Lee 4 years ago committed by GitHub
parent 595830135b
commit 83bdd23a08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      selfdrive/common/visionimg.cc
  2. 14
      selfdrive/common/visionimg.h

@ -25,7 +25,6 @@
#endif // ifdef QCOM #endif // ifdef QCOM
#include "common/util.h"
#include "common/visionimg.h" #include "common/visionimg.h"
#ifdef QCOM #ifdef QCOM

@ -1,6 +1,4 @@
#ifndef VISIONIMG_H #pragma once
#define VISIONIMG_H
#include "visionbuf.h" #include "visionbuf.h"
#include "common/glutil.h" #include "common/glutil.h"
@ -13,10 +11,6 @@ typedef int EGLImageKHR;
typedef void *EGLClientBuffer; typedef void *EGLClientBuffer;
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
#define VISIONIMG_FORMAT_RGB24 1 #define VISIONIMG_FORMAT_RGB24 1
typedef struct VisionImg { typedef struct VisionImg {
@ -29,9 +23,3 @@ typedef struct VisionImg {
GLuint visionimg_to_gl(const VisionImg *img, EGLImageKHR *pkhr, void **pph); GLuint visionimg_to_gl(const VisionImg *img, EGLImageKHR *pkhr, void **pph);
void visionimg_destroy_gl(EGLImageKHR khr, void *ph); void visionimg_destroy_gl(EGLImageKHR khr, void *ph);
#ifdef __cplusplus
} // extern "C"
#endif
#endif

Loading…
Cancel
Save