Skip to content

Commit 5bf7f09

Browse files
shimatalalek
authored andcommitted
Merge pull request opencv#11035 from shimat:refactoring_decolor
Refactor decolor (opencv#11035) * decolor: modernize deprecated headers (math.h -> cmath) * refactor contrast_preserve.cpp * refactor contrast_preserve.hpp (add static/const) * refactor contrast_preserve.hpp (join assignment and declaration) * refactor contrast_preserve.hpp (format) * refactor test_decolor.cpp (indent) * refactor contrast_preserve.hpp (const) * contrast_preserve.hpp : optimize by minMaxLoc * fix trailing-whitespace * fix warning C4267 on VC++ x64 (conversion from 'size_t' to 'int', possible loss of data) * use cvRound instead of round_num * decrease indentation of test_decolor.cpp * remove pow() to optimize * remove redundant Mat initialization
1 parent 2244f17 commit 5bf7f09

File tree

3 files changed

+117
-205
lines changed

3 files changed

+117
-205
lines changed

modules/photo/src/contrast_preserve.cpp

Lines changed: 33 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
#include "precomp.hpp"
4444
#include "opencv2/photo.hpp"
45-
#include "math.h"
45+
#include <cmath>
4646
#include <vector>
4747
#include <limits>
4848
#include "contrast_preserve.hpp"
@@ -64,119 +64,93 @@ void cv::decolor(InputArray _src, OutputArray _dst, OutputArray _color_boost)
6464
CV_Assert(!I.empty() && (I.channels()==3));
6565

6666
// Parameter Setting
67-
int maxIter = 15;
67+
const int maxIter = 15;
68+
const double tol = .0001;
6869
int iterCount = 0;
69-
double tol = .0001;
7070
double E = 0;
7171
double pre_E = std::numeric_limits<double>::infinity();
7272

73-
Decolor obj;
74-
7573
Mat img;
76-
77-
img = Mat(I.size(),CV_32FC3);
78-
I.convertTo(img,CV_32FC3,1.0/255.0);
74+
I.convertTo(img, CV_32FC3, 1.0/255.0);
7975

8076
// Initialization
81-
obj.init();
77+
Decolor obj;
8278

8379
vector <double> Cg;
8480
vector < vector <double> > polyGrad;
8581
vector <Vec3i> comb;
86-
8782
vector <double> alf;
8883

8984
obj.grad_system(img,polyGrad,Cg,comb);
9085
obj.weak_order(img,alf);
9186

9287
// Solver
93-
Mat Mt = Mat((int)polyGrad.size(),(int)polyGrad[0].size(), CV_32FC1);
88+
Mat Mt = Mat(int(polyGrad.size()),int(polyGrad[0].size()), CV_32FC1);
9489
obj.wei_update_matrix(polyGrad,Cg,Mt);
9590

9691
vector <double> wei;
9792
obj.wei_inti(comb,wei);
9893

9994
//////////////////////////////// main loop starting ////////////////////////////////////////
10095

96+
vector <double> G_pos(alf.size());
97+
vector <double> G_neg(alf.size());
98+
vector <double> EXPsum(G_pos.size());
99+
vector <double> EXPterm(G_pos.size());
100+
vector <double> temp(polyGrad[0].size());
101+
vector <double> temp1(polyGrad[0].size());
102+
vector <double> temp2(EXPsum.size());
103+
vector <double> wei1(polyGrad.size());
104+
101105
while(sqrt(pow(E-pre_E,2)) > tol)
102106
{
103107
iterCount +=1;
104108
pre_E = E;
105109

106-
vector <double> G_pos(alf.size());
107-
vector <double> G_neg(alf.size());
108-
109-
vector <double> temp(polyGrad[0].size());
110-
vector <double> temp1(polyGrad[0].size());
111-
112-
double val = 0.0;
113-
for(unsigned int i=0;i< polyGrad[0].size();i++)
110+
for(size_t i=0; i<polyGrad[0].size(); i++)
114111
{
115-
val = 0.0;
116-
for(unsigned int j =0;j<polyGrad.size();j++)
112+
double val = 0.0;
113+
for(size_t j=0; j<polyGrad.size(); j++)
117114
val = val + (polyGrad[j][i] * wei[j]);
118115
temp[i] = val - Cg[i];
119116
temp1[i] = val + Cg[i];
120117
}
121118

122-
double pos = 0.0;
123-
double neg = 0.0;
124-
for(unsigned int i =0;i<alf.size();i++)
119+
for(size_t i=0; i<alf.size(); i++)
125120
{
126-
pos = ((1 + alf[i])/2) * exp((-1.0 * 0.5 * pow(temp[i],2))/pow(obj.sigma,2));
127-
neg = ((1 - alf[i])/2) * exp((-1.0 * 0.5 * pow(temp1[i],2))/pow(obj.sigma,2));
121+
const double sqSigma = obj.sigma * obj.sigma;
122+
const double pos = ((1 + alf[i])/2) * exp(-1.0 * 0.5 * (temp[i] * temp[i]) / sqSigma);
123+
const double neg = ((1 - alf[i])/2) * exp(-1.0 * 0.5 * (temp1[i] * temp1[i]) / sqSigma);
128124
G_pos[i] = pos;
129125
G_neg[i] = neg;
130126
}
131127

132-
vector <double> EXPsum(G_pos.size());
133-
vector <double> EXPterm(G_pos.size());
134-
135-
for(unsigned int i = 0;i<G_pos.size();i++)
128+
for(size_t i=0; i<G_pos.size(); i++)
136129
EXPsum[i] = G_pos[i]+G_neg[i];
137130

138-
vector <double> temp2(EXPsum.size());
139-
140-
for(unsigned int i=0;i<EXPsum.size();i++)
141-
{
142-
if(EXPsum[i] == 0)
143-
temp2[i] = 1.0;
144-
else
145-
temp2[i] = 0.0;
146-
}
131+
for(size_t i=0; i<EXPsum.size(); i++)
132+
temp2[i] = (EXPsum[i] == 0) ? 1.0 : 0.0;
147133

148-
for(unsigned int i =0; i < G_pos.size();i++)
149-
EXPterm[i] = ((G_pos[i] - G_neg[i])/(EXPsum[i] + temp2[i]));
134+
for(size_t i=0; i<G_pos.size(); i++)
135+
EXPterm[i] = (G_pos[i] - G_neg[i])/(EXPsum[i] + temp2[i]);
150136

151-
double val1 = 0.0;
152-
vector <double> wei1(polyGrad.size());
153-
154-
for(unsigned int i=0;i< polyGrad.size();i++)
137+
for(int i=0; i<int(polyGrad.size()); i++)
155138
{
156-
val1 = 0.0;
157-
for(unsigned int j =0;j<polyGrad[0].size();j++)
139+
double val1 = 0.0;
140+
for(int j=0; j<int(polyGrad[0].size()); j++)
158141
{
159142
val1 = val1 + (Mt.at<float>(i,j) * EXPterm[j]);
160143
}
161144
wei1[i] = val1;
162145
}
163146

164-
for(unsigned int i =0;i<wei.size();i++)
147+
for(size_t i=0; i<wei.size(); i++)
165148
wei[i] = wei1[i];
166149

167-
E = obj.energyCalcu(Cg,polyGrad,wei);
150+
E = obj.energyCalcu(Cg, polyGrad, wei);
168151

169152
if(iterCount > maxIter)
170153
break;
171-
172-
G_pos.clear();
173-
G_neg.clear();
174-
temp.clear();
175-
temp1.clear();
176-
EXPsum.clear();
177-
EXPterm.clear();
178-
temp2.clear();
179-
wei1.clear();
180154
}
181155

182156
Mat Gray = Mat::zeros(img.size(),CV_32FC1);
@@ -186,9 +160,7 @@ void cv::decolor(InputArray _src, OutputArray _dst, OutputArray _color_boost)
186160

187161
/////////////////////////////////// Contrast Boosting /////////////////////////////////
188162

189-
Mat lab = Mat(img.size(),CV_8UC3);
190-
Mat color = Mat(img.size(),CV_8UC3);
191-
163+
Mat lab;
192164
cvtColor(I,lab,COLOR_BGR2Lab);
193165

194166
vector <Mat> lab_channel;

0 commit comments

Comments
 (0)