Renamed vpro to spl avoid a conflict with vpro in VXL.

mleotta · Sep 6, 2010 · 1eba454 · 1eba454
1 parent cda7004
commit 1eba454
Show file tree

Hide file tree

Showing 94 changed files with 1,273 additions and 1,273 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ if(VXL_FOUND)
   include_directories(SYSTEM ${VXL_BRL_INCLUDE_DIR})
   include_directories(SYSTEM ${VXL_GEL_INCLUDE_DIR}/mrc)
 
-  add_subdirectory(vpro)
+  add_subdirectory(spl)
   add_subdirectory(klt)
   add_subdirectory(dml)
   add_subdirectory(cmd)

diff --git a/dml/CMakeLists.txt b/dml/CMakeLists.txt
@@ -33,7 +33,7 @@ set(dml_sources
 
 add_library(dml  ${dml_sources})
 
-target_link_libraries(dml vpro vpro_filters bbgm rrel imesh_algo vpgl vil_algo klt)
+target_link_libraries(dml spl spl_filters bbgm rrel imesh_algo vpgl vil_algo klt)
 
 if( BUILD_TESTING )
   add_subdirectory(tests)

diff --git a/dml/dml_vehicle_fit_video.cxx b/dml/dml_vehicle_fit_video.cxx
@@ -18,25 +18,25 @@
 #include <vgl/vgl_intersection.h>
 #include <dml/dml_vehicle_tracker.h>
 #include <vgl/vgl_area.h>
-#include <vpro/vpro_observer.h>
+#include <spl/spl_observer.h>
 #include <vil/vil_image_resource.h>
-#include <vpro/filters/vidl_source.h>
+#include <spl/filters/vidl_source.h>
 #include <vnl/algo/vnl_cholesky.h>
 
 #include <vnl/algo/vnl_symmetric_eigensystem.h>
 
 //: update the tracker with the edge map
-class dml_edgemap_observer: public vpro_observer
+class dml_edgemap_observer: public spl_observer
 {
 public:
   dml_edgemap_observer(dml_vehicle_fit_video& opt)
   : optimizer(opt) {}
 
   //: Called by the process when the data is ready
-  virtual bool notify(const vpro_storage_sptr& data, unsigned long timestamp)
+  virtual bool notify(const spl_storage_sptr& data, unsigned long timestamp)
   {
     assert(data);
-    if(data->info() == VPRO_VALID){
+    if(data->info() == SPL_VALID){
       assert(data->type_id() == typeid(vil_image_resource_sptr));
       vil_image_resource_sptr edge_rsc = data->data<vil_image_resource_sptr>();
       if(edge_rsc){

diff --git a/dml/dml_vehicle_fit_video.h b/dml/dml_vehicle_fit_video.h
@@ -68,7 +68,7 @@ class dml_vehicle_fit_video : public dml_vehicle_fit
 
 
   //: advance the video and process on frame
-  vpro_signal process_once() { return tracker_.process_once(); }
+  spl_signal process_once() { return tracker_.process_once(); }
 
   //: enable tracking (otherwise only BG modeling is run)
   void enable_tracking(bool enable) { tracker_.enable_tracking(enable); }