rb-gsl 1.16.0.4 → 1.16.0.5

data/ext/{gsl → gsl_native}/wavelet.c

@@ -12,22 +12,16 @@
 #include "include/rb_gsl_array.h"
 #include "include/rb_gsl_common.h"
 
-#ifdef GSL_1_6_LATER
 #include <gsl/gsl_wavelet.h>
 #include <gsl/gsl_wavelet2d.h>
-#endif
-
-#ifdef HAVE_NARRAY_H
-#include "narray.h"
-#endif
 
 #ifndef CHECK_WAVELET
-#define CHECK_WAVELET(x) if(!rb_obj_is_kind_of(x,cgsl_wavelet))\
+#define CHECK_WAVELET(x) if(!rb_obj_is_kind_of(x,cgsl_wavelet)) \
     rb_raise(rb_eTypeError, "wrong argument type (Wavelet expected)");
 #endif
 
 #ifndef CHECK_WORKSPACE
-#define CHECK_WORKSPACE(x) if(!rb_obj_is_kind_of(x,cgsl_wavelet_workspace))\
+#define CHECK_WORKSPACE(x) if(!rb_obj_is_kind_of(x,cgsl_wavelet_workspace)) \
     rb_raise(rb_eTypeError, "wrong argument type (Wavelet::Workspace expected)");
 #endif
 
@@ -47,14 +41,11 @@ enum {
   GSL_WAVELET_BSPLINE_CENTERED,
 };
 
-#ifdef GSL_1_6_LATER
 static const gsl_wavelet_type* rb_gsl_wavelet_get_type(VALUE t);
 static VALUE cgsl_wavelet_workspace;
-#endif
 
 static VALUE rb_gsl_wavelet_new(VALUE klass, VALUE t, VALUE m)
 {
-#ifdef GSL_1_6_LATER
   const gsl_wavelet_type *T;
   size_t member;
   gsl_wavelet *w = NULL;
@@ -64,13 +55,8 @@ static VALUE rb_gsl_wavelet_new(VALUE klass, VALUE t, VALUE m)
   w = gsl_wavelet_alloc(T, member);
   if (w == NULL) rb_raise(rb_eNoMemError, "gsl_wavelet_alloc failed");
   return Data_Wrap_Struct(klass, 0, gsl_wavelet_free, w);
-#else
-  rb_raise(rb_eNotImpError, "Wavelet transforms not supported in GSL-%s, use GSL-1.6 or later", GSL_VERSION);
-  return Qnil;
-#endif
 }
 
-#ifdef GSL_1_6_LATER
 static const gsl_wavelet_type* rb_gsl_wavelet_get_type_str(char *name);
 static const gsl_wavelet_type* rb_gsl_wavelet_get_type_int(int t);
 static const gsl_wavelet_type* rb_gsl_wavelet_get_type(VALUE t)
@@ -84,9 +70,9 @@ static const gsl_wavelet_type* rb_gsl_wavelet_get_type(VALUE t)
     T = rb_gsl_wavelet_get_type_int(FIX2INT(t));
     break;
   default:
-    rb_raise(rb_eTypeError, 
-	     "wrong type of argument %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(t)));
+    rb_raise(rb_eTypeError,
+             "wrong type of argument %s (String or Fixnum expected)",
+             rb_class2name(CLASS_OF(t)));
     break;
   }
   return T;
