headers: add xcam_std.h as xcam cplusplus first header
* new xcam_std.h as first header instead of xcam_utils.h
* all export headers with #include <> instead of #include ""
Signed-off-by: Wind Yuan <[email protected]>
diff --git a/xcore/interface/blender.h b/xcore/interface/blender.h
index b4598b9..93b5fbe 100644
--- a/xcore/interface/blender.h
+++ b/xcore/interface/blender.h
@@ -21,9 +21,9 @@
#ifndef XCAM_INTERFACE_BLENDER_H
#define XCAM_INTERFACE_BLENDER_H
-#include "xcam_utils.h"
-#include "interface/data_types.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/data_types.h>
#define XCAM_BLENDER_IMAGE_NUM 2
@@ -70,12 +70,10 @@
return _alignment_y;
}
-#if 1
virtual XCamReturn blend (
const SmartPtr<VideoBuffer> &in0,
const SmartPtr<VideoBuffer> &in1,
SmartPtr<VideoBuffer> &out_buf);
-#endif
protected:
bool auto_calc_merge_window (
diff --git a/xcore/interface/data_types.h b/xcore/interface/data_types.h
index 04364ad..c8077da 100644
--- a/xcore/interface/data_types.h
+++ b/xcore/interface/data_types.h
@@ -22,7 +22,7 @@
#ifndef XCAM_INTERFACE_DATA_TYPES_H
#define XCAM_INTERFACE_DATA_TYPES_H
-#include "xcam_utils.h"
+#include <xcam_std.h>
namespace XCam {
diff --git a/xcore/interface/feature_match.h b/xcore/interface/feature_match.h
index be1a043..8e05aa4 100644
--- a/xcore/interface/feature_match.h
+++ b/xcore/interface/feature_match.h
@@ -22,14 +22,9 @@
#ifndef XCAM_FEATURE_MATCH_H
#define XCAM_FEATURE_MATCH_H
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "interface/data_types.h"
-
-#include <vector>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/data_types.h>
namespace XCam {
diff --git a/xcore/interface/geo_mapper.h b/xcore/interface/geo_mapper.h
index d7c5f30..0ddd495 100644
--- a/xcore/interface/geo_mapper.h
+++ b/xcore/interface/geo_mapper.h
@@ -21,9 +21,9 @@
#ifndef XCAM_INTERFACE_GEO_MAPPER_H
#define XCAM_INTERFACE_GEO_MAPPER_H
-#include "xcam_utils.h"
-#include "interface/data_types.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/data_types.h>
namespace XCam {
@@ -61,4 +61,4 @@
};
}
-#endif //XCAM_INTERFACE_GEO_MAPPER_H
\ No newline at end of file
+#endif //XCAM_INTERFACE_GEO_MAPPER_H
diff --git a/xcore/interface/stitcher.h b/xcore/interface/stitcher.h
index 23038de..5960a46 100644
--- a/xcore/interface/stitcher.h
+++ b/xcore/interface/stitcher.h
@@ -22,11 +22,10 @@
#ifndef XCAM_INTERFACE_STITCHER_H
#define XCAM_INTERFACE_STITCHER_H
-#include "xcam_utils.h"
-#include "interface/data_types.h"
+#include <xcam_std.h>
+#include <interface/data_types.h>
#include <vector>
-#include "video_buffer.h"
-#include "calibration_parser.h"
+#include <video_buffer.h>
#define XCAM_STITCH_FISHEYE_MAX_NUM 6
#define XCAM_STITCH_MAX_CAMERAS XCAM_STITCH_FISHEYE_MAX_NUM
