[SCM] frei0r/master: Revert non-Debian parts of NMU, to smooth future upstream updates (change not relevant with new upstream relase).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 380330ac267c1a36e2b9ebb27583eeab8545ad29
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Dec 25 21:08:16 2012 +0100

    Revert non-Debian parts of NMU, to smooth future upstream updates (change not relevant with new upstream relase).
    
    This reverts commit dfb583d9f6afcd9be2ff2d764fc02dd23839463b.

diff --git a/src/filter/facedetect/facedetect.c b/src/filter/facedetect/facedetect.c
index 8965129..720de36 100644
--- a/src/filter/facedetect/facedetect.c
+++ b/src/filter/facedetect/facedetect.c
@@ -228,7 +228,7 @@ CvSeq* detect_and_draw( IplImage* img, CvMemStorage* storage,
       double t = (double)cvGetTickCount();
       faces = cvHaarDetectObjects( small_img, cascade, storage,
                                    1.1, 2, 0/*CV_HAAR_DO_CANNY_PRUNING*/,
-                                   cvSize(30, 30), cvSize(30, 30) );
+                                   cvSize(30, 30) );
       t = (double)cvGetTickCount() - t;
       //printf( "detection time = %gms\n", t/((double)cvGetTickFrequency()*1000.) );
 

-- 
frei0r packaging