From 9dc17da6ba866e07a79fad1e9dad60389b5d2483 Mon Sep 17 00:00:00 2001 From: JC_Xiong Date: Thu, 25 Apr 2024 10:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Code/MF_TRTInfer/MF_ImageSegmentationBase.cpp | 2 +- Code/MF_TRTInfer/MF_ImageSegmentationBase.h | 2 +- Code/MF_TRTInfer/MF_ObjectDetectBase.cpp | 4 ++-- Code/MF_TRTInfer/MF_ObjectDetectBase.h | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Code/MF_TRTInfer/MF_ImageSegmentationBase.cpp b/Code/MF_TRTInfer/MF_ImageSegmentationBase.cpp index a1e8931..691843c 100644 --- a/Code/MF_TRTInfer/MF_ImageSegmentationBase.cpp +++ b/Code/MF_TRTInfer/MF_ImageSegmentationBase.cpp @@ -1,6 +1,6 @@ #include "MF_ImageSegmentationBase.h" -MF_ImageSegmentationBase::MF_ImageSegmentationBase(const utils::InitParameter& _param) :MA_TRTInferAlgoBase(_param) +MF_ImageSegmentationBase::MF_ImageSegmentationBase(const trtUtils::InitParameter& _param) :MA_TRTInferAlgoBase(_param) { } diff --git a/Code/MF_TRTInfer/MF_ImageSegmentationBase.h b/Code/MF_TRTInfer/MF_ImageSegmentationBase.h index 9d73c47..99723bf 100644 --- a/Code/MF_TRTInfer/MF_ImageSegmentationBase.h +++ b/Code/MF_TRTInfer/MF_ImageSegmentationBase.h @@ -3,7 +3,7 @@ class MF_ImageSegmentationBase : public MA_TRTInferAlgoBase { public: - MF_ImageSegmentationBase(const utils::InitParameter& _param); + MF_ImageSegmentationBase(const trtUtils::InitParameter& _param); ~MF_ImageSegmentationBase(); diff --git a/Code/MF_TRTInfer/MF_ObjectDetectBase.cpp b/Code/MF_TRTInfer/MF_ObjectDetectBase.cpp index 0368c39..036b7e4 100644 --- a/Code/MF_TRTInfer/MF_ObjectDetectBase.cpp +++ b/Code/MF_TRTInfer/MF_ObjectDetectBase.cpp @@ -1,6 +1,6 @@ #include "MF_ObjectDetectBase.h" -MF_ObjectDetectBase::MF_ObjectDetectBase(const utils::InitParameter& param) :MA_TRTInferAlgoBase(param) +MF_ObjectDetectBase::MF_ObjectDetectBase(const trtUtils::InitParameter& param) :MA_TRTInferAlgoBase(param) { // input m_input_src_device = nullptr; @@ -48,7 +48,7 @@ MF_ObjectDetectBase::~MF_ObjectDetectBase() delete[] m_output_objects_host; } -std::vector> MF_ObjectDetectBase::getObjectss() const +std::vector> MF_ObjectDetectBase::getObjectss() const { return m_objectss; } \ No newline at end of file diff --git a/Code/MF_TRTInfer/MF_ObjectDetectBase.h b/Code/MF_TRTInfer/MF_ObjectDetectBase.h index 829e7b6..1fa0bcd 100644 --- a/Code/MF_TRTInfer/MF_ObjectDetectBase.h +++ b/Code/MF_TRTInfer/MF_ObjectDetectBase.h @@ -5,21 +5,21 @@ class MF_ObjectDetectBase :public MA_TRTInferAlgoBase { public: - MF_ObjectDetectBase(const utils::InitParameter& param); + MF_ObjectDetectBase(const trtUtils::InitParameter& param); ~MF_ObjectDetectBase(); protected: - std::vector> getObjectss() const; + std::vector> getObjectss() const; protected: - utils::InitParameter m_param; + trtUtils::InitParameter m_param; nvinfer1::Dims m_output_dims; int m_output_area; int m_total_objects; - std::vector> m_objectss; // Ä¿±ê¼ì²â¿ò - utils::AffineMat m_dst2src; + std::vector> m_objectss; // Ä¿±ê¼ì²â¿ò + trtUtils::AffineMat m_dst2src; // input unsigned char* m_input_src_device;