Revision: 42028
http://brlcad.svn.sourceforge.net/brlcad/?rev=42028&view=rev
Author: starseeker
Date: 2011-01-07 20:38:04 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Update cmake branch to trunk r42027
Modified Paths:
--------------
brlcad/branches/cmake/include/Makefile.am
brlcad/branches/cmake/src/libbu/timetester.c
brlcad/branches/cmake/src/libfft/Makefile.am
Added Paths:
-----------
brlcad/branches/cmake/include/fft.h
Removed Paths:
-------------
brlcad/branches/cmake/src/libfft/fft.h
Modified: brlcad/branches/cmake/include/Makefile.am
===================================================================
--- brlcad/branches/cmake/include/Makefile.am 2011-01-07 20:32:01 UTC (rev
42027)
+++ brlcad/branches/cmake/include/Makefile.am 2011-01-07 20:38:04 UTC (rev
42028)
@@ -47,6 +47,7 @@
fb.h \
fbio.h \
fbserv_obj.h \
+ fft.h \
gcv.h \
libtermio.h \
light.h \
Copied: brlcad/branches/cmake/include/fft.h (from rev 42027,
brlcad/trunk/include/fft.h)
===================================================================
--- brlcad/branches/cmake/include/fft.h (rev 0)
+++ brlcad/branches/cmake/include/fft.h 2011-01-07 20:38:04 UTC (rev 42028)
@@ -0,0 +1,77 @@
+/* F F T . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2004-2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file fft.h
+ *
+ */
+
+#include "common.h"
+
+#include <math.h>
+
+#ifndef M_PI
+# define M_PI 3.141592653589793238462643
+#endif
+#ifndef M_SQRT1_2
+# define M_SQRT1_2 0.70710678118654752440084436210
+#endif
+#ifndef M_SQRT2
+# define M_SQRT2 1.41421356237309504880168872421
+#endif
+
+#ifndef FFT_EXPORT
+# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
+# ifdef FFT_EXPORT_DLL
+# define FFT_EXPORT __declspec(dllexport)
+# else
+# define FFT_EXPORT __declspec(dllimport)
+# endif
+# else
+# define FFT_EXPORT
+# endif
+#endif
+
+/* The COMPLEX type used throughout */
+typedef struct {
+ double re; /* Real Part */
+ double im; /* Imaginary Part */
+} COMPLEX;
+
+FFT_EXPORT extern void splitdit(int N, int M);
+FFT_EXPORT extern void ditsplit(int n /* length */, int m /* n = 2^m */);
+FFT_EXPORT extern void rfft(double *X, int N);
+FFT_EXPORT extern void irfft(double *X, int n);
+FFT_EXPORT extern void cfft(COMPLEX *dat, int num);
+FFT_EXPORT extern void icfft(COMPLEX *dat, int num);
+FFT_EXPORT extern void cdiv(COMPLEX *result, COMPLEX *val1, COMPLEX *val2);
+
+/* These should come from a generated header, but until
+ * CMake is live we'll just add the ones used by our current code */
+FFT_EXPORT extern void rfft256(register double X[]);
+FFT_EXPORT extern void irfft256(register double X[]);
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Modified: brlcad/branches/cmake/src/libbu/timetester.c
===================================================================
--- brlcad/branches/cmake/src/libbu/timetester.c 2011-01-07 20:32:01 UTC
(rev 42027)
+++ brlcad/branches/cmake/src/libbu/timetester.c 2011-01-07 20:38:04 UTC
(rev 42028)
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <stdint.h>
#include <inttypes.h>
#include "bu.h"
@@ -31,19 +30,28 @@
int
main(int argc, char **argv)
{
- int64_t time1, time2;
- int i = 0;
- time1 = bu_gettime();
- while (i < 1.0e6) {
- time2 = bu_gettime();
- i = time2 - time1;
- }
- printf("Time delta: %i\n", i);
- printf("time1: %" PRIi64 "\n", time1);
- printf("time2: %" PRIi64 "\n", time2);
- exit(0);
+ int64_t time1, time2;
+ int i = 0;
+ unsigned long counter = 1;
+
+ if (argc > 1)
+ bu_exit(1, "ERROR: Unexpected parameter [%s]\n", argv[0]);
+
+ time1 = bu_gettime();
+ while (i < 1.0e6) {
+ counter++;
+ time2 = bu_gettime();
+ i = time2 - time1;
+ }
+ bu_log("Called bu_gettime() %lu times\n", counter);
+ bu_log("Time delta: %d\n", i);
+ bu_log("time1: %lu\n", (unsigned long)time1);
+ bu_log("time2: %lu\n", (unsigned long)time2);
+
+ return 0;
}
+
/** @} */
/*
* Local Variables:
Modified: brlcad/branches/cmake/src/libfft/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/libfft/Makefile.am 2011-01-07 20:32:01 UTC
(rev 42027)
+++ brlcad/branches/cmake/src/libfft/Makefile.am 2011-01-07 20:38:04 UTC
(rev 42028)
@@ -21,9 +21,6 @@
AM_CFLAGS = ${STRICT_FLAGS}
-noinst_HEADERS = \
- fft.h
-
fftc_LDADD = ${LIBM}
fftc_SOURCES = \
fftc.c \
Deleted: brlcad/branches/cmake/src/libfft/fft.h
===================================================================
--- brlcad/branches/cmake/src/libfft/fft.h 2011-01-07 20:32:01 UTC (rev
42027)
+++ brlcad/branches/cmake/src/libfft/fft.h 2011-01-07 20:38:04 UTC (rev
42028)
@@ -1,77 +0,0 @@
-/* F F T . H
- * BRL-CAD
- *
- * Copyright (c) 2004-2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file fft.h
- *
- */
-
-#include "common.h"
-
-#include <math.h>
-
-#ifndef M_PI
-# define M_PI 3.141592653589793238462643
-#endif
-#ifndef M_SQRT1_2
-# define M_SQRT1_2 0.70710678118654752440084436210
-#endif
-#ifndef M_SQRT2
-# define M_SQRT2 1.41421356237309504880168872421
-#endif
-
-#ifndef FFT_EXPORT
-# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
-# ifdef FFT_EXPORT_DLL
-# define FFT_EXPORT __declspec(dllexport)
-# else
-# define FFT_EXPORT __declspec(dllimport)
-# endif
-# else
-# define FFT_EXPORT
-# endif
-#endif
-
-/* The COMPLEX type used throughout */
-typedef struct {
- double re; /* Real Part */
- double im; /* Imaginary Part */
-} COMPLEX;
-
-FFT_EXPORT extern void splitdit(int N, int M);
-FFT_EXPORT extern void ditsplit(int n /* length */, int m /* n = 2^m */);
-FFT_EXPORT extern void rfft(double *X, int N);
-FFT_EXPORT extern void irfft(double *X, int n);
-FFT_EXPORT extern void cfft(COMPLEX *dat, int num);
-FFT_EXPORT extern void icfft(COMPLEX *dat, int num);
-FFT_EXPORT extern void cdiv(COMPLEX *result, COMPLEX *val1, COMPLEX *val2);
-
-/* These should come from a generated header, but until
- * CMake is live we'll just add the ones used by our current code */
-FFT_EXPORT extern void rfft256(register double X[]);
-FFT_EXPORT extern void irfft256(register double X[]);
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
