From aa49ea7dd2fbcbac36bb125d19cc8dba5fe4fc9e Mon Sep 17 00:00:00 2001
From: tangchao0503 <735056338@qq.com>
Date: Sun, 13 Nov 2022 16:33:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=8F=96=E6=B6=88=E8=A3=81=E5=89=AA?=
 =?UTF-8?q?=E5=92=8Cmemcpy=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=8C=83=E5=9B=B4XI?=
 =?UTF-8?q?=5FIMG=20m=5Fimage=EF=BC=88=E7=94=A8=E4=BA=8E=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=B0=86=E5=BD=B1=E5=83=8F=E5=86=99=E5=85=A5=E5=88=B0=E7=A3=81?=
 =?UTF-8?q?=E7=9B=98=E4=B8=AD=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Header_Files/irisximeaimager.h   |  4 +++-
 Source_Files/irisximeaimager.cpp | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

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<int>(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<m_iEffectiveWindow_height;i++)
-    {
-        memcpy(buffer+i*m_iEffectiveWindowRoi_width, (unsigned short *)m_image.bp + i*m_iEffectiveWindow_width + m_iEffectiveWindowRoi_OffsetX, m_iEffectiveWindowRoi_width*2);
-    }
+//    for(int i=0;i<m_iEffectiveWindow_height;i++)
+//    {
+//        memcpy(buffer+i*m_iEffectiveWindowRoi_width, (unsigned short *)m_image.bp + i*m_iEffectiveWindow_width + m_iEffectiveWindowRoi_OffsetX, m_iEffectiveWindowRoi_width*2);
+//    }
 
     //强制将指针从高精度（uint64_t*）转换到低精度（unsigned short *），会有精度降低的问题???????????????????????????????????????????????????
     return (unsigned short *)&m_timestampOfCamera;
@@ -343,7 +343,7 @@ int Iris::IrisXimeaImager::get_inc_end_band()
 
 int Iris::IrisXimeaImager::get_sample_count()
 {
-    return m_iEffectiveWindowRoi_width;
+    return m_iEffectiveWindow_width;
 }
 
 int Iris::IrisXimeaImager::get_start_sample()