Przeglądaj źródła

add null checking code when do ReadImageData

cxs 3 lat temu
rodzic
commit
26342e9b11

+ 7 - 0
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp

@@ -1672,6 +1672,13 @@ bool OxfordControllerWrapper::ReadImageData(IElectronImage^ a_electronImage, BYT
 		return false;
 	}
 
+	if (a_pImageBits == NULL)
+	{
+
+
+		return false;
+	}
+
 	_oxfordControllerData.m_nImageWidth = a_electronImage->Width;
 	_oxfordControllerData.m_nImageHeight = a_electronImage->Height;
 	_oxfordControllerData.m_dPixelSize = a_electronImage->PixelSize;

+ 3 - 2
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.h

@@ -218,12 +218,13 @@ protected:
 
 	IStageConditions^ GetStageConditions();
 
-	void OnMicroscopeColumnUpdated(Object^ /*sender*/, OINA::Extender::MicroscopeControl::ColumnEventArgs^ /*e*/)
+	void OnMicroscopeColumnUpdated(Object^ sender, OINA::Extender::MicroscopeControl::ColumnEventArgs^ e)
 	{
 		m_bIsColumnUpdated = true;
 	}
-	void OnMicroscopeStageUpdated(Object^ /*sender*/, OINA::Extender::MicroscopeControl::StageEventArgs^ /*e*/)
+	void OnMicroscopeStageUpdated(Object^ sender, OINA::Extender::MicroscopeControl::StageEventArgs^ e)
 	{
+		
 		m_bIsStageUpdated = true;
 		LogTrace(__FILE__, __LINE__, _T("StageUpdated!"));
 	}