From 07c0aaa0452888351fc26a83aaf72e88e8d587c4 Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@windows.microsoft.com>
Date: Thu, 21 May 2020 00:40:33 -0700
Subject: [PATCH] More code review

---
 DDSTextureLoader/DDSTextureLoader11.h |  2 +-
 DDSTextureLoader/DDSTextureLoader12.h |  2 +-
 DirectXTex/DDS.h                      | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/DDSTextureLoader/DDSTextureLoader11.h b/DDSTextureLoader/DDSTextureLoader11.h
index f3f0a9e..53e588e 100644
--- a/DDSTextureLoader/DDSTextureLoader11.h
+++ b/DDSTextureLoader/DDSTextureLoader11.h
@@ -25,7 +25,7 @@ namespace DirectX
 {
 #ifndef DDS_ALPHA_MODE_DEFINED
 #define DDS_ALPHA_MODE_DEFINED
-    enum DDS_ALPHA_MODE
+    enum DDS_ALPHA_MODE : uint32_t
     {
         DDS_ALPHA_MODE_UNKNOWN       = 0,
         DDS_ALPHA_MODE_STRAIGHT      = 1,
diff --git a/DDSTextureLoader/DDSTextureLoader12.h b/DDSTextureLoader/DDSTextureLoader12.h
index 92986b0..6dbc6ab 100644
--- a/DDSTextureLoader/DDSTextureLoader12.h
+++ b/DDSTextureLoader/DDSTextureLoader12.h
@@ -27,7 +27,7 @@ namespace DirectX
 {
 #ifndef DDS_ALPHA_MODE_DEFINED
 #define DDS_ALPHA_MODE_DEFINED
-    enum DDS_ALPHA_MODE
+    enum DDS_ALPHA_MODE : uint32_t
     {
         DDS_ALPHA_MODE_UNKNOWN       = 0,
         DDS_ALPHA_MODE_STRAIGHT      = 1,
diff --git a/DirectXTex/DDS.h b/DirectXTex/DDS.h
index 833981e..6b02437 100644
--- a/DirectXTex/DDS.h
+++ b/DirectXTex/DDS.h
@@ -18,13 +18,14 @@
 
 #pragma once
 
+#include <cstdint>
 
 namespace DirectX
 {
 
 #pragma pack(push,1)
 
-const uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
 
 struct DDS_PIXELFORMAT
 {
@@ -207,7 +208,7 @@ extern __declspec(selectany) const DDS_PIXELFORMAT DDSPF_DX10 =
 #define DDS_FLAGS_VOLUME 0x00200000 // DDSCAPS2_VOLUME
 
 // Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION
-enum DDS_RESOURCE_DIMENSION
+enum DDS_RESOURCE_DIMENSION : uint32_t
 {
     DDS_DIMENSION_TEXTURE1D	= 2,
     DDS_DIMENSION_TEXTURE2D	= 3,
@@ -215,19 +216,19 @@ enum DDS_RESOURCE_DIMENSION
 };
 
 // Subset here matches D3D10_RESOURCE_MISC_FLAG and D3D11_RESOURCE_MISC_FLAG
-enum DDS_RESOURCE_MISC_FLAG
+enum DDS_RESOURCE_MISC_FLAG : uint32_t
 {
     DDS_RESOURCE_MISC_TEXTURECUBE = 0x4L,
 };
 
-enum DDS_MISC_FLAGS2
+enum DDS_MISC_FLAGS2 : uint32_t
 {
     DDS_MISC_FLAGS2_ALPHA_MODE_MASK = 0x7L,
 };
 
 #ifndef DDS_ALPHA_MODE_DEFINED
 #define DDS_ALPHA_MODE_DEFINED
-enum DDS_ALPHA_MODE
+enum DDS_ALPHA_MODE : uint32_t
 {
     DDS_ALPHA_MODE_UNKNOWN = 0,
     DDS_ALPHA_MODE_STRAIGHT = 1,