浏览代码

added Exception to fthrow statements in LocalFeatureSift, ICETools and LFSiftPP

Alexander Luetz 13 年之前
父节点
当前提交
6ccb326cf9
共有 3 个文件被更改,包括 10 次插入4 次删除
  1. 4 2
      baselib/ICETools.cpp
  2. 3 1
      features/localfeatures/LFSiftPP.cpp
  3. 3 1
      features/localfeatures/LocalFeatureSift.cpp

+ 4 - 2
baselib/ICETools.cpp

@@ -17,6 +17,8 @@
 
 
 #include "vislearning/baselib/ICETools.h"
 #include "vislearning/baselib/ICETools.h"
 
 
+#include "core/basics/Exception.h"
+
 using namespace OBJREC;
 using namespace OBJREC;
 
 
 using namespace std;
 using namespace std;
@@ -33,7 +35,7 @@ ICETools::~ICETools()
 
 
 void ICETools::selectRectangles ( const NICE::Image & panel, NICE::Image & overlay, vector<Vector> & x, int color )
 void ICETools::selectRectangles ( const NICE::Image & panel, NICE::Image & overlay, vector<Vector> & x, int color )
 {
 {
-	fthrow("ICETools::selectRectangles -- not yet implemented due to old ICE version.");
+	fthrow(Exception, "ICETools::selectRectangles -- not yet implemented due to old ICE version.");
 // #ifndef NOVISUAL
 // #ifndef NOVISUAL
 //     // new NICE code
 //     // new NICE code
 //     vector<RectT<double> > rectangles;
 //     vector<RectT<double> > rectangles;
@@ -59,7 +61,7 @@ void ICETools::selectRectangles ( const NICE::Image & panel, NICE::Image & overl
 
 
 void ICETools::selectPoints ( const NICE::Image & panel, NICE::Image & overlay, vector<Vector> & x, int color )
 void ICETools::selectPoints ( const NICE::Image & panel, NICE::Image & overlay, vector<Vector> & x, int color )
 {
 {
-	fthrow("ICETools::selectPoints -- not yet implemented due to old ICE version.");
+	fthrow(Exception, "ICETools::selectPoints -- not yet implemented due to old ICE version.");
 // #ifndef NOVISUAL
 // #ifndef NOVISUAL
 //     vector<CoordT<double> > points;
 //     vector<CoordT<double> > points;
 // 	 //TODO check this!
 // 	 //TODO check this!

+ 3 - 1
features/localfeatures/LFSiftPP.cpp

@@ -13,6 +13,8 @@
 // #endif
 // #endif
 #include "vislearning/features/localfeatures/LFSiftPP.h"
 #include "vislearning/features/localfeatures/LFSiftPP.h"
 
 
+#include "core/basics/Exception.h"
+
 
 
 using namespace std;
 using namespace std;
 
 
@@ -196,7 +198,7 @@ void LFSiftPP::visualizeFeatures ( NICE::Image & mark,
 				 const VVector & positions,
 				 const VVector & positions,
 				 size_t color ) const
 				 size_t color ) const
 {
 {
-	fthrow("LFSiftPP::visualizeFeatures -- not yet implemented due to old ICE version.");
+	fthrow(Exception, "LFSiftPP::visualizeFeatures -- not yet implemented due to old ICE version.");
 // #ifdef NICE_USELIB_ICE
 // #ifdef NICE_USELIB_ICE
 //     ice::Image mark_ice = ice::NewImg ( mark.width(), 
 //     ice::Image mark_ice = ice::NewImg ( mark.width(), 
 // 	mark.height(), 255 );
 // 	mark.height(), 255 );

+ 3 - 1
features/localfeatures/LocalFeatureSift.cpp

@@ -9,6 +9,8 @@
 // #endif
 // #endif
 #include <iostream>
 #include <iostream>
 
 
+#include "core/basics/Exception.h"
+
 #include "vislearning/features/localfeatures/sift.h"
 #include "vislearning/features/localfeatures/sift.h"
 #include "vislearning/features/localfeatures/LocalFeatureSift.h"
 #include "vislearning/features/localfeatures/LocalFeatureSift.h"
 
 
@@ -171,7 +173,7 @@ void LocalFeatureSift::visualizeFeatures ( NICE::Image & mark,
 				 const VVector & positions,
 				 const VVector & positions,
 				 size_t color ) const
 				 size_t color ) const
 {
 {
-	fthrow("LocalFeatureSift::visualizeFeatures -- not yet implemented due to old ICE version.");
+	fthrow(Exception, "LocalFeatureSift::visualizeFeatures -- not yet implemented due to old ICE version.");
 //TODO check this!
 //TODO check this!
 // #ifdef NICE_USELIB_ICE
 // #ifdef NICE_USELIB_ICE
 //     ice::Image mark_ice = ice::NewImg ( mark.width(), 
 //     ice::Image mark_ice = ice::NewImg ( mark.width(),