Fix compile error

simdsoft · Feb 15, 2021 · 3fc126a · 3fc126a
1 parent 5d139b2
commit 3fc126a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/DmMain/src/Modules/Skin/DMImgListSkinImpl.cpp b/DmMain/src/Modules/Skin/DMImgListSkinImpl.cpp
@@ -240,9 +240,8 @@ namespace DM
 			DMSmartPtrT<IDMBitmap> pBitmap;
 			pRender->CreateBitmap(&pBitmap);
 
-
 			DWORD fourccID = 0;
-			::memcpy(&fourccID, static_cast<const char*>(strType), (std::min)(sizeof(fourccID), (size_t)strType.GetLength()));
+			::memcpy(&fourccID, static_cast<const char*>(strType), DMMIN(sizeof(fourccID), (size_t)strType.GetLength()));
 			auto pfnLoadImageFunc = g_pDMAppData->GetCustomImageLoader(fourccID);
 			if (!pfnLoadImageFunc) {
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ---
 
 [![Build status](https://ci.appveyor.com/api/projects/status/5dq8665euimtgfw7/branch/master?svg=true)](https://ci.appveyor.com/project/halx99/redm/branch/master)
-[![dev](https://img.shields.io/badge/v2.0.0-alpha8-blue.svg)](https://github.com/simdsoft/REDM/releases)
+[![dev](https://img.shields.io/badge/v2.0.0-beta1-green.svg)](https://github.com/simdsoft/REDM/releases)
 
 ## 1. 为什么开源DM库
 * DM的部分代码，部分框架本来就是取之于各类开源，所以尝试开源DM库，取得于开源，回馈于开源，为开源软件业贡献自己的一份小小力量