From 40ecb4048cf8d43305394de25bdb9cb3d2323554 Mon Sep 17 00:00:00 2001
From: scttgs0 <scttgs0@gmail.com>
Date: Sat, 13 May 2023 13:26:37 -0500
Subject: [PATCH] Maintenance: whitespace
Eliminate formfeeds.
---
src/Prep/Terra/Array.h | 1 -
src/Prep/Terra/Geom.h | 2 --
src/Prep/Terra/GreedyInsert.cc | 4 ----
src/Prep/Terra/Heap.cc | 1 -
src/Prep/Terra/Map.h | 3 ---
src/Prep/Terra/Subdivision.cc | 13 -------------
src/Prep/Terra/Vec2.h | 1 -
src/Prep/Terra/Vec3.h | 2 --
src/Prep/Terra/getopt.c | 14 +++++++-------
src/Prep/Terra/glHacks.h | 5 -----
src/Prep/Terra/gui.cc | 4 ----
src/Prep/Terra/output.cc | 2 --
12 files changed, 7 insertions(+), 45 deletions(-)
diff --git a/src/Prep/Terra/Array.h b/src/Prep/Terra/Array.h
index c910ffeb..6a738829 100644
--- a/src/Prep/Terra/Array.h
+++ b/src/Prep/Terra/Array.h
@@ -74,7 +74,6 @@ inline void array<T>::resize(int l)
delete[] old;
}
-
template<class T>
class array2 {
diff --git a/src/Prep/Terra/Geom.h b/src/Prep/Terra/Geom.h
index fcf4a7af..4c6c5f80 100644
--- a/src/Prep/Terra/Geom.h
+++ b/src/Prep/Terra/Geom.h
@@ -90,7 +90,6 @@ inline boolean inCircle(const Vec2& a, const Vec2& b, const Vec2& c,
(d[0]*d[0] + d[1]*d[1]) * triArea(a, b, c) > EPS;
}
-
class Plane {
public:
@@ -120,7 +119,6 @@ inline void Plane::init(const Vec3& p, const Vec3& q, const Vec3& r)
c = p[Z] - a*p[X] - b*p[Y];
}
-
class Line {
diff --git a/src/Prep/Terra/GreedyInsert.cc b/src/Prep/Terra/GreedyInsert.cc
index 844fb03a..3927efc9 100644
--- a/src/Prep/Terra/GreedyInsert.cc
+++ b/src/Prep/Terra/GreedyInsert.cc
@@ -18,8 +18,6 @@ void TrackedTriangle::update(Subdivision& s)
gs.scanTriangle(*this);
}
-
-
GreedySubdivision::GreedySubdivision(Map *map)
{
@@ -86,8 +84,6 @@ Triangle *GreedySubdivision::allocFace(Edge *e)
}
-
-
void GreedySubdivision::compute_plane(Plane& plane,
Triangle& T,
Map& map)
diff --git a/src/Prep/Terra/Heap.cc b/src/Prep/Terra/Heap.cc
index 79ffcd37..49a0252e 100644
--- a/src/Prep/Terra/Heap.cc
+++ b/src/Prep/Terra/Heap.cc
@@ -45,7 +45,6 @@ void Heap::downheap(int i)
}
}
-
void Heap::insert(Labelled *t,real v)
{
diff --git a/src/Prep/Terra/Map.h b/src/Prep/Terra/Map.h
index 3d21516c..11e1c2c1 100644
--- a/src/Prep/Terra/Map.h
+++ b/src/Prep/Terra/Map.h
@@ -31,8 +31,6 @@ public:
extern Map *readPGM(std::istream&);
-
-
template<class T>
class DirectMap : public Map
{
@@ -64,7 +62,6 @@ typedef DirectMap<unsigned short> ShortMap;
typedef DirectMap<unsigned int> WordMap;
typedef DirectMap<real> RealMap;
-
template<class T>
DirectMap<T>::DirectMap(int w, int h)
diff --git a/src/Prep/Terra/Subdivision.cc b/src/Prep/Terra/Subdivision.cc
index e21c9ff1..b56bdc83 100644
--- a/src/Prep/Terra/Subdivision.cc
+++ b/src/Prep/Terra/Subdivision.cc
@@ -84,7 +84,6 @@ void Subdivision::initMesh(const Vec2& A,const Vec2& B,
}
-
void Subdivision::deleteEdge(Edge *e)
{
@@ -124,7 +123,6 @@ void Subdivision::swap(Edge *e)
f2->reshape(e->Sym());
}
-
//
// Subdivision iterators
@@ -168,8 +166,6 @@ void Subdivision::overFaces(face_callback fn, void *closure)
}
-
-
//
// Random predicates
//
@@ -220,9 +216,6 @@ boolean Subdivision::shouldSwap(const Vec2& x, Edge *e)
}
-
-
-
Edge *Subdivision::locate(const Vec2& x, Edge *start)
{
Edge *e = start;
@@ -412,7 +405,6 @@ Edge *Subdivision::insert(Vec2& x, Triangle *tri)
return start_spoke;
}
-
Triangle *Subdivision::allocFace(Edge *e)
{
@@ -431,11 +423,6 @@ Triangle& Subdivision::makeFace(Edge *e)
}
-
-
-
-
-
void Triangle::dontAnchor(Edge *e)
{
if( anchor == e )
diff --git a/src/Prep/Terra/Vec2.h b/src/Prep/Terra/Vec2.h
index 67fe9dc9..8145b5b8 100644
--- a/src/Prep/Terra/Vec2.h
+++ b/src/Prep/Terra/Vec2.h
@@ -56,7 +56,6 @@ public:
}
};
-
inline void Vec2::copy(const Vec2& v)
{
diff --git a/src/Prep/Terra/Vec3.h b/src/Prep/Terra/Vec3.h
index 763c7040..b6575de1 100644
--- a/src/Prep/Terra/Vec3.h
+++ b/src/Prep/Terra/Vec3.h
@@ -55,8 +55,6 @@ public:
};
-
-
inline void Vec3::copy(const Vec3& v)
{
elt[0]=v.elt[0]; elt[1]=v.elt[1]; elt[2]=v.elt[2];
diff --git a/src/Prep/Terra/getopt.c b/src/Prep/Terra/getopt.c
index 202d9432..6632f99f 100644
--- a/src/Prep/Terra/getopt.c
+++ b/src/Prep/Terra/getopt.c
@@ -24,7 +24,7 @@
This file was modified slightly by Ian Lance Taylor, June 1992, for
Taylor UUCP. */
-
+
/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
long-named option. Because this is not POSIX.2 compliant, it is
@@ -124,10 +124,10 @@ static enum
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
}
ordering;
-
+
#define my_index strchr
#define my_bcopy(src, dst, n) memcpy ((dst), (src), (n))
-
+
/* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have
@@ -170,7 +170,7 @@ static void exchange(argv)
first_nonopt += (optind - last_nonopt);
last_nonopt = optind;
}
-
+
/* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING.
@@ -544,7 +544,7 @@ int getopt(argc, argv, optstring)
return _getopt_internal(argc, argv, optstring, (const struct option *) 0,
(int *) 0, 0);
}
-
+
#ifdef TEST
/* Compile with -DTEST to make an executable for use in testing
@@ -633,7 +633,7 @@ int main(argc, argv)
You should have received a copy of the GNU Library General Public License
along with this program; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
+
#ifdef HAVE_CONFIG_H
#if defined (emacs) || defined (CONFIG_BROKETS)
@@ -705,7 +705,7 @@ int getopt_long_only(argc, argv, options, long_options, opt_index)
}
#endif /* _LIBC or not __GNU_LIBRARY__. */
-
+
#ifdef TEST
#include <stdio.h>
diff --git a/src/Prep/Terra/glHacks.h b/src/Prep/Terra/glHacks.h
index 6ab09e9f..2df6f5cd 100644
--- a/src/Prep/Terra/glHacks.h
+++ b/src/Prep/Terra/glHacks.h
@@ -21,7 +21,6 @@
*
*************************************************************************/
-
inline void glV(GLdouble x, GLdouble y) { glVertex2d(x,y); }
inline void glV(GLfloat x, GLfloat y) { glVertex2f(x,y); }
@@ -59,7 +58,6 @@ inline void glV4(const GLfloat *v) { glVertex4fv(v); }
inline void glV4(const GLint *v) { glVertex4iv(v); }
inline void glV4(const GLshort *v) { glVertex4sv(v); }
-
inline void glN(GLdouble x, GLdouble y, GLdouble z) { glNormal3d(x,y,z); }
inline void glN(GLfloat x, GLfloat y, GLfloat z) { glNormal3f(x,y,z); }
@@ -71,7 +69,6 @@ inline void glN3(const GLfloat *v) { glNormal3fv(v); }
inline void glN3(const GLint *v) { glNormal3iv(v); }
inline void glN3(const GLshort *v) { glNormal3sv(v); }
-
inline void glC(GLdouble x, GLdouble y, GLdouble z) { glColor3d(x,y,z); }
inline void glC(GLfloat x, GLfloat y, GLfloat z) { glColor3f(x,y,z); }
@@ -96,7 +93,6 @@ inline void glC4(const GLfloat *v) { glColor4fv(v); }
inline void glC4(const GLint *v) { glColor4iv(v); }
inline void glC4(const GLshort *v) { glColor4sv(v); }
-
inline void glLoadMatrix(const GLdouble *m) { glLoadMatrixd(m); }
inline void glLoadMatrix(const GLfloat *m) { glLoadMatrixf(m); }
@@ -106,7 +102,6 @@ inline void glGetMatrix(GLdouble *m,GLenum src=GL_PROJECTION_MATRIX)
inline void glGetMatrix(GLfloat *m,GLenum src=GL_PROJECTION_MATRIX)
{ glGetFloatv(src,m); }
-
/*************************************************************************
*
diff --git a/src/Prep/Terra/gui.cc b/src/Prep/Terra/gui.cc
index eb1f428b..1f9dd638 100644
--- a/src/Prep/Terra/gui.cc
+++ b/src/Prep/Terra/gui.cc
@@ -184,9 +184,6 @@ void mesh_mouse(int button, int state, int x, int y)
}
-
-
-
////////////////////////////////////////////////////////////////////////
//
// Surface functions
@@ -426,7 +423,6 @@ void gui_interact()
glutMainLoop();
}
-
////////////////////////////////////////////////////////////////////////
//
diff --git a/src/Prep/Terra/output.cc b/src/Prep/Terra/output.cc
index bd6362c5..f692603d 100644
--- a/src/Prep/Terra/output.cc
+++ b/src/Prep/Terra/output.cc
@@ -58,8 +58,6 @@ void generate_output(char *filename, FileFormat format)
}
-
-
static ostream *output_stream;