@@ -174,19 +160,19 @@ static VALUE rb_gsl_wavelet_workspace_new(VALUE klass, VALUE nn)
 }
 
 static VALUE rb_gsl_wavelet2d_trans(int argc, VALUE *argv, VALUE obj,
-				    int (*trans)(const gsl_wavelet *, 
-						 gsl_matrix *,
-						 gsl_wavelet_workspace *),
-				    int sss);
+                                    int (*trans)(const gsl_wavelet *,
+                                                 gsl_matrix *,
+                                                 gsl_wavelet_workspace *),
+                                    int sss);
 static VALUE rb_gsl_wavelet2d(int argc, VALUE *argv, VALUE obj,
-			      int (*trans)(const gsl_wavelet *, 
-					   gsl_matrix *, 
-					   gsl_wavelet_direction, 
-					   gsl_wavelet_workspace *),
-			      int sss);
+                              int (*trans)(const gsl_wavelet *,
+                                           gsl_matrix *,
+                                           gsl_wavelet_direction,
+                                           gsl_wavelet_workspace *),
+                              int sss);
 
 static VALUE rb_gsl_wavelet_transform0(int argc, VALUE *argv, VALUE obj,
-				       int sss)
+                                       int sss)
 {
   gsl_wavelet *w = NULL;
   gsl_vector *v = NULL, *vnew;
@@ -212,7 +198,7 @@ static VALUE rb_gsl_wavelet_transform0(int argc, VALUE *argv, VALUE obj,
 
     if (MATRIX_P(argv[1])) {
       return rb_gsl_wavelet2d(argc, argv, obj,
-			      gsl_wavelet2d_transform_matrix, sss);
+                              gsl_wavelet2d_transform_matrix, sss);
     }
     if (VECTOR_P(argv[1])) {
       Data_Get_Struct(argv[0], gsl_wavelet, w);
@@ -237,10 +223,9 @@ static VALUE rb_gsl_wavelet_transform0(int argc, VALUE *argv, VALUE obj,
     break;
   default:
     if (argc < 1) rb_raise(rb_eArgError, "too few arguments");
-
     if (MATRIX_P(argv[0])) {
       return rb_gsl_wavelet2d(argc, argv, obj,
-			      gsl_wavelet2d_transform_matrix, sss);
+                              gsl_wavelet2d_transform_matrix, sss);
     }
     if (VECTOR_P(obj)) {
       CHECK_WAVELET(argv[0]);
@@ -312,7 +297,7 @@ static VALUE rb_gsl_wavelet_transform0(int argc, VALUE *argv, VALUE obj,
     break;
   }
   if (naflag == 0) {
-    if (sss == RB_GSL_DWT_COPY) { 
+    if (sss == RB_GSL_DWT_COPY) {
       vnew = gsl_vector_alloc(v->size);
       gsl_vector_memcpy(vnew, v);
       ary = Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
@@ -349,10 +334,10 @@ static VALUE rb_gsl_wavelet_transform2(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE rb_gsl_wavelet_trans(int argc, VALUE *argv, VALUE obj,
-				  int (*trans)(const gsl_wavelet *, 
-					       double *, size_t, size_t, 
-					       gsl_wavelet_workspace *),
-				  int sss)
+                                  int (*trans)(const gsl_wavelet *,
+                                               double *, size_t, size_t,
+                                               gsl_wavelet_workspace *),
+                                  int sss)
 {
   gsl_wavelet *w = NULL;
   gsl_vector *v = NULL, *vnew;
@@ -375,11 +360,11 @@ static VALUE rb_gsl_wavelet_trans(int argc, VALUE *argv, VALUE obj,
 
     if (MATRIX_P(argv[1])) {
       if (trans == gsl_wavelet_transform_forward) {
-	return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				      gsl_wavelet2d_transform_matrix_forward, sss);
+        return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                      gsl_wavelet2d_transform_matrix_forward, sss);
       } else {
-	return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				      gsl_wavelet2d_transform_matrix_inverse, sss);
+        return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                      gsl_wavelet2d_transform_matrix_inverse, sss);
       }
     }
     if (VECTOR_P(argv[1])) {
@@ -405,14 +390,13 @@ static VALUE rb_gsl_wavelet_trans(int argc, VALUE *argv, VALUE obj,
     break;
   default:
     if (argc < 1) rb_raise(rb_eArgError, "too few arguments");
-
     if (MATRIX_P(argv[0])) {
       if (trans == gsl_wavelet_transform_forward) {
-	return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				      gsl_wavelet2d_transform_matrix_forward, sss);
+        return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                      gsl_wavelet2d_transform_matrix_forward, sss);
       } else {
-	return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				      gsl_wavelet2d_transform_matrix_inverse, sss);
+        return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                      gsl_wavelet2d_transform_matrix_inverse, sss);
       }
     }
     if (VECTOR_P(obj)) {
@@ -500,33 +484,33 @@ static VALUE rb_gsl_wavelet_trans(int argc, VALUE *argv, VALUE obj,
 static VALUE rb_gsl_wavelet_transform_forward(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet_trans(argc, argv, obj, gsl_wavelet_transform_forward,
-			      RB_GSL_DWT_COPY);
+                              RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet_transform_inverse(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet_trans(argc, argv, obj, gsl_wavelet_transform_inverse,
-			      RB_GSL_DWT_COPY);
+                              RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet_transform_forward2(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet_trans(argc, argv, obj, gsl_wavelet_transform_forward,
-			      RB_GSL_DWT_INPLACE);
+                              RB_GSL_DWT_INPLACE);
 }
 
 static VALUE rb_gsl_wavelet_transform_inverse2(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet_trans(argc, argv, obj, gsl_wavelet_transform_inverse,
-			      RB_GSL_DWT_INPLACE);
+                              RB_GSL_DWT_INPLACE);
 }
 
 static VALUE rb_gsl_wavelet2d(int argc, VALUE *argv, VALUE obj,
-			      int (*trans)(const gsl_wavelet *, 
-					   gsl_matrix *, 
-					   gsl_wavelet_direction, 
-					   gsl_wavelet_workspace *),
-			      int sss)
+                              int (*trans)(const gsl_wavelet *,
+                                           gsl_matrix *,
+                                           gsl_wavelet_direction,
+                                           gsl_wavelet_workspace *),
+                              int sss)
 {
   gsl_wavelet *w = NULL;
   gsl_matrix *m = NULL, *mnew;
@@ -605,20 +589,20 @@ static VALUE rb_gsl_wavelet2d(int argc, VALUE *argv, VALUE obj,
 static VALUE rb_gsl_wavelet2d_transform_matrix(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet2d(argc, argv, obj, gsl_wavelet2d_transform_matrix,
-			  RB_GSL_DWT_COPY);
+                          RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet2d_transform_matrix2(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet2d(argc, argv, obj, gsl_wavelet2d_transform_matrix,
-			  RB_GSL_DWT_INPLACE);
+                          RB_GSL_DWT_INPLACE);
 }
 
 static VALUE rb_gsl_wavelet2d_trans(int argc, VALUE *argv, VALUE obj,
-				    int (*trans)(const gsl_wavelet *, 
-						 gsl_matrix *,
-						 gsl_wavelet_workspace *),
-				    int sss)
+                                    int (*trans)(const gsl_wavelet *,
+                                                 gsl_matrix *,
+                                                 gsl_wavelet_workspace *),
+                                    int sss)
 {
   gsl_wavelet *w = NULL;
   gsl_matrix *m = NULL, *mnew;
@@ -682,75 +666,73 @@ static VALUE rb_gsl_wavelet2d_trans(int argc, VALUE *argv, VALUE obj,
 
 static VALUE rb_gsl_wavelet2d_transform_matrix_forward(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_transform_matrix_forward,
-				RB_GSL_DWT_COPY);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_transform_matrix_forward,
+                                RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet2d_transform_matrix_forward2(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_transform_matrix_forward,
-				RB_GSL_DWT_INPLACE);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_transform_matrix_forward,
+                                RB_GSL_DWT_INPLACE);
 }
 
 static VALUE rb_gsl_wavelet2d_transform_matrix_inverse(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_transform_matrix_inverse,
-				RB_GSL_DWT_COPY);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_transform_matrix_inverse,
+                                RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet2d_transform_matrix_inverse2(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_transform_matrix_inverse,
-				RB_GSL_DWT_INPLACE);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_transform_matrix_inverse,
+                                RB_GSL_DWT_INPLACE);
 }
 
 /** nstransform **/
 static VALUE rb_gsl_wavelet2d_nstransform_matrix(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet2d(argc, argv, obj, gsl_wavelet2d_nstransform_matrix,
-			  RB_GSL_DWT_COPY);
+                          RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet2d_nstransform_matrix2(int argc, VALUE *argv, VALUE obj)
 {
   return rb_gsl_wavelet2d(argc, argv, obj, gsl_wavelet2d_nstransform_matrix,
-			  RB_GSL_DWT_INPLACE);
+                          RB_GSL_DWT_INPLACE);
 }
 
 static VALUE rb_gsl_wavelet2d_nstransform_matrix_forward(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_nstransform_matrix_forward,
-				RB_GSL_DWT_COPY);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_nstransform_matrix_forward,
+                                RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet2d_nstransform_matrix_forward2(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_nstransform_matrix_forward,
-				RB_GSL_DWT_INPLACE);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_nstransform_matrix_forward,
+                                RB_GSL_DWT_INPLACE);
 }
 
 static VALUE rb_gsl_wavelet2d_nstransform_matrix_inverse(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_nstransform_matrix_inverse,
-				RB_GSL_DWT_COPY);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_nstransform_matrix_inverse,
+                                RB_GSL_DWT_COPY);
 }
 
 static VALUE rb_gsl_wavelet2d_nstransform_matrix_inverse2(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_wavelet2d_trans(argc, argv, obj, 
-				gsl_wavelet2d_nstransform_matrix_inverse,
-				RB_GSL_DWT_INPLACE);
+  return rb_gsl_wavelet2d_trans(argc, argv, obj,
+                                gsl_wavelet2d_nstransform_matrix_inverse,
+                                RB_GSL_DWT_INPLACE);
 }
 
