From 3b239561c66d029467e616b9f24da0a7131ff300 Mon Sep 17 00:00:00 2001 From: siddharth Date: Tue, 1 Oct 2013 18:35:53 +0530 Subject: [PATCH] Changed STL in contrast_preserve file --- modules/photo/src/contrast_preserve.cpp | 6 ++--- modules/photo/src/contrast_preserve.hpp | 42 ++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/modules/photo/src/contrast_preserve.cpp b/modules/photo/src/contrast_preserve.cpp index 5691219..103322a 100644 --- a/modules/photo/src/contrast_preserve.cpp +++ b/modules/photo/src/contrast_preserve.cpp @@ -55,7 +55,7 @@ double norm_m(double); double norm_m(double E) { - return sqrt(pow(E,2)); + return sqroot(power(E,2)); } void cv::decolor(InputArray _src, OutputArray _dst, OutputArray _color_boost) @@ -136,8 +136,8 @@ void cv::decolor(InputArray _src, OutputArray _dst, OutputArray _color_boost) double ans1 = 0.0; for(unsigned int i =0;i &Cg, vector < vector > &polyGrad, vector &wei) @@ -99,7 +129,7 @@ double Decolor::energyCalcu(vector &Cg, vector < vector > &pol } for(unsigned int i=0;i &Cg) double res =0.0; for(unsigned int i=0;i > &polyGrad, for(int i = 0;i(i,j)= - pow(red.at(i,j),r)*pow(green.at(i,j),g)* - pow(blue.at(i,j),b); + power(red.at(i,j),r)*power(green.at(i,j),g)* + power(blue.at(i,j),b); vector curGrad; gradvector(curIm,curGrad); add_to_vector_poly(polyGrad,curGrad); @@ -485,8 +515,8 @@ void Decolor::grayImContruct(vector &wei, Mat img, Mat &Gray) for(int i = 0;i(i,j)=Gray.at(i,j) + - (float) wei[kk]*pow(red.at(i,j),r)*pow(green.at(i,j),g)* - pow(blue.at(i,j),b); + (float) wei[kk]*power(red.at(i,j),r)*power(green.at(i,j),g)* + power(blue.at(i,j),b); kk=kk+1; } -- 2.7.4