From 15f87a4959033f48cbc6bee655c6e557d35602d0 Mon Sep 17 00:00:00 2001
From: modehua <mo1027728827@qq.com>
Date: Wed, 13 Dec 2023 00:05:40 -0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zynq_7010_code/MultiFrameCapture.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/zynq_7010_code/MultiFrameCapture.cpp b/zynq_7010_code/MultiFrameCapture.cpp
index e1c4aac..4cf03bc 100644
--- a/zynq_7010_code/MultiFrameCapture.cpp
+++ b/zynq_7010_code/MultiFrameCapture.cpp
@@ -217,6 +217,15 @@ void MultiFrameCapture::UpdateScanParam(HG_ScanConfiguration config)
            //cnt -=1 ;
         }
 
+        //匹配原始尺寸多采集一帧，固定幅面是多少采集多少。这个地方这么调是因为 最后一帧采集会超时。 临时解决方案 谢谢--！！
+        if (m_config.params.pageSize==(int)PaperSize::G400_AUTO ||
+			m_config.params.pageSize==(int)PaperSize::G400_MAXAUTO ||
+			m_config.params.pageSize==(int)PaperSize::G400_MAXSIZE)
+        {
+              cnt += 1;
+        }
+        
+      
         video->HtCamSetFrameCnt(cnt);
         printf(" -----------------------设置帧数：%d------------------\r\n",cnt);
     }
@@ -264,6 +273,7 @@ void MultiFrameCapture::waitsnapdone(int state)
     
     if (b_end_snap)
     {   
+        printf("b_end_snap b_end_snap b_end_snap b_end_snap\r\n");
         m_glue.m_imageready(ip);
         return;
     }
@@ -436,7 +446,7 @@ void MultiFrameCapture::snaprun()
             {
                 video->HtCamGetFrameNum(frame_num);  
                 int ind = i;                      //已采集了的帧数
-                int val = frame_num - 1 - ind;        //剩余还未采集的帧数
+                int val = frame_num  - ind;        //剩余还未采集的帧数
                 printf("val :%d frame_num:%d i:%d\r\n",val,frame_num,i);
 
                 int j = 0;