Various compilation fixes for MSVC.

diff -r 7683fa6c06a2 ChangeLog

--- a/ChangeLog	Mon Feb 11 10:11:56 2008 +0100

+++ b/ChangeLog	Fri Jun 20 12:40:26 2008 +0200

@@ -1,3 +1,8 @@

+2008-06-20  Michael Goffioul <michael.goffioul@gmail.com>

+

+	* Makeconf.in: Add GRAPHICS_CFLAGS substitution.

+	* configure.in: Add checks for hypotf and _hypotf.

+

 2008-06-12  Jaroslav Hajek <highegg@gmail.com>

 	* configure.in: Move LIBS and CXXFLAGS restoration into

diff -r 7683fa6c06a2 Makeconf.in

--- a/Makeconf.in	Mon Feb 11 10:11:56 2008 +0100

+++ b/Makeconf.in	Fri Jun 20 12:40:26 2008 +0200

@@ -170,6 +170,8 @@

 ifeq ($(INCLUDE_DEPS),false)

   omit_deps = true;

 endif

+

+GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@

 CXX = @CXX@

 CXX_VERSION = @CXX_VERSION@

diff -r 7683fa6c06a2 configure.in

--- a/configure.in	Mon Feb 11 10:11:56 2008 +0100

+++ b/configure.in	Fri Jun 20 12:40:26 2008 +0200

@@ -1644,6 +1644,7 @@

 ### Check for nonstandard but common math functions that we need.

 AC_CHECK_FUNCS(acosh acoshf asinh asinhf atanh atanhf erf erff erfc erfcf exp2 exp2f log2 log2f)

+AC_CHECK_FUNCS(hypotf _hypotf)

 ### Checks for OS specific cruft.

diff -r 7683fa6c06a2 liboctave/ChangeLog

--- a/liboctave/ChangeLog	Mon Feb 11 10:11:56 2008 +0100

+++ b/liboctave/ChangeLog	Fri Jun 20 12:40:27 2008 +0200

@@ -1,3 +1,8 @@

+2008-06-20  Michael Goffioul  <michael.goffioul@gmail.com>

+

+	* lo-specfun.h: Fix typo in erff/erfcf declaration.

+	* lo-specfun.cc: Ditto. Add atanhf implementation.

+

 2008-06-13  Michael Goffioul  <michael.goffioul@gmail.com>

 	* lo-mappers.cc (arg): Remove ambiguity about atan2(float,float) usage.

diff -r 7683fa6c06a2 liboctave/lo-specfun.cc

--- a/liboctave/lo-specfun.cc	Mon Feb 11 10:11:56 2008 +0100

+++ b/liboctave/lo-specfun.cc	Fri Jun 20 12:40:27 2008 +0200

@@ -224,6 +224,16 @@

 }

 #endif

+#if !defined (HAVE_ATANHF)

+float

+atanhf (float x)

+{

+  float retval;

+  F77_XFCN (xatanh, XATANH, (x, retval));

+  return retval;

+}

+#endif

+

 #if !defined (HAVE_ERF)

 double

 erf (double x)

@@ -236,7 +246,7 @@

 #if !defined (HAVE_ERFF)

 float

-erf (float x)

