解决 log2 的问题

wysaid · Dec 9, 2023 · b83ed0b · b83ed0b
1 parent ec9d787
commit b83ed0b
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/demo/egejulia.cpp b/demo/egejulia.cpp
@@ -5,10 +5,6 @@
  *        （编译后改为scr后缀使用）
  */
 
-#ifdef _CRT_FUNCTIONS_REQUIRED
-#undef _CRT_FUNCTIONS_REQUIRED /// 解决在高版本 visual studio中, log2 与系统定义的版本冲突的问题
-#endif
-
 #include "graphics.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -97,7 +93,7 @@ const double gc_lb = log(2.0);
  * @param d 指数
  * @return 对数值
  */
-double log2(double d) {
+double myLog2(double d) {
 	return log(d) / gc_lb;
 }
 
@@ -109,7 +105,7 @@ void InitLog()
 	for (int i=0; i<(18 * 18) * 32; ++i)
 	{
 		double r = i / col_ins;
-		logmap[i] = 1 - log2(log2(r)/2);
+		logmap[i] = 1 - myLog2(myLog2(r)/2);
 	}
 }