소스 검색

Another template fix

Former-commit-id: 77dacf79aa1b4900cc68d49bfa15a119834c2d48
Joe Graus 8 년 전
부모
커밋
0edc80345b
4개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 2 2
      include/igl/inferno.cpp
  2. 2 2
      include/igl/magma.cpp
  3. 2 2
      include/igl/plasma.cpp
  4. 2 2
      include/igl/viridis.cpp

+ 2 - 2
include/igl/inferno.cpp

@@ -305,8 +305,8 @@ IGL_INLINE void igl::inferno(
   const bool normalize,
   const bool normalize,
   Eigen::PlainObjectBase<DerivedC> & C)
   Eigen::PlainObjectBase<DerivedC> & C)
 {
 {
-  const double min_z = (normalize ? Z.minCoeff()) :  0;
-  const double max_z = (normalize ? Z.maxCoeff()) : -1;
+  const double min_z = normalize ? Z.minCoeff() : 0;
+  const double max_z = normalize ? Z.maxCoeff() : -1;
   return inferno(Z, min_z, max_z, C);
   return inferno(Z, min_z, max_z, C);
 }
 }
 
 

+ 2 - 2
include/igl/magma.cpp

@@ -305,8 +305,8 @@ IGL_INLINE void igl::magma(
   const bool normalize,
   const bool normalize,
   Eigen::PlainObjectBase<DerivedC> & C)
   Eigen::PlainObjectBase<DerivedC> & C)
 {
 {
-  const double min_z = (normalize ? Z.minCoeff()) :  0;
-  const double max_z = (normalize ? Z.maxCoeff()) : -1;
+  const double min_z = normalize ? Z.minCoeff() : 0;
+  const double max_z = normalize ? Z.maxCoeff() : -1;
   return magma(Z, min_z, max_z, C);
   return magma(Z, min_z, max_z, C);
 }
 }
 
 

+ 2 - 2
include/igl/plasma.cpp

@@ -305,8 +305,8 @@ IGL_INLINE void igl::plasma(
   const bool normalize,
   const bool normalize,
   Eigen::PlainObjectBase<DerivedC> & C)
   Eigen::PlainObjectBase<DerivedC> & C)
 {
 {
-  const double min_z = (normalize ? Z.minCoeff()) :  0;
-  const double max_z = (normalize ? Z.maxCoeff()) : -1;
+  const double min_z = normalize ? Z.minCoeff() : 0;
+  const double max_z = normalize ? Z.maxCoeff() : -1;
   return plasma(Z, min_z, max_z, C);
   return plasma(Z, min_z, max_z, C);
 }
 }
 
 

+ 2 - 2
include/igl/viridis.cpp

@@ -305,8 +305,8 @@ IGL_INLINE void igl::viridis(
   const bool normalize,
   const bool normalize,
   Eigen::PlainObjectBase<DerivedC> & C)
   Eigen::PlainObjectBase<DerivedC> & C)
 {
 {
-  const double min_z = (normalize ? Z.minCoeff()) :  0;
-  const double max_z = (normalize ? Z.maxCoeff()) : -1;
+  const double min_z = normalize ? Z.minCoeff() :  0;
+  const double max_z = normalize ? Z.maxCoeff() : -1;
   return viridis(Z, min_z, max_z, C);
   return viridis(Z, min_z, max_z, C);
 }
 }