Remove more old definitions from internal.hpp

modules/imgproc/src/color.cpp

@@ -92,6 +92,8 @@
 #include "precomp.hpp"
 #include <limits>
 
+#define  CV_DESCALE(x,n)     (((x) + (1 << ((n)-1))) >> (n))
+
 namespace cv
 {
 

modules/imgproc/src/demosaicing.cpp

@@ -44,6 +44,8 @@
 
 #include <limits>
 
+#define  CV_DESCALE(x,n)     (((x) + (1 << ((n)-1))) >> (n))
+
 namespace cv
 {
 

modules/imgproc/src/distransform.cpp

@@ -46,6 +46,7 @@ namespace cv
 
 static const int DIST_SHIFT = 16;
 static const int INIT_DIST0 = (INT_MAX >> 2);
+#define  CV_FLT_TO_FIX(x,n)  cvRound((x)*(1<<(n)))
 
 static void
 initTopBottom( Mat& temp, int border )

modules/imgproc/src/filter.cpp

@@ -193,7 +193,7 @@ void FilterEngine::init( const Ptr<BaseFilter>& _filter2D,
     wholeSize = Size(-1,-1);
 }
 
-static const int VEC_ALIGN = CV_MALLOC_ALIGN;
+#define VEC_ALIGN CV_MALLOC_ALIGN
 
 int FilterEngine::start(Size _wholeSize, Rect _roi, int _maxBufRows)
 {