Diff of /benchmarks/programs/lic2d/bmark-teem.c

Parent Directory | Revision Log | Patch

	revision 1595, Tue Nov 1 21:54:15 2011 UTC	revision 1596, Wed Nov 2 13:33:41 2011 UTC
#	Line 14	Line 14
14	#include "teem/nrrd.h"	#include "teem/nrrd.h"
15	#include "teem/gage.h"	#include "teem/gage.h"
16
17	#include <sys/time.h>	#include "teem-defs.h"
	static double GetTime ()
	{
	struct timeval tv;
	gettimeofday (&tv, 0);
	return (double)tv.tv_sec + 0.000001 * (double)tv.tv_usec;
	}
	#define STATIC_INLINE static inline
18
19	STATIC_INLINE void scale2(double scl, double vec[2], double res[2])	STATIC_INLINE void scale2(double scl, double vec[2], double res[2])
20	{	{
#	Line 221	Line 210
210	return -1;	return -1;
211	}	}
212
213	double t0 = GetTime(); // start timing	double t0 = GetTime(); // start timing
214	double pos0[2];	double pos0[2];
215	double forw[2];	double forw[2];
#	Line 337	Line 325
325
326	size_t sizes[3] = {3, 1020, 561};	size_t sizes[3] = {3, 1020, 561};
327	status = nrrdWrap_nva(nout, uc_out_data, nrrdTypeUChar, 3, sizes);	status = nrrdWrap_nva(nout, uc_out_data, nrrdTypeUChar, 3, sizes);
	//status = nrrdWrap_va(nout, uc_out_data, nrrdTypeUChar, 3, 3, 1020, 561);
	// XXX - Teem bug makes nrrdWrap_va not work??
328	if (status) {	if (status) {
329	err = biffGetDone(NRRD);	err = biffGetDone(NRRD);
330	fprintf(stderr, "Trouble wrapping nrrd struct:\n%s", err);	fprintf(stderr, "Trouble wrapping nrrd struct:\n%s", err);

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.1595   changed lines   Added in v.1596

---

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0