Non-free SurfSet removed

CMakeLists.txt

@@ -53,11 +53,11 @@ if(BUILD_DVision)
     include/DVision/DVision.h        include/DVision/HSolver.h        include/DVision/Matches.h
     include/DVision/PMVSCamera.h     include/DVision/PixelPointFile.h
     include/DVision/BundleCamera.h   include/DVision/FSolver.h        include/DVision/ImageFunctions.h include/DVision/PLYFile.h        
-    include/DVision/PatchFile.h      include/DVision/SurfSet.h
+    include/DVision/PatchFile.h
     ${HDRS})
   set(SRCS
     src/DVision/FSolver.cpp        src/DVision/ImageFunctions.cpp src/DVision/PLYFile.cpp
-    src/DVision/PatchFile.cpp      src/DVision/SurfSet.cpp
+    src/DVision/PatchFile.cpp
     src/DVision/BundleCamera.cpp   src/DVision/HSolver.cpp        src/DVision/Matches.cpp        src/DVision/PMVSCamera.cpp     
     src/DVision/PixelPointFile.cpp
     ${SRCS})

README.md

@@ -38,7 +38,6 @@ DLib is divided into 3 libraries for different purposes:
     * `FSolver`: implementation of the RANSAC + 8-point algorithm to compute fundamental matrices between images
     * `HSolver`: implementation of the RANSAC + DLT algorithm to compute homographies between images
     * `ImageFunctions`: functions to get patches from images
-    * `SurfSet`: manages SURF keypoints (keeping the laplacian sign) and descriptors
     * `BundleCamera`: reads/writes camera files created by the Bundle software
     * `PMVSCamera`, `PatchFile`, `PLYFile`: read/write data created by the PMVS software
     * `PixelPointFile`, `Matches`: read/write multi-purpose pixel and 3D data files

include/DVision/DVision.h

@@ -39,7 +39,6 @@ namespace DVision
 }
 
 // Features and descriptors
-#include "SurfSet.h"
 #include "BRIEF.h"
 
 // Image functions

include/DVision/Matches.h

@@ -13,7 +13,6 @@
 
 #include <vector>
 #include <string>
-#include "SurfSet.h"
 
 namespace DVision {
 
@@ -22,30 +21,6 @@ class Matches
 {
 public:
 
-  /**
-   * Saves two correspondence vectors in filename, w/ keypoints
-   * @param filename
-   * @param s1 surfset with keypoints from first image
-   * @param s2 surfset with keypoints from second image
-   * @param c1
-   * @param c2 must be as long as c1
-   */
-  static void Save(const std::string &filename,
-    const SurfSet &s1, const SurfSet &s2,
-    const std::vector<int> &c1, const std::vector<int> &c2);
-
-  /**
-   * Loads two correspondence vectors from filename, w/ keypoints
-   * @param filename
-   * @param s1
-   * @param s2
-   * @param c1
-   * @param c2 must be as long as c1
-   */
-  static void Load(const std::string &filename,
-    SurfSet &s1, SurfSet &s2,
-    std::vector<int> &c1, std::vector<int> &c2);
-
   /**
    * Saves two correspondence vectors in filename, w/o keypoints
    * @param filename