scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 13:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Image pattern generator: fixed gradient2

Browse Source 
- "gradient" is prefix of "gradient2" and the first was checked earlier
  thus gradient2 was never selected
- incorrect check for boundaries with min instead of max
This commit is contained in:
Martin Pulec
2021-11-12 09:38:02 +01:00
parent e3db89af46
commit e2bedca34d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/utils/video_pattern_generator.cpp
View File

@@ -83,6 +83,7 @@ using std::default_random_engine;
using std::exception;
using std::for_each;
using std::make_unique;
using std::max;
using std::min;
using std::move;
using std::string;
@@ -286,7 +287,7 @@ class image_pattern_gradient2 : public image_pattern {
private:
const unsigned int val_max;
enum generator_depth fill(int width, int height, unsigned char *data) override {
width = min(width, 2); // avoid division by zero
width = max(width, 2); // avoid division by zero
auto *ptr = reinterpret_cast<uint16_t *>(data);
for (int j = 0; j < height; j += 1) {
for (int i = 0; i < width; i += 1) {
@@ -357,14 +358,6 @@ unique_ptr<image_pattern> image_pattern::create(string const &config) {
if (config == "ebu_bars") {
return make_unique<image_pattern_ebu_smpte_bars<0xFFU, 8>>();
}
if (config.substr(0, "gradient"s.length()) == "gradient") {
uint32_t color = image_pattern_gradient::red;
if (config.substr(0, "gradient="s.length()) == "gradient=") {
auto val = config.substr("gradient="s.length());
color = stol(val, nullptr, 0);
}
return make_unique<image_pattern_gradient>(color);
}
if (config.substr(0, "gradient2"s.length()) == "gradient2") {
if (config.substr(0, "gradient2="s.length()) == "gradient2=") {
auto val = config.substr("gradient2="s.length());
@@ -376,6 +369,15 @@ unique_ptr<image_pattern> image_pattern::create(string const &config) {
}
return make_unique<image_pattern_gradient2>();
}
if (config.substr(0, "gradient"s.length()) == "gradient") {
assert (config.substr(0, "gradient2"s.length()) == "gradient2");
uint32_t color = image_pattern_gradient::red;
if (config.substr(0, "gradient="s.length()) == "gradient=") {
auto val = config.substr("gradient="s.length());
color = stol(val, nullptr, 0);
}
return make_unique<image_pattern_gradient>(color);
}
if (config == "noise") {
return make_unique<image_pattern_noise>();
}