murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed characters not being properly encoded, fixed images not being properly appended, more fixes

Browse source
This commit is contained in:
TheEssem 2020-09-09 21:36:20 -05:00
parent 0bd8905829
commit 4caec5aefa
12 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
natives/caption.cc
View file

@ -16,7 +16,6 @@ class CaptionWorker : public Napi::AsyncWorker {
list <Image> coalesced;
list <Image> captioned;
list <Image> result;
Blob caption_blob;
readImages(&frames, in_path);
size_t width = frames.front().baseColumns();
@ -39,6 +38,7 @@ class CaptionWorker : public Napi::AsyncWorker {
images.push_back(caption_image);
images.push_back(image);
appendImages(&appended, images.begin(), images.end(), true);
appended.repage();
appended.magick(type);
captioned.push_back(appended);
}

1
natives/caption2.cc
View file

@ -37,6 +37,7 @@ class CaptionTwoWorker : public Napi::AsyncWorker {
images.push_back(image);
images.push_back(caption_image);
appendImages(&appended, images.begin(), images.end(), true);
appended.repage();
appended.magick(type);
captioned.push_back(appended);
}

1
natives/mirror.cc
View file

@ -47,6 +47,7 @@ class MirrorWorker : public Napi::AsyncWorker {
mirrored.push_front(mirror);
}
appendImages(&final, mirrored.begin(), mirrored.end(), vertical);
final.repage();
final.magick(type);
mid.push_back(final);
}

1
natives/motivate.cc
View file

@ -54,6 +54,7 @@ class MotivateWorker : public Napi::AsyncWorker {
to_append.push_back(top);
if (bottom_text != "") to_append.push_back(bottom);
appendImages(&final, to_append.begin(), to_append.end(), true);
final.repage();
final.magick(type);
mid.push_back(final);
}

2
natives/tile.cc
View file

@ -29,10 +29,12 @@ class TileWorker : public Napi::AsyncWorker {
duplicated.push_back(image);
}
appendImages(&appended, duplicated.begin(), duplicated.end());
appended.repage();
for (int i = 0; i < 5; ++i) {
montage.push_back(appended);
}
appendImages(&frame, montage.begin(), montage.end(), true);
frame.repage();
frame.scale(Geometry("800x800>"));
mid.push_back(frame);
}

1
natives/watermark.cc
View file

@ -36,6 +36,7 @@ class WatermarkWorker : public Napi::AsyncWorker {
to_append.push_back(image);
to_append.push_back(watermark);
appendImages(&final, to_append.begin(), to_append.end(), true);
final.repage();
} else if (mc) {
image.backgroundColor("white");
image.extent(Geometry(image.columns(), image.rows() + 15));