# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1355932544 18000
# Node ID 142de7308ebf486d0ccc148c632b09025866cfa2
# Parent  dbb7896f15c7f1327d30f083a32aadb56cdeeb0f# Parent  f63a4f23bfe75801e88d5850a36128a46f713c9e
main: periodic merge of stable to default

diff -r dbb7896f15c7 -r 142de7308ebf libinterp/dldfcn/fftw.cc
--- a/libinterp/dldfcn/fftw.cc	Wed Dec 19 10:47:11 2012 -0500
+++ b/libinterp/dldfcn/fftw.cc	Wed Dec 19 10:55:44 2012 -0500
@@ -267,3 +267,32 @@
 
   return retval;
 }
+
+/*
+
+%!testif HAVE_FFTW
+%! def_method = fftw ("planner");
+%! unwind_protect
+%!   method = "estimate";
+%!   fftw ("planner", method);
+%!   assert (fftw ("planner"), method);
+%!   method = "measure";
+%!   fftw ("planner", method);
+%!   assert (fftw ("planner"), method);
+%!   method = "patient";
+%!   fftw ("planner", method);
+%!   assert (fftw ("planner"), method);
+%!   method = "exhaustive";
+%!   fftw ("planner", method);
+%!   assert (fftw ("planner"), method);
+%!   method = "hybrid";
+%!   fftw ("planner", method);
+%!   assert (fftw ("planner"), method);
+%! unwind_protect_cleanup
+%!   fftw ("planner", def_method);
+%! end_unwind_protect
+
+%!error <Invalid call to fftw> fftw ();
+%!error <Invalid call to fftw> fftw ("planner", "estimate", "measure");
+
+ */
diff -r dbb7896f15c7 -r 142de7308ebf liboctave/numeric/oct-fftw.h
--- a/liboctave/numeric/oct-fftw.h	Wed Dec 19 10:47:11 2012 -0500
+++ b/liboctave/numeric/oct-fftw.h	Wed Dec 19 10:55:44 2012 -0500
@@ -225,14 +225,14 @@
   {
     static FftwMethod dummy;
 
-    return instance_ok () ? instance->method () : dummy;
+    return instance_ok () ? instance->do_method () : dummy;
   }
 
   static FftwMethod method (FftwMethod _meth)
   {
     static FftwMethod dummy;
 
-    return instance_ok () ? instance->method (_meth) : dummy;
+    return instance_ok () ? instance->do_method (_meth) : dummy;
   }
 
 private: