mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-01 02:18:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Local decolor pipeline optimization.

Browse Source
This commit is contained in:
Alexander Smorkalov 2025-03-11 10:16:01 +03:00
parent e813326c17
commit e342d2f339
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/photo/src/contrast_preserve.hpp
View File

@ -113,14 +113,16 @@ Decolor::Decolor()
sigma = 0.02f; sigma = 0.02f;
} }
vector<double> Decolor::product(const vector <Vec3i> &comb, const double initRGB[3]) vector<double> Decolor::product(const vector<Vec3i> &comb, const double initRGB[3])
{ {
vector <double> res(comb.size()); vector <double> res(comb.size());
for (size_t i=0;i<comb.size();i++) for (size_t i=0;i<comb.size();i++)
{ {
double dp = 0.0; double dp = 0.0;
for(int j=0;j<3;j++) for(int j=0;j<3;j++)
{
dp = dp + (comb[i][j] * initRGB[j]); dp = dp + (comb[i][j] * initRGB[j]);
}
res[i] = dp; res[i] = dp;
} }
return res; return res;
@ -149,22 +151,20 @@ void Decolor::gradvector(const Mat &img, vector <double> &grad) const
singleChannelGradx(img,dest); singleChannelGradx(img,dest);
singleChannelGrady(img,dest1); singleChannelGrady(img,dest1);
Mat d_trans=dest.t(); // the function uses transposed dest and dest1 here and bellow
Mat d1_trans=dest1.t(); const int height = dest.size().width;
const int width = dest.size().height;
const int height = d_trans.size().height;
const int width = d_trans.size().width;
grad.resize(width * height * 2); grad.resize(width * height * 2);
for(int i=0;i<height;i++) for(int i=0;i<height;i++)
for(int j=0;j<width;j++) for(int j=0;j<width;j++)
grad[i*width + j] = d_trans.at<float>(i, j); grad[i*width + j] = dest.at<float>(j, i);
const int offset = width * height; const int offset = width * height;
for(int i=0;i<height;i++) for(int i=0;i<height;i++)
for(int j=0;j<width;j++) for(int j=0;j<width;j++)
grad[offset + i * width + j] = d1_trans.at<float>(i, j); grad[offset + i * width + j] = dest1.at<float>(j, i);
} }
void Decolor::colorGrad(const Mat &img, vector <double> &Cg) const void Decolor::colorGrad(const Mat &img, vector <double> &Cg) const
@ -277,7 +277,9 @@ void Decolor::grad_system(const Mat &im, vector < vector < double > > &polyGrad,
int idx = 0, idx1 = 0; int idx = 0, idx1 = 0;
for(int r=0 ;r <=order; r++) for(int r=0 ;r <=order; r++)
{
for(int g=0; g<=order;g++) for(int g=0; g<=order;g++)
{
for(int b =0; b <=order;b++) for(int b =0; b <=order;b++)
{ {
if((r+g+b)<=order && (r+g+b) > 0) if((r+g+b)<=order && (r+g+b) > 0)
@ -293,6 +295,8 @@ void Decolor::grad_system(const Mat &im, vector < vector < double > > &polyGrad,
add_to_vector_poly(polyGrad,curGrad,idx1); add_to_vector_poly(polyGrad,curGrad,idx1);
} }
} }
}
}
} }
void Decolor::wei_update_matrix(const vector < vector <double> > &poly, const vector <double> &Cg, Mat &X) void Decolor::wei_update_matrix(const vector < vector <double> > &poly, const vector <double> &Cg, Mat &X)
@ -305,7 +309,6 @@ void Decolor::wei_update_matrix(const vector < vector <double> > &poly, const ve
for (int j = 0; j < size0;j++) for (int j = 0; j < size0;j++)
P.at<float>(i,j) = static_cast<float>(poly[i][j]); P.at<float>(i,j) = static_cast<float>(poly[i][j]);
const Mat P_trans = P.t();
Mat B = Mat(size, size0, CV_32FC1); Mat B = Mat(size, size0, CV_32FC1);
for(int i =0;i < size;i++) for(int i =0;i < size;i++)
{ {
@ -313,7 +316,8 @@ void Decolor::wei_update_matrix(const vector < vector <double> > &poly, const ve
B.at<float>(i,j) = static_cast<float>(poly[i][j] * Cg[j]); B.at<float>(i,j) = static_cast<float>(poly[i][j] * Cg[j]);
} }
Mat A = P*P_trans; Mat A;
mulTransposed(P, A, false);
solve(A, B, X, DECOMP_NORMAL); solve(A, B, X, DECOMP_NORMAL);
} }
@ -352,8 +356,11 @@ void Decolor::grayImContruct(vector <double> &wei, const Mat &img, Mat &Gray) co
int kk =0; int kk =0;
for(int r =0;r<=order;r++) for(int r =0;r<=order;r++)
{
for(int g=0;g<=order;g++) for(int g=0;g<=order;g++)
{
for(int b=0;b<=order;b++) for(int b=0;b<=order;b++)
{
if((r + g + b) <=order && (r+g+b) > 0) if((r + g + b) <=order && (r+g+b) > 0)
{ {
for(int i = 0;i<h;i++) for(int i = 0;i<h;i++)
@ -364,6 +371,9 @@ void Decolor::grayImContruct(vector <double> &wei, const Mat &img, Mat &Gray) co
kk=kk+1; kk=kk+1;
} }
}
}
}
double minval, maxval; double minval, maxval;
minMaxLoc(Gray, &minval, &maxval); minMaxLoc(Gray, &minval, &maxval);