From 18eda86aa434b957eac05dfe69a59082dd70caaa Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Sat, 25 Jul 2020 16:44:06 -0400
Subject: backout change
---
generic/tkbltGrElemLine.C | 8 ++++----
generic/tkbltGrHairs.h | 2 +-
generic/tkbltGrMisc.h | 4 +---
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/generic/tkbltGrElemLine.C b/generic/tkbltGrElemLine.C
index e8e6413..9e3f39a 100644
--- a/generic/tkbltGrElemLine.C
+++ b/generic/tkbltGrElemLine.C
@@ -2009,7 +2009,7 @@ void LineElement::drawSCross(Display* display, Drawable drawable,
{
LinePenOptions* penOps = (LinePenOptions*)penPtr->ops();
- Point2d pattern[4];
+ Point pattern[4];
if (penOps->symbol.type == SYMBOL_SCROSS) {
r2 = (int)(r2 * M_SQRT1_2);
pattern[3].y = pattern[2].x = pattern[0].x = pattern[0].y = -r2;
@@ -2051,7 +2051,7 @@ void LineElement::drawCross(Display *display, Drawable drawable,
* 9 8
*/
int d = (r2 / 3);
- Point2d pattern[13];
+ Point pattern[13];
pattern[0].x = pattern[11].x = pattern[12].x = -r2;
pattern[2].x = pattern[1].x = pattern[10].x = pattern[9].x = -d;
pattern[3].x = pattern[4].x = pattern[7].x = pattern[8].x = d;
@@ -2122,7 +2122,7 @@ void LineElement::drawDiamond(Display *display, Drawable drawable,
* (fifth) point connects the first and
* 3 last points.
*/
- Point2d pattern[5];
+ Point pattern[5];
pattern[1].y = pattern[0].x = -r1;
pattern[2].y = pattern[3].x = pattern[0].y = pattern[1].x = 0;
pattern[3].y = pattern[2].x = r1;
@@ -2184,7 +2184,7 @@ void LineElement::drawArrow(Display *display, Drawable drawable,
* 2 1 last points.
*/
- Point2d pattern[4];
+ Point pattern[4];
if (penOps->symbol.type == SYMBOL_ARROW) {
pattern[3].x = pattern[0].x = 0;
pattern[3].y = pattern[0].y = h1;
diff --git a/generic/tkbltGrHairs.h b/generic/tkbltGrHairs.h
index e489f79..a86d0c6 100644
--- a/generic/tkbltGrHairs.h
+++ b/generic/tkbltGrHairs.h
@@ -56,7 +56,7 @@ namespace Blt {
int visible_;
GC gc_;
- Point2d segArr_[4];
+ Point segArr_[4];
public:
Crosshairs(Graph*);
diff --git a/generic/tkbltGrMisc.h b/generic/tkbltGrMisc.h
index 38b78cb..ba86b75 100644
--- a/generic/tkbltGrMisc.h
+++ b/generic/tkbltGrMisc.h
@@ -67,12 +67,10 @@ using namespace std;
namespace Blt {
class Graph;
- /*
typedef struct {
int x, y;
} Point;
- */
-
+
typedef struct {
int x, y;
unsigned width, height;
--
cgit v0.12