From e8ba1e78e72f3f7ec2841f55fd90253b4dc414df Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 14 10월 2021 14:15:04 +0900
Subject: [PATCH] Ongoing60 #3671 CF AOI Review 전설비 Align Matching 방법 개선

---
 DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp
index 85f4cab..e88e79b 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp
@@ -41,7 +41,8 @@
 		|| sizeof(_grmBlockData) != m_pGlassRawInfo->m_nSizeOfBlockData
 		|| sizeof(_grmCellData) != m_pGlassRawInfo->m_nSizeOfCellData
 		|| sizeof(_grmDefectData) != m_pGlassRawInfo->m_nSizeOfDefectData
-		|| sizeof(_grmDefectData) != m_pGlassRawInfo->m_nSizeOfStackData)
+		|| sizeof(_grmDefectData) != m_pGlassRawInfo->m_nSizeOfStackData
+		|| sizeof(_grmDefectData) != m_pGlassRawInfo->m_nSizeOfRawMergeData)
 	{
 		return FALSE;
 	}
@@ -51,7 +52,8 @@
 	m_pGlassRawInfo->m_nCellMaxDataNum = nCellNum;
 	m_pGlassRawInfo->m_nDefectMaxDataNum = nDefectNum;
 	m_pGlassRawInfo->m_nStackMaxDataNum = nDefectNum;
-	
+	m_pGlassRawInfo->m_nRawMergeMaxDataNum = nDefectNum;
+
 	m_pGlassRawInfo->m_nGlassRawDataSize;
 	{
 		int nDataNum = 0;
@@ -71,6 +73,9 @@
 		m_pGlassRawInfo->m_nStackDataPoint = nDataNum;
 		nDataNum += (m_pGlassRawInfo->m_nSizeOfStackData + m_pGlassRawInfo->m_nSizeOfStackData % 4)*nDefectNum;
 		
+		m_pGlassRawInfo->m_nRawMergeDataPoint = nDataNum;
+		nDataNum += (m_pGlassRawInfo->m_nSizeOfRawMergeData + m_pGlassRawInfo->m_nSizeOfRawMergeData % 4)*nDefectNum;
+
 		m_pGlassRawInfo->m_nGlassRawDataSize = nDataNum;
 	}
 	
@@ -125,6 +130,7 @@
 			m_pGlassRawInfo->m_nSizeOfCellData = sizeof(_grmCellData);
 			m_pGlassRawInfo->m_nSizeOfDefectData = sizeof(_grmDefectData);
 			m_pGlassRawInfo->m_nSizeOfStackData = sizeof(_grmDefectData);
+			m_pGlassRawInfo->m_nSizeOfRawMergeData = sizeof(_grmDefectData);
 
 			int bytealign = m_pGlassRawInfo->m_nSizeOfGlassData%4;
 		}
@@ -178,6 +184,7 @@
 	m_pCellData   = (_grmCellData*)&m_pGlassRawData[m_pGlassRawInfo->m_nCellDataPoint];
 	m_pDefectData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nDefectDataPoint];
 	m_pStackData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nStackDataPoint];
+	m_pRawMergeData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nRawMergeDataPoint];
 
 	return TRUE;
 }

--
Gitblit v1.9.3