Fix more compiler warnings in test/*.cxx (STR #2813).

Thanks to Csaba for the patch.
Also fixed copyright and a few indenting issues.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10667 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 4 insertions, 8 deletions

diff --git a/test/curve.cxx b/test/curve.cxx
index 42e93196e..6ee1450fc 100644
--- a/test/curve.cxx
+++ b/test/curve.cxx
@@ -3,7 +3,7 @@
 //
 // Curve test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2015 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -44,7 +44,7 @@ class Drawing : public Fl_Widget {
     if (!points) {
     fl_color(FL_WHITE);
     fl_begin_complex_polygon();
-   fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
+    fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
     fl_end_complex_polygon();
     }
     fl_color(FL_BLACK);
@@ -56,7 +56,7 @@ class Drawing : public Fl_Widget {
     fl_end_line();
     fl_color(points ? FL_WHITE : FL_RED);
     points ? fl_begin_points() : fl_begin_line();
-   fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
+    fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
     points ? fl_end_points() : fl_end_line();
     fl_pop_matrix();
     fl_pop_clip();
@@ -91,11 +91,7 @@ int main(int argc, char** argv) {
     s->step(1);
     s->value(args[n]);
     s->align(FL_ALIGN_LEFT);
-#ifdef __LP64__
-    s->callback(slider_cb, (void*) (long long)n);
-#else
-    s->callback(slider_cb, (void*)n);
-#endif
+    s->callback(slider_cb, (void*)(fl_intptr_t)n);
   }
   Fl_Toggle_Button but(50,y,50,25,"points");
   but.callback(points_cb);