-#endif
-
 void Init_wavelet(VALUE module)
 {
   VALUE cgsl_wavelet2d;
@@ -760,183 +742,180 @@ void Init_wavelet(VALUE module)
 
   rb_define_singleton_method(cgsl_wavelet, "alloc", rb_gsl_wavelet_new, 2);
 
-#ifdef GSL_1_6_LATER
   rb_gsl_wavelet_define_const(cgsl_wavelet);
   rb_define_method(cgsl_wavelet, "name", rb_gsl_wavelet_name, 0);
 
   cgsl_wavelet_workspace = rb_define_class_under(cgsl_wavelet, "Workspace", cGSL_Object);
-  rb_define_singleton_method(cgsl_wavelet_workspace, "alloc", 
-			     rb_gsl_wavelet_workspace_new, 1);
+  rb_define_singleton_method(cgsl_wavelet_workspace, "alloc",
+                             rb_gsl_wavelet_workspace_new, 1);
 
   /*****/
 
-  rb_define_singleton_method(cgsl_wavelet, "transform", 
-			     rb_gsl_wavelet_transform, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform",
+                             rb_gsl_wavelet_transform, -1);
   rb_define_method(cgsl_wavelet, "transform", rb_gsl_wavelet_transform, -1);
   rb_define_method(cgsl_vector, "wavelet_transform", rb_gsl_wavelet_transform, -1);
-  rb_define_singleton_method(cgsl_wavelet, "transform!", 
-			     rb_gsl_wavelet_transform2, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform!",
+                             rb_gsl_wavelet_transform2, -1);
   rb_define_method(cgsl_wavelet, "transform!", rb_gsl_wavelet_transform2, -1);
   rb_define_method(cgsl_vector, "wavelet_transform!", rb_gsl_wavelet_transform2, -1);
 
   /**/
 
-  rb_define_singleton_method(cgsl_wavelet, "transform_forward", 
-			     rb_gsl_wavelet_transform_forward, -1);
-  rb_define_method(cgsl_wavelet, "transform_forward", 
-		   rb_gsl_wavelet_transform_forward, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform_forward",
+                             rb_gsl_wavelet_transform_forward, -1);
+  rb_define_method(cgsl_wavelet, "transform_forward",
+                   rb_gsl_wavelet_transform_forward, -1);
   rb_define_alias(cgsl_wavelet, "forward", "transform_forward");
-  rb_define_method(cgsl_vector, "wavelet_transform_forward", 
-		   rb_gsl_wavelet_transform_forward, -1);
+  rb_define_method(cgsl_vector, "wavelet_transform_forward",
+                   rb_gsl_wavelet_transform_forward, -1);
 
-  rb_define_singleton_method(cgsl_wavelet, "transform_inverse", 
-			     rb_gsl_wavelet_transform_inverse, -1);
-  rb_define_method(cgsl_wavelet, "transform_inverse", 
-		   rb_gsl_wavelet_transform_inverse, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform_inverse",
+                             rb_gsl_wavelet_transform_inverse, -1);
+  rb_define_method(cgsl_wavelet, "transform_inverse",
+                   rb_gsl_wavelet_transform_inverse, -1);
   rb_define_alias(cgsl_wavelet, "inverse", "transform_inverse");
-  rb_define_method(cgsl_vector, "wavelet_transform_inverse", 
-		   rb_gsl_wavelet_transform_inverse, -1);
+  rb_define_method(cgsl_vector, "wavelet_transform_inverse",
+                   rb_gsl_wavelet_transform_inverse, -1);
 
-  rb_define_singleton_method(cgsl_wavelet, "transform_forward!", 
-			     rb_gsl_wavelet_transform_forward2, -1);
-  rb_define_method(cgsl_wavelet, "transform_forward!", 
-		   rb_gsl_wavelet_transform_forward2, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform_forward!",
+                             rb_gsl_wavelet_transform_forward2, -1);
+  rb_define_method(cgsl_wavelet, "transform_forward!",
+                   rb_gsl_wavelet_transform_forward2, -1);
   rb_define_alias(cgsl_wavelet, "forward!", "transform_forward!");
-  rb_define_method(cgsl_vector, "wavelet_transform_forward!", 
-		   rb_gsl_wavelet_transform_forward2, -1);
+  rb_define_method(cgsl_vector, "wavelet_transform_forward!",
+                   rb_gsl_wavelet_transform_forward2, -1);
 
-  rb_define_singleton_method(cgsl_wavelet, "transform_inverse!", 
-			     rb_gsl_wavelet_transform_inverse2, -1);
-  rb_define_method(cgsl_wavelet, "transform_inverse!", 
-		   rb_gsl_wavelet_transform_inverse2, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform_inverse!",
+                             rb_gsl_wavelet_transform_inverse2, -1);
+  rb_define_method(cgsl_wavelet, "transform_inverse!",
+                   rb_gsl_wavelet_transform_inverse2, -1);
   rb_define_alias(cgsl_wavelet, "inverse!", "transform_inverse!");
-  rb_define_method(cgsl_vector, "wavelet_transform_inverse!", 
-		   rb_gsl_wavelet_transform_inverse2, -1);
+  rb_define_method(cgsl_vector, "wavelet_transform_inverse!",
+                   rb_gsl_wavelet_transform_inverse2, -1);
   /***** 2d *****/
-  rb_define_singleton_method(cgsl_wavelet, "transform_matrix", 
-			     rb_gsl_wavelet2d_transform_matrix, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "transform", 
-			     rb_gsl_wavelet2d_transform_matrix, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform_matrix",
+                             rb_gsl_wavelet2d_transform_matrix, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "transform",
+                             rb_gsl_wavelet2d_transform_matrix, -1);
   rb_define_method(cgsl_wavelet, "transform_matrix",
-		   rb_gsl_wavelet2d_transform_matrix, -1);
-  rb_define_method(cgsl_wavelet2d, "transform", 
-		   rb_gsl_wavelet2d_transform_matrix, -1);
-  rb_define_method(cgsl_matrix, "wavelet_transform", 
-		   rb_gsl_wavelet2d_transform_matrix, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "transform_matrix!", 
-			     rb_gsl_wavelet2d_transform_matrix2, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "transform!", 
-			     rb_gsl_wavelet2d_transform_matrix2, -1);
+                   rb_gsl_wavelet2d_transform_matrix, -1);
+  rb_define_method(cgsl_wavelet2d, "transform",
+                   rb_gsl_wavelet2d_transform_matrix, -1);
+  rb_define_method(cgsl_matrix, "wavelet_transform",
+                   rb_gsl_wavelet2d_transform_matrix, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "transform_matrix!",
+                             rb_gsl_wavelet2d_transform_matrix2, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "transform!",
+                             rb_gsl_wavelet2d_transform_matrix2, -1);
   rb_define_method(cgsl_wavelet, "transform_matrix!",
-		   rb_gsl_wavelet2d_transform_matrix2, -1);
-  rb_define_method(cgsl_wavelet2d, "transform!", 
-		   rb_gsl_wavelet2d_transform_matrix2, -1);
-  rb_define_method(cgsl_matrix, "wavelet_transform!", 
-		   rb_gsl_wavelet2d_transform_matrix2, -1);
+                   rb_gsl_wavelet2d_transform_matrix2, -1);
+  rb_define_method(cgsl_wavelet2d, "transform!",
+                   rb_gsl_wavelet2d_transform_matrix2, -1);
+  rb_define_method(cgsl_matrix, "wavelet_transform!",
+                   rb_gsl_wavelet2d_transform_matrix2, -1);
   /**/
 
