From 2438e0a034d7ef50c8d7837ea415ca6a95a94fc0 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Fri, 14 Mar 2014 15:14:37 +0000
Subject: publish version

---
 offsetProject/src/imageStore.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'offsetProject/src/imageStore.h')

diff --git a/offsetProject/src/imageStore.h b/offsetProject/src/imageStore.h
index 2f8ccbb..58ef560 100644
--- a/offsetProject/src/imageStore.h
+++ b/offsetProject/src/imageStore.h
@@ -123,11 +123,12 @@ class imageStore : public ofThread{
 	        	Matrix<float> query(test,1,3);
 	        	Matrix<int> indices(new int[1], query.rows, 1);
 	    		Matrix<float> dists(new float[1], query.rows, 1);
-	    		index->knnSearch(query, indices, dists, 1,SearchParams(20));
+	    		index->knnSearch(query, indices, dists, 1,SearchParams(10));
 	    		im=*imageptrs[*indices[0]];
 	    		//int i=rand()%imageptrs.size();
 	    		//im=images[imageptrs[i]];
 	    		//cerr<<"returning image "<<i<<endl;
+	    		delete[] test;
 	    		unlock();
 	    	}
 	    	return im;
@@ -136,14 +137,18 @@ class imageStore : public ofThread{
         ofImage& get_image(float* data){
         	ofImage& im=images.begin()->second;
         	if( lock() ){
+        		int* it=new int[1];
+        		float* ft=new float[1];
 	        	Matrix<float> query(data,1,FLANN_MATRIX_SIZE*FLANN_MATRIX_SIZE*3);
-	        	Matrix<int> indices(new int[1], query.rows, 1);
-	    		Matrix<float> dists(new float[1], query.rows, 1);
-	    		index->knnSearch(query, indices, dists, 1,SearchParams(4));
+	        	Matrix<int> indices(it, query.rows, 1);
+	    		Matrix<float> dists(ft, query.rows, 1);
+	    		index->knnSearch(query, indices, dists, 1,SearchParams(10));
 	    		im=*imageptrs[*indices[0]];
 	    		//int i=rand()%imageptrs.size();
 	    		//im=images[imageptrs[i]];
 	    		//cerr<<"returning image "<<i<<endl;
+	    		delete[] it;
+    			delete[] ft;
 	    		unlock();
 	    	}
 	    	return im;
-- 
cgit v1.2.3