Revision: 22430
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22430
Author: genscher
Date: 2009-08-13 15:17:48 +0200 (Thu, 13 Aug 2009)
Log Message:
-----------
Another win32 fftw attempt
Modified Paths:
--------------
trunk/lib/windows/fftw3/include/fftw3.h
trunk/lib/windows/fftw3/lib/libfftw.lib
Modified: trunk/lib/windows/fftw3/include/fftw3.h
===================================================================
--- trunk/lib/windows/fftw3/include/fftw3.h 2009-08-13 12:23:21 UTC (rev
22429)
+++ trunk/lib/windows/fftw3/include/fftw3.h 2009-08-13 13:17:48 UTC (rev
22430)
@@ -1,333 +1,381 @@
-/*
- * Copyright (c) 2003, 2006 Matteo Frigo
- * Copyright (c) 2003, 2006 Massachusetts Institute of Technology
- *
- * The following statement of license applies *only* to this header file,
- * and *not* to the other files distributed with FFTW or derived therefrom:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/***************************** NOTE TO USERS *********************************
- *
- * THIS IS A HEADER FILE, NOT A MANUAL
- *
- * If you want to know how to use FFTW, please read the manual,
- * online at http://www.fftw.org/doc/ and also included with FFTW.
- * For a quick start, see the manual's tutorial section.
- *
- * (Reading header files to learn how to use a library is a habit
- * stemming from code lacking a proper manual. Arguably, it's a
- * *bad* habit in most cases, because header files can contain
- * interfaces that are not part of the public, stable API.)
- *
- ****************************************************************************/
-
-/* header file for fftw3 */
-/* (The following is the CVS ID for this file, *not* the version
- number of FFTW:) */
-/* $Id: fftw3.h,v 1.90 2006-01-17 04:03:33 stevenj Exp $ */
-
-#ifndef FFTW3_H
-#define FFTW3_H
-
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* If <complex.h> is included, use the C99 complex type. Otherwise
- define a type bit-compatible with C99 complex */
-#if !defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) &&
defined(I)
-# define FFTW_DEFINE_COMPLEX(R, C) typedef R _Complex C
-#else
-# define FFTW_DEFINE_COMPLEX(R, C) typedef R C[2]
-#endif
-
-#define FFTW_CONCAT(prefix, name) prefix ## name
-#define FFTW_MANGLE_DOUBLE(name) FFTW_CONCAT(fftw_, name)
-#define FFTW_MANGLE_FLOAT(name) FFTW_CONCAT(fftwf_, name)
-#define FFTW_MANGLE_LONG_DOUBLE(name) FFTW_CONCAT(fftwl_, name)
-
-/* IMPORTANT: for Windows compilers, you should add a line
-*/
-#define FFTW_DLL
-/*
- here and in kernel/ifftw.h if you are compiling/using FFTW as a
- DLL, in order to do the proper importing/exporting, or
- alternatively compile with -DFFTW_DLL or the equivalent
- command-line flag. This is not necessary under MinGW/Cygwin, where
- libtool does the imports/exports automatically. */
-#if defined(FFTW_DLL) && (defined(_WIN32) || defined(__WIN32__))
- /* annoying Windows syntax for shared-library declarations */
-# if defined(COMPILING_FFTW) /* defined in api.h when compiling FFTW */
-# define FFTW_EXTERN extern __declspec(dllexport)
-# else /* user is calling FFTW; import symbol */
-# define FFTW_EXTERN extern __declspec(dllimport)
-# endif
-#else
-# define FFTW_EXTERN extern
-#endif
-
-enum fftw_r2r_kind_do_not_use_me {
- FFTW_R2HC=0, FFTW_HC2R=1, FFTW_DHT=2,
- FFTW_REDFT00=3, FFTW_REDFT01=4, FFTW_REDFT10=5, FFTW_REDFT11=6,
- FFTW_RODFT00=7, FFTW_RODFT01=8, FFTW_RODFT10=9, FFTW_RODFT11=10
-};
-
-struct fftw_iodim_do_not_use_me {
- int n; /* dimension size */
- int is; /* input stride */
- int os; /* output stride */
-};
-
-/*
- huge second-order macro that defines prototypes for all API
- functions. We expand this macro for each supported precision
-
- X: name-mangling macro
- R: real data type
- C: complex data type
-*/
-
-#define FFTW_DEFINE_API(X, R, C) \
- \
-FFTW_DEFINE_COMPLEX(R, C); \
- \
-typedef struct X(plan_s) *X(plan); \
- \
-typedef struct fftw_iodim_do_not_use_me X(iodim); \
- \
-typedef enum fftw_r2r_kind_do_not_use_me X(r2r_kind); \
- \
-FFTW_EXTERN void X(execute)(const X(plan) p); \
- \
-FFTW_EXTERN X(plan) X(plan_dft)(int rank, const int *n,
\
- C *in, C *out, int sign, unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_dft_1d)(int n, C *in, C *out, int sign, \
- unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_dft_2d)(int nx, int ny, \
- C *in, C *out, int sign, unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_dft_3d)(int nx, int ny, int nz, \
- C *in, C *out, int sign, unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_many_dft)(int rank, const int *n, \
- int howmany, \
- C *in, const int *inembed, \
- int istride, int idist, \
- C *out, const int *onembed, \
- int ostride, int odist, \
- int sign, unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_guru_dft)(int rank, const X(iodim) *dims, \
- int howmany_rank, \
- const X(iodim) *howmany_dims, \
- C *in, C *out, \
- int sign, unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_guru_split_dft)(int rank, const X(iodim) *dims, \
- int howmany_rank, \
- const X(iodim) *howmany_dims, \
- R *ri, R *ii, R *ro, R *io, \
- unsigned flags); \
- \
-FFTW_EXTERN void X(execute_dft)(const X(plan) p, C *in, C *out); \
-FFTW_EXTERN void X(execute_split_dft)(const X(plan) p, R *ri, R *ii, \
- R *ro, R *io); \
- \
-FFTW_EXTERN X(plan) X(plan_many_dft_r2c)(int rank, const int *n, \
- int howmany, \
- R *in, const int *inembed,
\
- int istride, int idist, \
- C *out, const int *onembed, \
- int ostride, int odist, \
- unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_dft_r2c)(int rank, const int *n, \
- R *in, C *out, unsigned flags);
\
- \
-FFTW_EXTERN X(plan) X(plan_dft_r2c_1d)(int n,R *in,C *out,unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_dft_r2c_2d)(int nx, int ny, \
- R *in, C *out, unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_dft_r2c_3d)(int nx, int ny, \
- int nz, \
- R *in, C *out, unsigned flags); \
- \
- \
-FFTW_EXTERN X(plan) X(plan_many_dft_c2r)(int rank, const int *n, \
- int howmany, \
- C *in, const int *inembed, \
- int istride, int idist, \
- R *out, const int *onembed, \
- int ostride, int odist, \
- unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_dft_c2r)(int rank, const int *n, \
- C *in, R *out, unsigned flags);
\
- \
-FFTW_EXTERN X(plan) X(plan_dft_c2r_1d)(int n,C *in,R *out,unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_dft_c2r_2d)(int nx, int ny, \
- C *in, R *out, unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_dft_c2r_3d)(int nx, int ny, \
- int nz, \
- C *in, R *out, unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_guru_dft_r2c)(int rank, const X(iodim) *dims, \
- int howmany_rank, \
- const X(iodim) *howmany_dims, \
- R *in, C *out, \
- unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_guru_dft_c2r)(int rank, const X(iodim) *dims, \
- int howmany_rank, \
- const X(iodim) *howmany_dims, \
- C *in, R *out, \
- unsigned flags); \
- \
-FFTW_EXTERN X(plan) X(plan_guru_split_dft_r2c)(
\
- int rank, const X(iodim) *dims, \
- int howmany_rank, \
- const X(iodim) *howmany_dims, \
- R *in, R *ro, R *io, \
- unsigned flags); \
-FFTW_EXTERN X(plan) X(plan_guru_split_dft_c2r)(
\
- int rank, const X(iodim) *dims, \
- int howmany_rank, \
- const X(iodim) *howmany_dims, \
- R *ri, R *ii, R *out, \
- unsigned flags); \
- \
-FFTW_EXTERN void X(execute_dft_r2c)(const X(plan) p, R *in, C *out); \
-FFTW_EXTERN void X(execute_dft_c2r)(const X(plan) p, C *in, R *out); \
- \
-FFTW_EXTERN void X(execute_split_dft_r2c)(const X(plan) p, \
- R *in, R *ro, R *io);
\
-FFTW_EXTERN void X(execute_split_dft_c2r)(const X(plan) p, \
- R *ri, R *ii, R *out); \
- \
-FFTW_EXTERN X(plan) X(plan_many_r2r)(int rank, const int *n, \
- int howmany, \
- R *in, const int *inembed, \
- int istride, int idist, \
- R *out, const int *onembed, \
- int ostride, int odist, \
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
