Merge pull request #181 from BrillouinMicroscopy/fix/noid/cppcheck-wa…

…rnings Fix/noid/cppcheck warnings
BrillouinMicroscopy · Feb 3, 2021 · 5d05b96 · 5d05b96
2 parents 91dc358 + 94d88f3
commit 5d05b96
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/BrillouinAcquisition/src/Acquisition/AcquisitionModes/Fluorescence.h b/BrillouinAcquisition/src/Acquisition/AcquisitionModes/Fluorescence.h
@@ -62,7 +62,7 @@ public slots:
 
 	Camera** m_camera{ nullptr };
 
-	FLUORESCENCE_SETTINGS m_settings;
+	FLUORESCENCE_SETTINGS m_settings = FLUORESCENCE_SETTINGS{};
 	FLUORESCENCE_MODE m_currentPreviewChannel{ FLUORESCENCE_MODE::NONE };
 	FLUORESCENCE_MODE m_previousPreviewChannel{ FLUORESCENCE_MODE::NONE };
 

diff --git a/BrillouinAcquisition/src/Devices/Cameras/andor.cpp b/BrillouinAcquisition/src/Devices/Cameras/andor.cpp
@@ -394,7 +394,7 @@ void Andor::getEnumString(AT_WC* feature, std::wstring* value) {
 	AT_WC tmpValue[256];
 	AT_GetEnumStringByIndex(m_camera, feature, enumIndex, tmpValue, 256);
 	auto tmp = std::wstring(tmpValue);
-	value = &tmp;
+	*value = tmp;
 }
 
 /*

diff --git a/BrillouinAcquisition/src/Devices/ScanControls/ScanControl.h b/BrillouinAcquisition/src/Devices/ScanControls/ScanControl.h
@@ -211,7 +211,6 @@ public slots:
 	POINT2 m_positionStage{ 0, 0 };			// [µm]	position of the stage (x-y-position)
 	POINT2 m_positionScanner{ 0, 0 };		// [µm]	position of the scanner (x-y-position)
 
-	bool m_isConnected{ false };
 	bool m_isCompatible{ false };
 	POINT3 m_homePosition{ 0, 0, 0 };
 	POINT2 m_startPosition{ 0, 0 };		// [µm]	start position