diff --git a/Header_Files/irisximeaimager.h b/Header_Files/irisximeaimager.h index ed41fbe..041ecf1 100644 --- a/Header_Files/irisximeaimager.h +++ b/Header_Files/irisximeaimager.h @@ -31,6 +31,9 @@ namespace Iris void setEffectiveWindowRoi(int OffsetX, int width); int getBufferSizeOfOneFrame(); float getTemperature(); + + XI_IMG m_image; // image buffer + public: //继承基类的 IrisXimeaImager();//11111111111111111111 @@ -95,7 +98,6 @@ namespace Iris bool is_trigger_external(); protected: private: - XI_IMG m_image; // image buffer uint64_t m_timestampOfCamera; int m_iSpectralBin; diff --git a/Source_Files/irisximeaimager.cpp b/Source_Files/irisximeaimager.cpp index f1f1242..e7b5a18 100644 --- a/Source_Files/irisximeaimager.cpp +++ b/Source_Files/irisximeaimager.cpp @@ -95,7 +95,7 @@ int Iris::IrisXimeaImager::getBufferSizeOfOneFrame() // // return static_cast(m_image.bp_size); - return m_iEffectiveWindow_height * m_iEffectiveWindowRoi_width * 2; + return m_iEffectiveWindow_height * m_iEffectiveWindow_width * 2; } float Iris::IrisXimeaImager::getTemperature() @@ -236,10 +236,10 @@ unsigned short *Iris::IrisXimeaImager::get_frame(unsigned short *buffer) // //方法2:此做法是错误的,虽然是指针,也是传值! // buffer = (unsigned short *)m_image.bp; - for(int i=0;i