浏览代码

moved Filter.h to DeprecatedFilter.h after resolving all dependencies

Sven Sickert 8 年之前
父节点
当前提交
a15ea1263a
共有 4 个文件被更改,包括 24 次插入17 次删除
  1. 3 3
      core/image/DeprecatedConverter.h
  2. 4 4
      core/image/DeprecatedFilter.cpp
  3. 17 10
      core/image/DeprecatedFilter.h
  4. 0 0
      core/image/DeprecatedFilter.tcc

+ 3 - 3
core/image/DeprecatedConverter.h

@@ -7,13 +7,13 @@
  * @file DeprecatedConverter.h
  * DEPRECATED
  * - Do NOT use this class in new code
- * - use the new functions in Convert.h, Filter.h, etc.
- * @deprecated Use new functions in Convert.h, Filter.h, ...
+ * - use the new functions in Convert.h, FilterT.h, etc.
+ * @deprecated Use new functions in Convert.h, FilterT.h, ...
  */
 #ifndef LIMUN_CONVERTER_H
 #define LIMUN_CONVERTER_H
 
-#include <core/basics/deprecated.h>
+#include "core/basics/deprecated.h"
 
 #include "core/image/ippwrapper.h"
 #include "core/image/GrayColorImageCommonImplementation.h"

+ 4 - 4
core/image/Filter.cpp → core/image/DeprecatedFilter.cpp

@@ -1,12 +1,12 @@
-#include "core/image/Filter.h"
+#include "core/image/DeprecatedFilter.h"
+#include "core/basics/numerictools.h"
+
 #include <math.h>
 #include <limits>
-#include <core/basics/numerictools.h>
-
 #include <iostream>
 using namespace std;
 
-#ifdef NICE_BOOST_FOUND 
+#ifdef NICE_BOOST_FOUND
 #include <boost/math/special_functions/round.hpp>
 #endif
 

+ 17 - 10
core/image/Filter.h → core/image/DeprecatedFilter.h

@@ -3,23 +3,30 @@
  *  - libimage - An image library
  * See file License for license information.
  */
+/**
+ * @file DeprecatedFilter.h
+ * DEPRECATED
+ * - Do NOT use this class in new code
+ * - use the new functions in FilterT.h
+ * @deprecated Use new functions in FilterT.h
+ */
 #ifndef LIMUN_FILTER_H
 #define LIMUN_FILTER_H
 
 
-#include <core/image/ippwrapper.h>
-#include <core/image/ImageOperators.h>
+#include "core/image/ippwrapper.h"
+#include "core/image/ImageOperators.h"
 
-#include <core/vector/VectorT.h>
-#include <core/vector/MatrixT.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
-#include <core/basics/RoundToNearest.h>
+#include "core/basics/RoundToNearest.h"
 
-#include <core/image/ImageT.h>
-#include <core/image/ColorImageT.h>
-#include <core/image/Buffer.h>
+#include "core/image/ImageT.h"
+#include "core/image/ColorImageT.h"
+#include "core/image/Buffer.h"
 
-#pragma message NICE_WARNING("Filter.h is obsolete. Please use FilterT.h instead and adapt your calls and implement the filter if necessary :)")
+//#pragma message NICE_WARNING("Filter.h is obsolete. Please use FilterT.h instead and adapt your calls and implement the filter if necessary :)")
 
 namespace NICE {
 /**
@@ -471,7 +478,7 @@ ColorImageT<P>* wiener ( const ColorImageT<P>& src, int anchorx = -1, int anchor
 } // namespace
 
 //#ifdef __GNUC__
-#include <core/image/Filter.tcc>
+#include "core/image/DeprecatedFilter.tcc"
 //#endif
 
 #endif //LIMUN_FILTER_H

+ 0 - 0
core/image/Filter.tcc → core/image/DeprecatedFilter.tcc