-  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_forward", 
-			     rb_gsl_wavelet2d_transform_matrix_forward, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "transform_forward", 
-			     rb_gsl_wavelet2d_transform_matrix_forward, -1);
-  rb_define_method(cgsl_wavelet, "transform_matrix_forward", 
-		   rb_gsl_wavelet2d_transform_matrix_forward, -1);
-  rb_define_method(cgsl_wavelet2d, "transform_forward", 
-		   rb_gsl_wavelet2d_transform_matrix_forward, -1);
-  rb_define_method(cgsl_matrix, "wavelet_transform_forward", 
-		   rb_gsl_wavelet2d_transform_matrix_forward, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_forward!", 
-			     rb_gsl_wavelet2d_transform_matrix_forward2, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "transform_forward!", 
-			     rb_gsl_wavelet2d_transform_matrix_forward2, -1);
-  rb_define_method(cgsl_wavelet, "transform_matrix_forward!", 
-		   rb_gsl_wavelet2d_transform_matrix_forward2, -1);
-  rb_define_method(cgsl_wavelet2d, "transform_forward!", 
-		   rb_gsl_wavelet2d_transform_matrix_forward2, -1);
-  rb_define_method(cgsl_matrix, "wavelet_transform_forward!", 
-		   rb_gsl_wavelet2d_transform_matrix_forward2, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_inverse", 
-			     rb_gsl_wavelet2d_transform_matrix_inverse, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "transform_inverse", 
-			     rb_gsl_wavelet2d_transform_matrix_inverse, -1);
-  rb_define_method(cgsl_wavelet, "transform_matrix_inverse", 
-		   rb_gsl_wavelet2d_transform_matrix_inverse, -1);
-  rb_define_method(cgsl_wavelet2d, "transform_inverse", 
-		   rb_gsl_wavelet2d_transform_matrix_inverse, -1);
-  rb_define_method(cgsl_matrix, "wavelet_transform_inverse", 
-		   rb_gsl_wavelet2d_transform_matrix_inverse, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_inverse!", 
-			     rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "transform_inverse!", 
-			     rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
-  rb_define_method(cgsl_wavelet, "transform_matrix_inverse!", 
-		   rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
-  rb_define_method(cgsl_wavelet2d, "transform_inverse!", 
-		   rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
-  rb_define_method(cgsl_matrix, "wavelet_transform_inverse!", 
-		   rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
+  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_forward",
+                             rb_gsl_wavelet2d_transform_matrix_forward, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "transform_forward",
+                             rb_gsl_wavelet2d_transform_matrix_forward, -1);
+  rb_define_method(cgsl_wavelet, "transform_matrix_forward",
+                   rb_gsl_wavelet2d_transform_matrix_forward, -1);
+  rb_define_method(cgsl_wavelet2d, "transform_forward",
+                   rb_gsl_wavelet2d_transform_matrix_forward, -1);
+  rb_define_method(cgsl_matrix, "wavelet_transform_forward",
+                   rb_gsl_wavelet2d_transform_matrix_forward, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_forward!",
+                             rb_gsl_wavelet2d_transform_matrix_forward2, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "transform_forward!",
+                             rb_gsl_wavelet2d_transform_matrix_forward2, -1);
+  rb_define_method(cgsl_wavelet, "transform_matrix_forward!",
+                   rb_gsl_wavelet2d_transform_matrix_forward2, -1);
+  rb_define_method(cgsl_wavelet2d, "transform_forward!",
+                   rb_gsl_wavelet2d_transform_matrix_forward2, -1);
+  rb_define_method(cgsl_matrix, "wavelet_transform_forward!",
+                   rb_gsl_wavelet2d_transform_matrix_forward2, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_inverse",
+                             rb_gsl_wavelet2d_transform_matrix_inverse, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "transform_inverse",
+                             rb_gsl_wavelet2d_transform_matrix_inverse, -1);
+  rb_define_method(cgsl_wavelet, "transform_matrix_inverse",
+                   rb_gsl_wavelet2d_transform_matrix_inverse, -1);
+  rb_define_method(cgsl_wavelet2d, "transform_inverse",
+                   rb_gsl_wavelet2d_transform_matrix_inverse, -1);
+  rb_define_method(cgsl_matrix, "wavelet_transform_inverse",
+                   rb_gsl_wavelet2d_transform_matrix_inverse, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "transform_matrix_inverse!",
+                             rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "transform_inverse!",
+                             rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
+  rb_define_method(cgsl_wavelet, "transform_matrix_inverse!",
+                   rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
+  rb_define_method(cgsl_wavelet2d, "transform_inverse!",
+                   rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
+  rb_define_method(cgsl_matrix, "wavelet_transform_inverse!",
+                   rb_gsl_wavelet2d_transform_matrix_inverse2, -1);
 
   /** nstransform **/
-  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix", 
-			     rb_gsl_wavelet2d_nstransform_matrix, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "nstransform", 
-			     rb_gsl_wavelet2d_nstransform_matrix, -1);
-  rb_define_method(cgsl_wavelet, "nstransform_matrix", 
-		   rb_gsl_wavelet2d_nstransform_matrix, -1);
-  rb_define_method(cgsl_wavelet2d, "nstransform", 
-		   rb_gsl_wavelet2d_nstransform_matrix, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix!", 
-			     rb_gsl_wavelet2d_nstransform_matrix2, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "nstransform!", 
-			     rb_gsl_wavelet2d_nstransform_matrix2, -1);
-  rb_define_method(cgsl_wavelet, "nstransform_matrix!", 
-		   rb_gsl_wavelet2d_nstransform_matrix2, -1);
-  rb_define_method(cgsl_wavelet2d, "nstransform!", 
-		   rb_gsl_wavelet2d_nstransform_matrix2, -1);
+  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix",
+                             rb_gsl_wavelet2d_nstransform_matrix, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "nstransform",
+                             rb_gsl_wavelet2d_nstransform_matrix, -1);
+  rb_define_method(cgsl_wavelet, "nstransform_matrix",
+                   rb_gsl_wavelet2d_nstransform_matrix, -1);
+  rb_define_method(cgsl_wavelet2d, "nstransform",
+                   rb_gsl_wavelet2d_nstransform_matrix, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix!",
+                             rb_gsl_wavelet2d_nstransform_matrix2, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "nstransform!",
+                             rb_gsl_wavelet2d_nstransform_matrix2, -1);
+  rb_define_method(cgsl_wavelet, "nstransform_matrix!",
+                   rb_gsl_wavelet2d_nstransform_matrix2, -1);
+  rb_define_method(cgsl_wavelet2d, "nstransform!",
+                   rb_gsl_wavelet2d_nstransform_matrix2, -1);
   /**/
 
-  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_forward", 
-			     rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_forward", 
-			     rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
-  rb_define_method(cgsl_wavelet, "nstransform_matrix_forward", 
-		   rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
-  rb_define_method(cgsl_wavelet2d, "nstransform_forward", 
-		   rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_forward!", 
-			     rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_forward!", 
-			     rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
-  rb_define_method(cgsl_wavelet, "nstransform_matrix_forward!", 
-		   rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
-  rb_define_method(cgsl_wavelet2d, "nstransform_forward!", 
-		   rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_inverse", 
-			     rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_inverse", 
-			     rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
-  rb_define_method(cgsl_wavelet, "nstransform_matrix_inverse", 
-		   rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
-  rb_define_method(cgsl_wavelet2d, "nstransform_inverse", 
-		   rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
-
-  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_inverse!", 
-			     rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
-  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_inverse!", 
-			     rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
-  rb_define_method(cgsl_wavelet, "nstransform_matrix_inverse!", 
-		   rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
-  rb_define_method(cgsl_wavelet2d, "nstransform_inverse!", 
-		   rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
-
-#endif
+  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_forward",
+                             rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_forward",
+                             rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
+  rb_define_method(cgsl_wavelet, "nstransform_matrix_forward",
+                   rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
+  rb_define_method(cgsl_wavelet2d, "nstransform_forward",
+                   rb_gsl_wavelet2d_nstransform_matrix_forward, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_forward!",
+                             rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_forward!",
+                             rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
+  rb_define_method(cgsl_wavelet, "nstransform_matrix_forward!",
+                   rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
+  rb_define_method(cgsl_wavelet2d, "nstransform_forward!",
+                   rb_gsl_wavelet2d_nstransform_matrix_forward2, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_inverse",
+                             rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_inverse",
+                             rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
+  rb_define_method(cgsl_wavelet, "nstransform_matrix_inverse",
+                   rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
+  rb_define_method(cgsl_wavelet2d, "nstransform_inverse",
+                   rb_gsl_wavelet2d_nstransform_matrix_inverse, -1);
+
+  rb_define_singleton_method(cgsl_wavelet, "nstransform_matrix_inverse!",
+                             rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
+  rb_define_singleton_method(cgsl_wavelet2d, "nstransform_inverse!",
+                             rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
+  rb_define_method(cgsl_wavelet, "nstransform_matrix_inverse!",
+                   rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
+  rb_define_method(cgsl_wavelet2d, "nstransform_inverse!",
+                   rb_gsl_wavelet2d_nstransform_matrix_inverse2, -1);
 }
 
 #undef CHECK_WAVELET