+erff (float x)

 {

   float retval;

   F77_XFCN (xerf, XERF, (x, retval));

@@ -256,7 +266,7 @@

 #if !defined (HAVE_ERFCF)

 float

-erfc (float x)

+erfcf (float x)

 {

   float retval;

   F77_XFCN (xerfc, XERFC, (x, retval));

diff -r 7683fa6c06a2 liboctave/lo-specfun.h

--- a/liboctave/lo-specfun.h	Mon Feb 11 10:11:56 2008 +0100

+++ b/liboctave/lo-specfun.h	Fri Jun 20 12:40:27 2008 +0200

@@ -76,11 +76,11 @@

 #endif

 #if !defined (HAVE_ERFF)

-extern OCTAVE_API float erf (float);

+extern OCTAVE_API float erff (float);

 #endif

 #if !defined (HAVE_ERFCF)

-extern OCTAVE_API float erfc (float);

+extern OCTAVE_API float erfcf (float);

 #endif

 #if !defined (HAVE_EXPM1)

diff -r 7683fa6c06a2 src/ChangeLog

--- a/src/ChangeLog	Mon Feb 11 10:11:56 2008 +0100

+++ b/src/ChangeLog	Fri Jun 20 12:40:27 2008 +0200

@@ -1,3 +1,13 @@

+2008-06-20  Michael Goffioul  <michael.goffioul@gmail.com>

+

+	* Makefile.in: Add OPENGL_LIBS to liboctinterp link command. Add

+	GRAPHICS_CFLAGS to fltk_backend.cc compilation command.

+	* data.cc: Define hypotf to _hypotf when not present.

+	* gl-render.h: Replace OCTGRAPHICS_API with OCTINTERP_API.

+	* gl-render.cc: Get rid of Array2<vertex_data>.

+	* OPERATORS/op-int.h: Force the use of "pow" on double when invoked

+	with float arguments.

+

 2008-06-17  John W. Eaton  <jwe@octave.org>

 	* toplev.h, toplev.cc (class octave_call_stack):

diff -r 7683fa6c06a2 src/Makefile.in

--- a/src/Makefile.in	Mon Feb 11 10:11:56 2008 +0100

+++ b/src/Makefile.in	Fri Jun 20 12:40:27 2008 +0200

@@ -275,7 +275,8 @@

 endif

 OCTINTERP_LINK_DEPS = \

-  -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS)

+  -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) \

+  $(OPENGL_LIBS)

 OCT_LINK_DEPS = \

   -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \

@@ -302,6 +303,9 @@

 $(DLD_PICOBJ): \

 	ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS))

+

+fltk_backend.o pic/fltk_backend.o: \

+	ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS) $(GRAPHICS_CFLAGS))

 XERBLA = ../libcruft/blas-xtra/xerbla.o

 ifdef FPICFLAG

diff -r 7683fa6c06a2 src/OPERATORS/op-int.h

--- a/src/OPERATORS/op-int.h	Mon Feb 11 10:11:56 2008 +0100

+++ b/src/OPERATORS/op-int.h	Fri Jun 20 12:40:27 2008 +0200

@@ -227,13 +227,13 @@

   octave_value \

   xpow (const octave_ ## T1& a, float b) \

   { \

-    return pow (a, b); \

+    return pow (a, static_cast<double> (b)); \

   } \

  \

   octave_value \

   xpow (float a, const octave_ ## T1& b) \

   { \

-    return pow (a, b); \

+    return pow (static_cast<double> (a), b); \

   }

 #define OCTAVE_SS_INT_OPS(TYPE) \

@@ -360,7 +360,7 @@

     for (int i = 0; i < b.length (); i++) \

       { \

 	OCTAVE_QUIT; \

-	result (i) = pow (a, b(i)); \

+	result (i) = pow (a, static_cast<double> (b(i))); \

       } \

     return octave_value (result); \

   } \

@@ -372,7 +372,7 @@

     for (int i = 0; i < b.length (); i++) \

       { \

 	OCTAVE_QUIT; \

-	result (i) = pow (a, b(i)); \

+	result (i) = pow (static_cast<double> (a), b(i)); \

       } \

     return octave_value (result); \

   }

@@ -512,7 +512,7 @@

   for (int i = 0; i < a.length (); i++) \

     { \

       OCTAVE_QUIT; \

-      result (i) = pow (a(i), b);		\

+      result (i) = pow (a(i), static_cast<double> (b));		\

     } \

   return octave_value (result); \

 } \

@@ -523,7 +523,7 @@

   for (int i = 0; i < a.length (); i++) \

     { \

       OCTAVE_QUIT; \

-      result (i) = pow (a(i), b);		\

+      result (i) = pow (static_cast<double> (a(i)), b);		\

     } \

   return octave_value (result); \

 }

@@ -690,7 +690,7 @@

     for (int i = 0; i < a.length (); i++) \

       { \

 	OCTAVE_QUIT; \

-	result (i) = pow (a(i), b(i)); \

+	result (i) = pow (a(i), static_cast<double> (b(i))); \

       } \

     return octave_value (result); \

   } \

