patch: fix merge conflicts

[Stefan Seefeld]

The attached patch fixes some conflicts seemingly introduced by two overlapping
patches / commits last week.

(Assem: please be careful when applying 'svn resolved'. There were some artifacts
(such as "<<<< .mine") as well as conflicting code checked in with the last commit.)

The new Create_plan harness uses Stride_unit_align everywhere (there was one place
with Stride_unit_dense, that looked like a typo). I'm not sure this is required,
as we only stipulate aligned input for 1D FFTs. Thus, the current code may require
the data to be copied without need.
Should I instead add an overload for Create_plan::create() for 1D FFTs and relax
the alignment for non-1D cases to Stride_unit_dense ?

Thanks,
		Stefan


-- 
Stefan Seefeld
CodeSourcery
stefan at codesourcery.com
(650) 331-3385 x718
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fftw3.patch
Type: text/x-patch
Size: 4729 bytes
Desc: not available
URL: <http://sourcerytools.com/pipermail/vsipl++/attachments/20070612/bb9fdc6e/attachment.bin>