Merge branch 'master' into KernelProject

deepskystacker · Mar 31, 2023 · d0cea20 · d0cea20
2 parents 7d76a82 + f81fdcc
commit d0cea20
Show file tree

Hide file tree

Showing 31 changed files with 263 additions and 176 deletions.
diff --git a/DeepSkyStacker/About.cpp b/DeepSkyStacker/About.cpp
@@ -177,8 +177,8 @@ void About::onInitDialog()
         const QRect r{ DeepSkyStacker::instance()->rect() };
         QSize size = this->size();
 
-        int top = ((r.top() + (r.height() / 2) - (size.height() / 2)));
-        int left = ((r.left() + (r.width() / 2) - (size.width() / 2)));
+        int top = (r.top() + (r.height() / 2) - (size.height() / 2));
+        int left = (r.left() + (r.width() / 2) - (size.width() / 2));
         move(left, top);
 	}
 }

diff --git a/DeepSkyStacker/BaseDialog.cpp b/DeepSkyStacker/BaseDialog.cpp
@@ -89,8 +89,8 @@ namespace DSS
 			const QRect r{ DeepSkyStacker::instance()->rect() };
 			const QSize size = this->size();
 
-			int top = ((r.top() + (r.height() / 2) - (size.height() / 2)));
-			int left = ((r.left() + (r.width() / 2) - (size.width() / 2)));
+			int top = (r.top() + (r.height() / 2) - (size.height() / 2));
+			int left = (r.left() + (r.width() / 2) - (size.width() / 2));
 			move(left, top);
 		}
 	}

diff --git a/DeepSkyStacker/BitmapExt.cpp b/DeepSkyStacker/BitmapExt.cpp
@@ -83,6 +83,7 @@ bool DebayerPicture(CMemoryBitmap* pInBitmap, std::shared_ptr<CMemoryBitmap>& rp
 		C16BitGrayBitmap* pGrayBitmap = dynamic_cast<C16BitGrayBitmap*>(pInBitmap);
 		const CCFABitmapInfo* pCFABitmapInfo = dynamic_cast<CCFABitmapInfo*>(pInBitmap);
 
+		ZASSERTSTATE(nullptr != pCFABitmapInfo);
 		if (pGrayBitmap != nullptr && pCFABitmapInfo->GetCFATransformation() == CFAT_AHD)
 		{
 			// AHD Demosaicing of the image
@@ -234,6 +235,7 @@ bool LoadPicture(LPCTSTR szFileName, CAllDepthBitmap& AllDepthBitmap, ProgressBa
 			C16BitGrayBitmap* pGrayBitmap = dynamic_cast<C16BitGrayBitmap*>(pBitmap.get());
 			CCFABitmapInfo* pCFABitmapInfo = dynamic_cast<CCFABitmapInfo*>(AllDepthBitmap.m_pBitmap.get());
 
+			ZASSERTSTATE(nullptr != pCFABitmapInfo);
 			if (pBitmap->IsCFA())
 			{
 				if (AllDepthBitmap.m_bDontUseAHD && pCFABitmapInfo->GetCFATransformation() == CFAT_AHD)
@@ -1571,7 +1573,7 @@ void C32BitsBitmap::SetPixel(int x, int y, COLORREF crColor)
 	if ((x >= 0) && (x < m_lWidth) && (y >= 0) && (y < m_lHeight))
 	{
 		pByte pPixel = m_pLine[y] + ((x * 32) >> 3);
-		RGBQUAD rgbq;
+		alignas(std::uint32_t) RGBQUAD rgbq;
 
 		rgbq.rgbRed = GetRValue(crColor);
 		rgbq.rgbGreen = GetGValue(crColor);

diff --git a/DeepSkyStacker/DSSCommon.h b/DeepSkyStacker/DSSCommon.h
@@ -8,11 +8,16 @@ constexpr auto PI = 3.14159265358979323846;
 constexpr int	STARMAXSIZE = 50;
 constexpr int 	RCCHECKSIZE = (5 * STARMAXSIZE) + 2; // 252
 
+//
+// The value of stacking mode is persisted in filelist files and in settings files
+// This means the NONE of these enums should ever be changed.  So SM_CUSTOM must 
+// always have a value of 2 (for example)
+//
 typedef enum tagSTACKINGMODE
 {
 	SM_NORMAL = 0,
 	SM_MOSAIC = 1,
-	SM_CUSTOM = 2,
+	SM_CUSTOM = 2,				// WARNING!! NEVER CHANGE THE VALUE OF SM_CUSTOM
 	SM_INTERSECTION = 3
 }STACKINGMODE;
 

diff --git a/DeepSkyStacker/DeepSkyStacker.vcxproj b/DeepSkyStacker/DeepSkyStacker.vcxproj
@@ -97,7 +97,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
-      <AdditionalOptions>/openmp:experimental /wd4828 /wd4652 /wd4702</AdditionalOptions>
+      <AdditionalOptions>-Zc:__cplusplus /openmp:experimental /wd4828 /wd4652 /wd4702</AdditionalOptions>
       <EnableModules>false</EnableModules>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <WarningLevel>Level4</WarningLevel>
@@ -167,7 +167,7 @@ $(QtToolsPath)\windeployqt $(TargetPath)</Command>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/openmp:experimental /wd4828 /wd4652 /wd4702</AdditionalOptions>
+      <AdditionalOptions>-Zc:__cplusplus /openmp:experimental /wd4828 /wd4652 /wd4702</AdditionalOptions>
       <ShowIncludes>false</ShowIncludes>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>

diff --git a/DeepSkyStacker/DropFilesDlg.cpp b/DeepSkyStacker/DropFilesDlg.cpp
@@ -78,8 +78,8 @@ void DropFilesDlg::onInitDialog()
 		const QRect r{ DeepSkyStacker::instance()->rect() };
 		QSize size = this->size();
 
-		int top = ((r.top() + (r.height() / 2) - (size.height() / 2)));
-		int left = ((r.left() + (r.width() / 2) - (size.width() / 2)));
+		int top = (r.top() + (r.height() / 2) - (size.height() / 2));
+		int left = (r.left() + (r.width() / 2) - (size.width() / 2));
 		move(left, top);
 	}
 

diff --git a/DeepSkyStacker/FITSUtil.cpp b/DeepSkyStacker/FITSUtil.cpp
@@ -1017,7 +1017,7 @@ bool CFITSReadInMemoryBitmap::OnRead(int lX, int lY, double fRed, double fGreen,
 				m_pBitmap->SetPixel(lX, lY, fRed, fGreen, fBlue);
 		}
 	}
-	catch (ZException e)
+	catch (ZException& e)
 	{
 		CString errorMessage;
 		CString name(CA2CT(e.name()));
@@ -1689,7 +1689,7 @@ bool CFITSWriteFromMemoryBitmap::OnWrite(int lX, int lY, double& fRed, double& f
 				m_pMemoryBitmap->GetPixel(lX, lY, fRed, fGreen, fBlue);
 		};
 	}
-	catch (ZException e)
+	catch (ZException& e)
 	{
 		CString errorMessage;
 		CString name(CA2CT(e.name()));