@@ -709,7 +709,7 @@

     for (int i = 0; i < a.length (); i++) \

       { \

 	OCTAVE_QUIT; \

-	result (i) = pow (a(i), b(i)); \

+	result (i) = pow (static_cast<double> (a(i)), b(i)); \

       } \

     return octave_value (result); \

   }

diff -r 7683fa6c06a2 src/data.cc

--- a/src/data.cc	Mon Feb 11 10:11:56 2008 +0100

+++ b/src/data.cc	Fri Jun 20 12:40:27 2008 +0200

@@ -62,6 +62,11 @@

 #include "utils.h"

 #include "variables.h"

 #include "pager.h"

+

+#if ! defined (HAVE_HYPOTF) && defined (HAVE__HYPOTF)

+#define hypotf _hypotf

+#define HAVE_HYPOTF 1

+#endif

 #define ANY_ALL(FCN) \

  \

diff -r 7683fa6c06a2 src/gl-render.cc

--- a/src/gl-render.cc	Mon Feb 11 10:11:56 2008 +0100

+++ b/src/gl-render.cc	Fri Jun 20 12:40:27 2008 +0200

@@ -380,8 +380,6 @@

   vertex_data_rep *get_rep (void) const { return rep; }

 };

-

-#include <Array.cc>

 class

 opengl_renderer::patch_tesselator : public opengl_tesselator

@@ -2283,7 +2281,8 @@

       has_facealpha = ((a.numel () > 0) && (a.rows () == f.rows ()));

     }

-  Array2<vertex_data> vdata (f.dims ());

+  octave_idx_type fr = f.rows (), fc = f.columns ();

+  std::vector<vertex_data> vdata (f.numel ());

   for (int i = 0; i < nf; i++)

     for (int j = 0; j < count_f(i); j++)

@@ -2316,7 +2315,7 @@

 	      aa = a(idx);

 	  }

-	vdata(i,j) =

+	vdata[i+j*fr] =

 	    vertex_data (vv, cc, nn, aa, as, ds, ss, se);

       }

@@ -2366,7 +2365,7 @@

 	      for (int j = 0; j < count_f(i); j++)

 		{

-		  vertex_data::vertex_data_rep *vv = vdata(i,j).get_rep ();

+		  vertex_data::vertex_data_rep *vv = vdata[i+j*fr].get_rep ();

 		  tess.add_vertex (vv->coords.fortran_vec (), vv);

 		}

@@ -2426,7 +2425,7 @@

 	      for (int j = 0; j < count_f(i); j++)

 		{

-		  vertex_data::vertex_data_rep *vv = vdata(i,j).get_rep ();

+		  vertex_data::vertex_data_rep *vv = vdata[i+j*fr].get_rep ();

 		  tess.add_vertex (vv->coords.fortran_vec (), vv);

 		}

@@ -2481,10 +2480,10 @@

 	      continue;

 	    Matrix lc = (do_edge ? (mecolor.numel () == 0 ?

-				    vdata(i,j).get_rep ()->color : mecolor)

+				    vdata[i+j*fr].get_rep ()->color : mecolor)

 			 : Matrix ());

 	    Matrix fc = (do_face ? (mfcolor.numel () == 0 ?

-				    vdata(i,j).get_rep ()->color : mfcolor)

+				    vdata[i+j*fr].get_rep ()->color : mfcolor)

 			 : Matrix ());

 	    draw_marker (v(idx,0), v(idx,1), (has_z ? v(idx,2) : 0), lc, fc);

diff -r 7683fa6c06a2 src/gl-render.h

--- a/src/gl-render.h	Mon Feb 11 10:11:56 2008 +0100

+++ b/src/gl-render.h	Fri Jun 20 12:40:27 2008 +0200

@@ -35,7 +35,7 @@

 #include "graphics.h"

 class

-OCTGRAPHICS_API

+OCTINTERP_API

 opengl_renderer

 {

 public: