From b207e278e78fe44c77a3394ba3a3b7545a8b8959 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 10 Oct 2018 15:31:00 -0700 Subject: [PATCH] Minor code review --- DirectXTex/DirectXTexConvert.cpp | 4 ++-- DirectXTex/DirectXTexUtil.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index d9c2485..4aaa624 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -4358,8 +4358,8 @@ namespace _Out_ WICPixelFormatGUID& pfGUID, _Out_ WICPixelFormatGUID& targetGUID) { - memcpy(&pfGUID, &GUID_NULL, sizeof(GUID)); - memcpy(&targetGUID, &GUID_NULL, sizeof(GUID)); + memset(&pfGUID, 0, sizeof(GUID)); + memset(&targetGUID, 0, sizeof(GUID)); if (filter & TEX_FILTER_FORCE_NON_WIC) { diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp index 29fcc52..68fc22a 100644 --- a/DirectXTex/DirectXTexUtil.cpp +++ b/DirectXTex/DirectXTexUtil.cpp @@ -197,7 +197,7 @@ bool DirectX::_DXGIToWIC(DXGI_FORMAT format, GUID& guid, bool ignoreRGBvsBGR) break; } - memcpy(&guid, &GUID_NULL, sizeof(GUID)); + memset(&guid, 0, sizeof(GUID)); return false; }