From 3d853896384e6a7b28d801e0e214429fa4307c50 Mon Sep 17 00:00:00 2001 From: TheEssem Date: Fri, 12 Feb 2021 18:22:36 -0600 Subject: [PATCH] Image commands now use optimizeTransparency instead of optimizeImageLayers --- natives/blur.cc | 7 +++---- natives/blurple.cc | 7 +++---- natives/caption.cc | 4 ++-- natives/caption2.cc | 5 ++--- natives/circle.cc | 7 +++---- natives/crop.cc | 7 +++---- natives/explode.cc | 7 +++---- natives/flag.cc | 7 +++---- natives/flip.cc | 7 +++---- natives/gamexplain.cc | 7 +++---- natives/globe.cc | 9 ++++----- natives/invert.cc | 7 +++---- natives/leak.cc | 1 + natives/magik.cc | 7 +++---- natives/meme.cc | 1 + natives/mirror.cc | 5 ++--- natives/misc.cc | 7 +++---- natives/motivate.cc | 5 ++--- natives/resize.cc | 7 +++---- natives/reverse.cc | 7 +++---- natives/scott.cc | 5 ++--- natives/spin.cc | 9 ++++----- natives/tile.cc | 5 ++--- natives/trump.cc | 5 ++--- natives/wall.cc | 7 +++---- natives/watermark.cc | 5 ++--- natives/wdt.cc | 5 ++--- 27 files changed, 70 insertions(+), 92 deletions(-) diff --git a/natives/blur.cc b/natives/blur.cc index 3401377..8f2fef9 100644 --- a/natives/blur.cc +++ b/natives/blur.cc @@ -14,7 +14,6 @@ class BlurWorker : public Napi::AsyncWorker { void Execute() { list frames; list coalesced; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -26,9 +25,9 @@ class BlurWorker : public Napi::AsyncWorker { for_each(coalesced.begin(), coalesced.end(), magickImage(type)); - optimizeImageLayers(&result, coalesced.begin(), coalesced.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(coalesced.begin(), coalesced.end()); + if (delay != 0) for_each(coalesced.begin(), coalesced.end(), animationDelayImage(delay)); + writeImages(coalesced.begin(), coalesced.end(), &blob); } void OnOK() { diff --git a/natives/blurple.cc b/natives/blurple.cc index 61e98b8..9cef84e 100644 --- a/natives/blurple.cc +++ b/natives/blurple.cc @@ -15,7 +15,6 @@ class BlurpleWorker : public Napi::AsyncWorker { list frames; list coalesced; list blurpled; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -23,12 +22,12 @@ class BlurpleWorker : public Napi::AsyncWorker { image.threshold(49151.25); image.levelColors("#7289DA", "white"); image.magick(type); + image.animationDelay(delay == 0 ? image.animationDelay() : delay); blurpled.push_back(image); } - optimizeImageLayers(&result, blurpled.begin(), blurpled.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(blurpled.begin(), blurpled.end()); + writeImages(blurpled.begin(), blurpled.end(), &blob); } void OnOK() { diff --git a/natives/caption.cc b/natives/caption.cc index 0e7928c..b674b44 100644 --- a/natives/caption.cc +++ b/natives/caption.cc @@ -44,8 +44,8 @@ class CaptionWorker : public Napi::AsyncWorker { captioned.push_back(appended); } - optimizeImageLayers(&result, captioned.begin(), captioned.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(captioned.begin(), captioned.end()); + writeImages(captioned.begin(), captioned.end(), &blob); } void OnOK() { diff --git a/natives/caption2.cc b/natives/caption2.cc index e0135c3..7d19ce7 100644 --- a/natives/caption2.cc +++ b/natives/caption2.cc @@ -15,7 +15,6 @@ class CaptionTwoWorker : public Napi::AsyncWorker { list frames; list coalesced; list captioned; - list result; Blob caption_blob; readImages(&frames, in_path); @@ -43,8 +42,8 @@ class CaptionTwoWorker : public Napi::AsyncWorker { captioned.push_back(appended); } - optimizeImageLayers(&result, captioned.begin(), captioned.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(captioned.begin(), captioned.end()); + writeImages(captioned.begin(), captioned.end(), &blob); } void OnOK() { diff --git a/natives/circle.cc b/natives/circle.cc index fdb2d88..cef31af 100644 --- a/natives/circle.cc +++ b/natives/circle.cc @@ -15,7 +15,6 @@ class CircleWorker : public Napi::AsyncWorker { list frames; list coalesced; list blurred; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -25,9 +24,9 @@ class CircleWorker : public Napi::AsyncWorker { blurred.push_back(image); } - optimizeImageLayers(&result, blurred.begin(), blurred.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(blurred.begin(), blurred.end()); + if (delay != 0) for_each(blurred.begin(), blurred.end(), animationDelayImage(delay)); + writeImages(blurred.begin(), blurred.end(), &blob); } void OnOK() { diff --git a/natives/crop.cc b/natives/crop.cc index 7ee0085..1e4b840 100644 --- a/natives/crop.cc +++ b/natives/crop.cc @@ -15,7 +15,6 @@ class CropWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -26,9 +25,9 @@ class CropWorker : public Napi::AsyncWorker { mid.push_back(image); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/explode.cc b/natives/explode.cc index 6ff19c5..17caaed 100644 --- a/natives/explode.cc +++ b/natives/explode.cc @@ -15,7 +15,6 @@ class ExplodeWorker : public Napi::AsyncWorker { list frames; list coalesced; list blurred; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -25,9 +24,9 @@ class ExplodeWorker : public Napi::AsyncWorker { blurred.push_back(image); } - optimizeImageLayers(&result, blurred.begin(), blurred.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(blurred.begin(), blurred.end()); + if (delay != 0) for_each(blurred.begin(), blurred.end(), animationDelayImage(delay)); + writeImages(blurred.begin(), blurred.end(), &blob); } void OnOK() { diff --git a/natives/flag.cc b/natives/flag.cc index d34337c..3ffb89f 100644 --- a/natives/flag.cc +++ b/natives/flag.cc @@ -15,7 +15,6 @@ class FlagWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image watermark; readImages(&frames, in_path); watermark.read(overlay_path); @@ -31,9 +30,9 @@ class FlagWorker : public Napi::AsyncWorker { mid.push_back(image); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/flip.cc b/natives/flip.cc index 71c1376..fc1d664 100644 --- a/natives/flip.cc +++ b/natives/flip.cc @@ -15,7 +15,6 @@ class FlipWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -25,9 +24,9 @@ class FlipWorker : public Napi::AsyncWorker { mid.push_back(image); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/gamexplain.cc b/natives/gamexplain.cc index 9ada8c3..1473493 100644 --- a/natives/gamexplain.cc +++ b/natives/gamexplain.cc @@ -15,7 +15,6 @@ class GamexplainWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image watermark; readImages(&frames, in_path); watermark.read("./assets/images/gamexplain.png"); @@ -30,9 +29,9 @@ class GamexplainWorker : public Napi::AsyncWorker { mid.push_back(image); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/globe.cc b/natives/globe.cc index a2de5c5..3ca2daf 100644 --- a/natives/globe.cc +++ b/natives/globe.cc @@ -15,7 +15,6 @@ class GlobeWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image distort; Image overlay; readImages(&frames, in_path); @@ -43,13 +42,13 @@ class GlobeWorker : public Napi::AsyncWorker { i++; } - optimizeImageLayers(&result, mid.begin(), mid.end()); + optimizeTransparency(mid.begin(), mid.end()); if (delay != 0) { - for_each(result.begin(), result.end(), animationDelayImage(delay)); + for_each(mid.begin(), mid.end(), animationDelayImage(delay)); } else if (type != "GIF") { - for_each(result.begin(), result.end(), animationDelayImage(5)); + for_each(mid.begin(), mid.end(), animationDelayImage(5)); } - writeImages(result.begin(), result.end(), &blob); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/invert.cc b/natives/invert.cc index 5db83f8..ac13c01 100644 --- a/natives/invert.cc +++ b/natives/invert.cc @@ -15,7 +15,6 @@ class InvertWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -27,9 +26,9 @@ class InvertWorker : public Napi::AsyncWorker { // Magick::ChannelType(Magick::CompositeChannels ^ Magick::AlphaChannel) for_each(mid.begin(), mid.end(), magickImage(type)); - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/leak.cc b/natives/leak.cc index b566e54..abbccf7 100644 --- a/natives/leak.cc +++ b/natives/leak.cc @@ -30,6 +30,7 @@ class LeakWorker : public Napi::AsyncWorker { mid.push_back(image); } + optimizeTransparency(mid.begin(), mid.end()); if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); writeImages(mid.begin(), mid.end(), &blob); } diff --git a/natives/magik.cc b/natives/magik.cc index a6d4d61..a0254c2 100644 --- a/natives/magik.cc +++ b/natives/magik.cc @@ -15,7 +15,6 @@ class MagikWorker : public Napi::AsyncWorker { list frames; list coalesced; list blurred; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -27,9 +26,9 @@ class MagikWorker : public Napi::AsyncWorker { blurred.push_back(image); } - optimizeImageLayers(&result, blurred.begin(), blurred.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(blurred.begin(), blurred.end()); + if (delay != 0) for_each(blurred.begin(), blurred.end(), animationDelayImage(delay)); + writeImages(blurred.begin(), blurred.end(), &blob); } void OnOK() { diff --git a/natives/meme.cc b/natives/meme.cc index 1693b73..6d7ee16 100644 --- a/natives/meme.cc +++ b/natives/meme.cc @@ -56,6 +56,7 @@ class MemeWorker : public Napi::AsyncWorker { mid.push_back(image); } + optimizeTransparency(mid.begin(), mid.end()); if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); writeImages(mid.begin(), mid.end(), &blob); } diff --git a/natives/mirror.cc b/natives/mirror.cc index be6b36e..c0c1b67 100644 --- a/natives/mirror.cc +++ b/natives/mirror.cc @@ -15,7 +15,6 @@ class MirrorWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; MagickCore::GravityType gravity; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -53,8 +52,8 @@ class MirrorWorker : public Napi::AsyncWorker { mid.push_back(final); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/misc.cc b/natives/misc.cc index 1df1ff7..d5fd72f 100644 --- a/natives/misc.cc +++ b/natives/misc.cc @@ -15,7 +15,6 @@ class SwirlWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -25,9 +24,9 @@ class SwirlWorker : public Napi::AsyncWorker { mid.push_back(image); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/motivate.cc b/natives/motivate.cc index a8f30f6..4c779c4 100644 --- a/natives/motivate.cc +++ b/natives/motivate.cc @@ -15,7 +15,6 @@ class MotivateWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image top; Image bottom; readImages(&frames, in_path); @@ -60,8 +59,8 @@ class MotivateWorker : public Napi::AsyncWorker { mid.push_back(final); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/resize.cc b/natives/resize.cc index dbd7fef..09b34d6 100644 --- a/natives/resize.cc +++ b/natives/resize.cc @@ -15,7 +15,6 @@ class ResizeWorker : public Napi::AsyncWorker { list frames; list coalesced; list blurred; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -32,9 +31,9 @@ class ResizeWorker : public Napi::AsyncWorker { blurred.push_back(image); } - optimizeImageLayers(&result, blurred.begin(), blurred.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(blurred.begin(), blurred.end()); + if (delay != 0) for_each(blurred.begin(), blurred.end(), animationDelayImage(delay)); + writeImages(blurred.begin(), blurred.end(), &blob); } void OnOK() { diff --git a/natives/reverse.cc b/natives/reverse.cc index 9819083..ca57d3b 100644 --- a/natives/reverse.cc +++ b/natives/reverse.cc @@ -14,7 +14,6 @@ class ReverseWorker : public Napi::AsyncWorker { void Execute() { list frames; list coalesced; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -28,9 +27,9 @@ class ReverseWorker : public Napi::AsyncWorker { for_each(coalesced.begin(), coalesced.end(), magickImage("GIF")); - optimizeImageLayers(&result, coalesced.begin(), coalesced.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(coalesced.begin(), coalesced.end()); + if (delay != 0) for_each(coalesced.begin(), coalesced.end(), animationDelayImage(delay)); + writeImages(coalesced.begin(), coalesced.end(), &blob); } void OnOK() { diff --git a/natives/scott.cc b/natives/scott.cc index f102881..9f68d50 100644 --- a/natives/scott.cc +++ b/natives/scott.cc @@ -15,7 +15,6 @@ class ScottWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image watermark; readImages(&frames, in_path); watermark.read("./assets/images/scott.png"); @@ -35,8 +34,8 @@ class ScottWorker : public Napi::AsyncWorker { mid.push_back(watermark_new); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/spin.cc b/natives/spin.cc index 29c4e64..4df5d11 100644 --- a/natives/spin.cc +++ b/natives/spin.cc @@ -15,7 +15,6 @@ class SpinWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -37,13 +36,13 @@ class SpinWorker : public Napi::AsyncWorker { i++; } - optimizeImageLayers(&result, mid.begin(), mid.end()); + optimizeTransparency(mid.begin(), mid.end()); if (delay != 0) { - for_each(result.begin(), result.end(), animationDelayImage(delay)); + for_each(mid.begin(), mid.end(), animationDelayImage(delay)); } else if (type != "GIF") { - for_each(result.begin(), result.end(), animationDelayImage(5)); + for_each(mid.begin(), mid.end(), animationDelayImage(5)); } - writeImages(result.begin(), result.end(), &blob); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/tile.cc b/natives/tile.cc index 710a5ea..9cae75a 100644 --- a/natives/tile.cc +++ b/natives/tile.cc @@ -15,7 +15,6 @@ class TileWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -40,8 +39,8 @@ class TileWorker : public Napi::AsyncWorker { mid.push_back(frame); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/trump.cc b/natives/trump.cc index b21d0f2..7a7dd4c 100644 --- a/natives/trump.cc +++ b/natives/trump.cc @@ -15,7 +15,6 @@ class TrumpWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image watermark; readImages(&frames, in_path); watermark.read("./assets/images/trump.png"); @@ -35,8 +34,8 @@ class TrumpWorker : public Napi::AsyncWorker { mid.push_back(watermark_new); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/wall.cc b/natives/wall.cc index 37449a5..ab8c82f 100644 --- a/natives/wall.cc +++ b/natives/wall.cc @@ -15,7 +15,6 @@ class WallWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; readImages(&frames, in_path); coalesceImages(&coalesced, frames.begin(), frames.end()); @@ -32,9 +31,9 @@ class WallWorker : public Napi::AsyncWorker { mid.push_back(image); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - if (delay != 0) for_each(result.begin(), result.end(), animationDelayImage(delay)); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + if (delay != 0) for_each(mid.begin(), mid.end(), animationDelayImage(delay)); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/watermark.cc b/natives/watermark.cc index 88e7526..b3f2d88 100644 --- a/natives/watermark.cc +++ b/natives/watermark.cc @@ -16,7 +16,6 @@ class WatermarkWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image watermark; readImages(&frames, in_path); watermark.read(water_path); @@ -51,8 +50,8 @@ class WatermarkWorker : public Napi::AsyncWorker { mid.push_back(final); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() { diff --git a/natives/wdt.cc b/natives/wdt.cc index b30b6c9..256b3c4 100644 --- a/natives/wdt.cc +++ b/natives/wdt.cc @@ -15,7 +15,6 @@ class WdtWorker : public Napi::AsyncWorker { list frames; list coalesced; list mid; - list result; Image watermark; readImages(&frames, in_path); watermark.read("./assets/images/whodidthis.png"); @@ -30,8 +29,8 @@ class WdtWorker : public Napi::AsyncWorker { mid.push_back(watermark_new); } - optimizeImageLayers(&result, mid.begin(), mid.end()); - writeImages(result.begin(), result.end(), &blob); + optimizeTransparency(mid.begin(), mid.end()); + writeImages(mid.begin(), mid.end(), &blob); } void OnOK() {