Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/calc_distort.cc
+++ b/rtengine/calc_distort.cc
@@ -35,7 +35,6 @@ double calcDistortion(unsigned char* img1, unsigned char* img2, int ncols, int n
    KLT_TrackingContext tc;
    KLT_FeatureList fl;
    KLT_FeatureTable ft;
-    int nFeatures = N_FEATURES;
    int i,n;
    double radius, wc, hc;