Skip to content

Commit f11913e

Browse files
committed
Merge branch 'master' of https://github.com/mat2umoto/DrawShape
2 parents 8a5c4c1 + 52b5a31 commit f11913e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

DrawShape/Drawer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static constexpr double ANGLE_TOLERANCE = 0.00001;
4343
// 円周率
4444
static constexpr double PI = 3.141592653589793;
4545
// 線分、円弧の座標コレクションのインデックス値
46-
enum { START = 0, END = 1, CENTER = 2, BASE=0 };
46+
enum { START = 0, END = 1, CENTER = 2, BASE = 0 };
4747

4848
// JSONキー:レイヤー配列
4949
static const std::tstring JSON_KEY_LAYERS = _T("Layers");
@@ -364,7 +364,7 @@ class Util
364364
// 始点と中心点が一致
365365
if (Util::IsSamePoint(arc[START], arc[CENTER])) return false;
366366
// 終点と中心点が一致
367-
if (Util::IsSamePoint(arc[START], arc[CENTER])) return false;
367+
if (Util::IsSamePoint(arc[END], arc[CENTER])) return false;
368368
// 半径が不一致
369369
if (!Util::IsZeroLength(
370370
arc[START].Length(arc[CENTER]) - arc[END].Length(arc[CENTER])

0 commit comments

Comments
 (0)