tastytea
/
identiconpp
1
0
Fork 0
Code Issues Pull Requests Releases 15 Wiki Activity

Bugfix: Background color was always transparent with older imagemagick
the build was successful Details 

versions
This commit is contained in:
tastytea 2019-01-02 06:00:51 +01:00
parent b0c0e0ef09
commit e568a64129
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.2) cmake_minimum_required (VERSION 3.2)
project(identiconpp project(identiconpp
VERSION 0.3.5 VERSION 0.3.6
LANGUAGES CXX LANGUAGES CXX
) )

8
src/identiconpp.cpp
View File

@ -78,10 +78,12 @@ Magick::Image Identiconpp::generate(const string &digest, const uint16_t width)
} }
} }
img.backgroundColor(Magick::Color('#' + _background));
img.scale(Magick::Geometry(imgwidth, imgheight)); img.scale(Magick::Geometry(imgwidth, imgheight));
img.borderColor(Magick::Color('#' + _background)); // The CompositeOperator prevents the background color to be affected by the
img.border(Magick::Geometry(_padding[0], _padding[1])); // frame color. See https://github.com/ImageMagick/ImageMagick/issues/647
img.compose(Magick::CompositeOperator::CopyCompositeOp);
img.matteColor(Magick::Color('#' + _background));
img.frame(Magick::Geometry(_padding[0], _padding[1]));
return img; return img;
} }

2
src/ltr_asymmetric.cpp
View File

@ -20,7 +20,7 @@
Magick::Image Identiconpp::generate_ltr_asymmetric(const string &digest) Magick::Image Identiconpp::generate_ltr_asymmetric(const string &digest)
{ {
Magick::Image img(Magick::Geometry(_columns, _rows), Magick::Image img(Magick::Geometry(_columns, _rows),
Magick::Color("#00000000")); Magick::Color('#' + _background));
Magick::Color dotcolor = get_color(_columns * _rows + 1, digest); Magick::Color dotcolor = get_color(_columns * _rows + 1, digest);
for (uint8_t row = 0; row < _rows; ++row) for (uint8_t row = 0; row < _rows; ++row)

2
src/ltr_symmetric.cpp
View File

@ -20,7 +20,7 @@
Magick::Image Identiconpp::generate_ltr_symmetric(const string &digest) Magick::Image Identiconpp::generate_ltr_symmetric(const string &digest)
{ {
Magick::Image img(Magick::Geometry(_columns, _rows), Magick::Image img(Magick::Geometry(_columns, _rows),
Magick::Color("#00000000")); Magick::Color('#' + _background));
uint8_t used_columns = _columns / 2 + _columns % 2; uint8_t used_columns = _columns / 2 + _columns % 2;
Magick::Color dotcolor = get_color(used_columns * _rows + 1, digest); Magick::Color dotcolor = get_color(used_columns * _rows + 1, digest);

2
src/sigil.cpp
View File

@ -20,7 +20,7 @@
Magick::Image Identiconpp::generate_sigil(const string &digest) Magick::Image Identiconpp::generate_sigil(const string &digest)
{ {
Magick::Image img(Magick::Geometry(_columns, _rows), Magick::Image img(Magick::Geometry(_columns, _rows),
Magick::Color("#00000000")); Magick::Color('#' + _background));
Magick::Color dotcolor = get_color(0, digest); Magick::Color dotcolor = get_color(0, digest);
uint8_t used_columns = _columns / 2 + _columns % 2; uint8_t used_columns = _columns / 2 + _columns % 2;