mirror of https://github.com/davisking/dlib.git
Modernize random_color_transform (#2665)
* Modernize random_color_transform * Remove temporary variables * formatting
This commit is contained in:
parent
e50987df4d
commit
19507d4a00
|
@ -24,13 +24,13 @@ namespace dlib
|
|||
)
|
||||
{
|
||||
// pick a random gamma correction factor.
|
||||
double gamma = std::max(0.0, 1 + gamma_magnitude*(rnd.get_random_double()-0.5));
|
||||
const double gamma = std::max(0.0, 1 + gamma_magnitude*(rnd.get_random_double() - 0.5));
|
||||
|
||||
// pick a random color balancing scheme.
|
||||
double red_scale = 1 - rnd.get_random_double() * color_magnitude;
|
||||
double green_scale = 1 - rnd.get_random_double() * color_magnitude;
|
||||
double blue_scale = 1 - rnd.get_random_double() * color_magnitude;
|
||||
const double m = 255*std::max(std::max(red_scale,green_scale),blue_scale);
|
||||
const double m = 255 * std::max({red_scale, green_scale, blue_scale});
|
||||
red_scale /= m;
|
||||
green_scale /= m;
|
||||
blue_scale /= m;
|
||||
|
@ -41,26 +41,23 @@ namespace dlib
|
|||
unsigned long i = 0;
|
||||
for (int k = 0; k < 256; ++k)
|
||||
{
|
||||
double v = 255*std::pow(k*red_scale, gamma);
|
||||
table[i++] = (unsigned char)(v + 0.5);
|
||||
table[i++] = static_cast<unsigned char>(255 * std::pow(k * red_scale, gamma) + 0.5);
|
||||
}
|
||||
for (int k = 0; k < 256; ++k)
|
||||
{
|
||||
double v = 255*std::pow(k*green_scale, gamma);
|
||||
table[i++] = (unsigned char)(v + 0.5);
|
||||
table[i++] = static_cast<unsigned char>(255 * std::pow(k * green_scale, gamma) + 0.5);
|
||||
}
|
||||
for (int k = 0; k < 256; ++k)
|
||||
{
|
||||
double v = 255*std::pow(k*blue_scale, gamma);
|
||||
table[i++] = (unsigned char)(v + 0.5);
|
||||
table[i++] = static_cast<unsigned char>(255 * std::pow(k * blue_scale, gamma) + 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
rgb_pixel operator()(rgb_pixel p) const
|
||||
{
|
||||
p.red = table[(unsigned int)p.red];
|
||||
p.green = table[(unsigned int)p.green+256];
|
||||
p.blue = table[(unsigned int)p.blue+512];
|
||||
p.red = table[static_cast<unsigned int>(p.red)];
|
||||
p.green = table[static_cast<unsigned int>(p.green + 256)];
|
||||
p.blue = table[static_cast<unsigned int>(p.blue + 512)];
|
||||
return p;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue