* Fix definitions of fftw_iodim and fftw_iodim64 for FFTW (issue #…

…466)

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Fix definitions of `fftw_iodim` and `fftw_iodim64` for FFTW ([issue #466](https://github.com/bytedeco/javacpp-presets/issues/466))
  * Add a `Mat(Scalar)` constructor to OpenCV for convenience ([issue bytedeco/javacv#738](https://github.com/bytedeco/javacv/issues/738))
  * Include the `libavutil/time.h` for FFmpeg ([issue bytedeco/javacv#735](https://github.com/bytedeco/javacv/issues/735))
  * Map `AVERROR()` for error codes from `errno.h` used by FFmpeg ([pull #459](https://github.com/bytedeco/javacpp-presets/pull/459))

fftw/src/main/java/org/bytedeco/javacpp/fftw3.java

@@ -109,43 +109,43 @@ public class fftw3 extends org.bytedeco.javacpp.presets.fftw3 {
      FFTW_REDFT00= 3, FFTW_REDFT01= 4, FFTW_REDFT10= 5, FFTW_REDFT11= 6,
      FFTW_RODFT00= 7, FFTW_RODFT01= 8, FFTW_RODFT10= 9, FFTW_RODFT11= 10;
 
-public static class fftw_iodim_do_not_use_me extends Pointer {
+@Name("fftw_iodim_do_not_use_me") public static class fftw_iodim extends Pointer {
     static { Loader.load(); }
     /** Default native constructor. */
-    public fftw_iodim_do_not_use_me() { super((Pointer)null); allocate(); }
+    public fftw_iodim() { super((Pointer)null); allocate(); }
     /** Native array allocator. Access with {@link Pointer#position(long)}. */
-    public fftw_iodim_do_not_use_me(long size) { super((Pointer)null); allocateArray(size); }
+    public fftw_iodim(long size) { super((Pointer)null); allocateArray(size); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public fftw_iodim_do_not_use_me(Pointer p) { super(p); }
+    public fftw_iodim(Pointer p) { super(p); }
     private native void allocate();
     private native void allocateArray(long size);
-    @Override public fftw_iodim_do_not_use_me position(long position) {
-        return (fftw_iodim_do_not_use_me)super.position(position);
+    @Override public fftw_iodim position(long position) {
+        return (fftw_iodim)super.position(position);
     }
 
-     public native int n(); public native fftw_iodim_do_not_use_me n(int n);                     /* dimension size */
-     public native int is(); public native fftw_iodim_do_not_use_me is(int is);			/* input stride */
-     public native int os(); public native fftw_iodim_do_not_use_me os(int os);			/* output stride */
+     public native int n(); public native fftw_iodim n(int n);                     /* dimension size */
+     public native int is(); public native fftw_iodim is(int is);			/* input stride */
+     public native int os(); public native fftw_iodim os(int os);			/* output stride */
 }
 
 // #include <stddef.h> /* for ptrdiff_t */
-public static class fftw_iodim64_do_not_use_me extends Pointer {
+@Name("fftw_iodim64_do_not_use_me") public static class fftw_iodim64 extends Pointer {
     static { Loader.load(); }
     /** Default native constructor. */
-    public fftw_iodim64_do_not_use_me() { super((Pointer)null); allocate(); }
+    public fftw_iodim64() { super((Pointer)null); allocate(); }
     /** Native array allocator. Access with {@link Pointer#position(long)}. */
-    public fftw_iodim64_do_not_use_me(long size) { super((Pointer)null); allocateArray(size); }
+    public fftw_iodim64(long size) { super((Pointer)null); allocateArray(size); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public fftw_iodim64_do_not_use_me(Pointer p) { super(p); }
+    public fftw_iodim64(Pointer p) { super(p); }
     private native void allocate();
     private native void allocateArray(long size);
-    @Override public fftw_iodim64_do_not_use_me position(long position) {
-        return (fftw_iodim64_do_not_use_me)super.position(position);
+    @Override public fftw_iodim64 position(long position) {
+        return (fftw_iodim64)super.position(position);
     }
 
-     public native @Cast("ptrdiff_t") long n(); public native fftw_iodim64_do_not_use_me n(long n);                     /* dimension size */
-     public native @Cast("ptrdiff_t") long is(); public native fftw_iodim64_do_not_use_me is(long is);			/* input stride */
-     public native @Cast("ptrdiff_t") long os(); public native fftw_iodim64_do_not_use_me os(long os);			/* output stride */
+     public native @Cast("ptrdiff_t") long n(); public native fftw_iodim64 n(long n);                     /* dimension size */
+     public native @Cast("ptrdiff_t") long is(); public native fftw_iodim64 is(long is);			/* input stride */
+     public native @Cast("ptrdiff_t") long os(); public native fftw_iodim64 os(long os);			/* output stride */
 }
 
 public static class fftw_write_char_func_do_not_use_me extends FunctionPointer {
@@ -511,19 +511,6 @@ public static class fftw_read_char_func_do_not_use_me extends FunctionPointer {
     public fftw_plan(Pointer p) { super(p); }
 }
 
-@Opaque public static class fftw_iodim extends Pointer {
-    /** Empty constructor. Calls {@code super((Pointer)null)}. */
-    public fftw_iodim() { super((Pointer)null); }
-    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public fftw_iodim(Pointer p) { super(p); }
-}
-@Opaque public static class fftw_iodim64 extends Pointer {
-    /** Empty constructor. Calls {@code super((Pointer)null)}. */
-    public fftw_iodim64() { super((Pointer)null); }
-    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public fftw_iodim64(Pointer p) { super(p); }
-}
-
 public static native void fftw_execute(fftw_plan p);
 
 public static native fftw_plan fftw_plan_dft(int rank, @Const IntPointer n, @Cast("fftw_complex*") DoublePointer in, @Cast("fftw_complex*") DoublePointer out, int sign, @Cast("unsigned") int flags);

fftw/src/main/java/org/bytedeco/javacpp/presets/fftw3.java

@@ -44,6 +44,8 @@ public void map(InfoMap infoMap) {
                .put(new Info("fftwf_plan_s").pointerTypes("fftwf_plan")).put(new Info("fftwf_plan").valueTypes("fftwf_plan"))
                .put(new Info("fftwl_plan_s").pointerTypes("fftwl_plan")).put(new Info("fftwl_plan").valueTypes("fftwl_plan"))
                .put(new Info("fftwq_plan_s").pointerTypes("fftwq_plan")).put(new Info("fftwq_plan").valueTypes("fftwq_plan"))
+               .put(new Info("fftw_iodim_do_not_use_me").pointerTypes("fftw_iodim"))
+               .put(new Info("fftw_iodim64_do_not_use_me").pointerTypes("fftw_iodim64"))
                .put(new Info("fftw_version").annotations("@Platform(not=\"windows\")").javaNames("fftw_version"))
                .put(new Info("fftw_cc").annotations("@Platform(not=\"windows\")").javaNames("fftw_cc"))
                .put(new Info("fftw_codelet_optim").annotations("@Platform(not=\"windows\")").javaNames("fftw_codelet_optim"))