diff -r 558fde7da82a -r 14a727b70d07 include/sampler.h
--- a/include/sampler.h	Fri Mar 28 00:53:20 2008 +0100
+++ b/include/sampler.h	Fri Mar 28 17:13:21 2008 +0100
@@ -62,7 +62,7 @@
 	void resetBuffer(Float *abuffer, int &aw, int &ah) { buffer = abuffer; w = aw; h = ah; };
 	virtual void init() = 0;
 	virtual int initSampleSet() = 0;
-	virtual Sample *nextSample(Sample *prev) = 0;
+	virtual Sample *nextSample() = 0;
 	virtual void saveSample(Sample *samp, Colour &col) = 0;
 };
 
@@ -84,12 +84,13 @@
 	int phase;
 	int subsample;
 	int oversample; // 0 = no, 1 = 5x, 2 = 9x, 3 = 16x
+	int sx,sy,osa_samp; // current sample properties
 public:
 	DefaultSampler(Float *abuffer, int &aw, int &ah):
 		Sampler(abuffer, aw, ah), phase(-1), subsample(8), oversample(0) {};
 	void init();
 	int initSampleSet();
-	Sample *nextSample(Sample *prev);
+	Sample *nextSample();
 	void saveSample(Sample *samp, Colour &col);
 
 	void setSubsample(int sub) { subsample = sub; };