From 0c66940a8e2cf64c9890519901f433b3668216b6 Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 수, 26 6월 2024 15:13:18 +0900
Subject: [PATCH] Ongoing80 #4942 CF AOI Review Bin File Loading 실패 개선 1. GlassRawMessenger 동기화 2. BIN파일 FindFile 제거(RawMessenger, Review 공통) 3. Unloading 시 BIN파일 제거
---
DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp
index 85f4cab..333f58c 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.cpp
@@ -41,7 +41,10 @@
|| 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
+ /*< KJG 20211024 - #3487 ADD Start >*/
+ || sizeof(_grmDefectData) != m_pGlassRawInfo->m_nSizeOfRawMergeData)
+ /*< KJG 20211024 - #3487 ADD End >*/
{
return FALSE;
}
@@ -51,7 +54,10 @@
m_pGlassRawInfo->m_nCellMaxDataNum = nCellNum;
m_pGlassRawInfo->m_nDefectMaxDataNum = nDefectNum;
m_pGlassRawInfo->m_nStackMaxDataNum = nDefectNum;
-
+ /*< KJG 20211024 - #3487 ADD Start >*/
+ m_pGlassRawInfo->m_nRawMergeMaxDataNum = nDefectNum;
+ /*< KJG 20211024 - #3487 ADD End >*/
+
m_pGlassRawInfo->m_nGlassRawDataSize;
{
int nDataNum = 0;
@@ -71,6 +77,11 @@
m_pGlassRawInfo->m_nStackDataPoint = nDataNum;
nDataNum += (m_pGlassRawInfo->m_nSizeOfStackData + m_pGlassRawInfo->m_nSizeOfStackData % 4)*nDefectNum;
+ /*< KJG 20211024 - #3487 ADD Start >*/
+ m_pGlassRawInfo->m_nRawMergeDataPoint = nDataNum;
+ nDataNum += (m_pGlassRawInfo->m_nSizeOfRawMergeData + m_pGlassRawInfo->m_nSizeOfRawMergeData % 4)*nDefectNum;
+ /*< KJG 20211024 - #3487 ADD End >*/
+
m_pGlassRawInfo->m_nGlassRawDataSize = nDataNum;
}
@@ -125,6 +136,9 @@
m_pGlassRawInfo->m_nSizeOfCellData = sizeof(_grmCellData);
m_pGlassRawInfo->m_nSizeOfDefectData = sizeof(_grmDefectData);
m_pGlassRawInfo->m_nSizeOfStackData = sizeof(_grmDefectData);
+ /*< KJG 20211024 - #3487 ADD Start >*/
+ m_pGlassRawInfo->m_nSizeOfRawMergeData = sizeof(_grmDefectData);
+ /*< KJG 20211024 - #3487 ADD End >*/
int bytealign = m_pGlassRawInfo->m_nSizeOfGlassData%4;
}
@@ -178,6 +192,8 @@
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];
-
+ /*< KJG 20211024 - #3487 ADD Start >*/
+ m_pRawMergeData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nRawMergeDataPoint];
+ /*< KJG 20211024 - #3487 ADD End >*/
return TRUE;
}
--
Gitblit v1.9.3