Finish converting natives

natives/blur.cc

@@ -7,14 +7,14 @@
 using namespace std;
 using namespace vips;
 
-char *Blur(string type, char *BufferData, size_t BufferLength,
+char *Blur(string *type, char *BufferData, size_t BufferLength,
            ArgumentMap Arguments, size_t *DataSize) {
   bool sharp = GetArgument<bool>(Arguments, "sharp");
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   if (!in.has_alpha())
@@ -26,7 +26,7 @@ char *Blur(string type, char *BufferData, size_t BufferLength,
       sharp ? in.sharpen(VImage::option()->set("sigma", 3)) : in.gaussblur(15);
 
   void *buf;
-  out.write_to_buffer(("." + type).c_str(), &buf, DataSize);
+  out.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/blur.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Blur(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Blur(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/caption.cc

@@ -7,7 +7,7 @@
 using namespace std;
 using namespace vips;
 
-char *Caption(string type, char *BufferData, size_t BufferLength,
+char *Caption(string *type, char *BufferData, size_t BufferLength,
               ArgumentMap Arguments, size_t *DataSize) {
 
   string caption = GetArgument<string>(Arguments, "caption");
@@ -18,7 +18,7 @@ char *Caption(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   if (!in.has_alpha())
@@ -60,7 +60,7 @@ char *Caption(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage frame = captionImage.join(
         img_frame, VIPS_DIRECTION_VERTICAL,
         VImage::option()->set("background", 0xffffff)->set("expand", true));
@@ -71,8 +71,8 @@ char *Caption(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/caption.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Caption(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Caption(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/caption2.cc

@@ -7,7 +7,7 @@
 using namespace std;
 using namespace vips;
 
-char *CaptionTwo(string type, char *BufferData, size_t BufferLength,
+char *CaptionTwo(string *type, char *BufferData, size_t BufferLength,
                  ArgumentMap Arguments, size_t *DataSize) {
 
   bool top = GetArgument<bool>(Arguments, "top");
@@ -19,7 +19,7 @@ char *CaptionTwo(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   if (!in.has_alpha())
@@ -60,7 +60,7 @@ char *CaptionTwo(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage frame =
         (top ? captionImage : img_frame)
             .join(top ? img_frame : captionImage, VIPS_DIRECTION_VERTICAL,
@@ -74,8 +74,8 @@ char *CaptionTwo(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/caption2.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* CaptionTwo(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* CaptionTwo(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/circle.cc

@@ -10,7 +10,7 @@
 using namespace std;
 using namespace Magick;
 
-char *Circle(string type, char *BufferData, size_t BufferLength,
+char *Circle(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
 
   Blob blob;
@@ -29,13 +29,13 @@ char *Circle(string type, char *BufferData, size_t BufferLength,
 
   for (Image &image : coalesced) {
     image.rotationalBlur(10);
-    image.magick(type);
+    image.magick(*type);
     blurred.push_back(image);
   }
 
   optimizeTransparency(blurred.begin(), blurred.end());
 
-  if (type == "gif") {
+  if (*type == "gif") {
     for (Image &image : blurred) {
       image.quantizeDitherMethod(FloydSteinbergDitherMethod);
       image.quantize();

natives/circle.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Circle(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Circle(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/colors.cc

@@ -10,7 +10,7 @@ using namespace vips;
 VImage sepia = VImage::new_matrixv(3, 3, 0.3588, 0.7044, 0.1368, 0.2990, 0.5870,
                                    0.1140, 0.2392, 0.4696, 0.0912);
 
-char *Colors(string type, char *BufferData, size_t BufferLength,
+char *Colors(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
 
   string color = GetArgument<string>(Arguments, "color");
@@ -19,7 +19,7 @@ char *Colors(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   VImage out;
@@ -31,7 +31,7 @@ char *Colors(string type, char *BufferData, size_t BufferLength,
   }
 
   void *buf;
-  out.write_to_buffer(("." + type).c_str(), &buf, DataSize);
+  out.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/colors.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Colors(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Colors(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/crop.cc

@@ -6,14 +6,14 @@
 using namespace std;
 using namespace vips;
 
-char *Crop(string type, char *BufferData, size_t BufferLength,
+char *Crop(string *type, char *BufferData, size_t BufferLength,
            ArgumentMap Arguments, size_t *DataSize) {
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   int width = in.width();
@@ -24,7 +24,7 @@ char *Crop(string type, char *BufferData, size_t BufferLength,
   int finalHeight = 0;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     int frameWidth = img_frame.width();
     int frameHeight = img_frame.height();
     bool widthOrHeight = frameWidth / frameHeight >= 1;
@@ -42,8 +42,8 @@ char *Crop(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/crop.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Crop(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Crop(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/deepfry.cc

@@ -5,14 +5,14 @@
 using namespace std;
 using namespace vips;
 
-char *Deepfry(string type, char *BufferData, size_t BufferLength,
+char *Deepfry(string *type, char *BufferData, size_t BufferLength,
               ArgumentMap Arguments, size_t *DataSize) {
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   if (!in.has_alpha())
@@ -26,7 +26,7 @@ char *Deepfry(string type, char *BufferData, size_t BufferLength,
   VImage fried = (in * 1.3 - (255.0 * 1.3 - 255.0)) * 1.5;
 
   VImage final;
-  if (totalHeight > 65500 && type == "gif") {
+  if (totalHeight > 65500 && *type == "gif") {
     vector<VImage> img;
     for (int i = 0; i < nPages; i++) {
       VImage img_frame = in.crop(0, i * pageHeight, width, pageHeight);
@@ -49,13 +49,13 @@ char *Deepfry(string type, char *BufferData, size_t BufferLength,
                           VImage::option()->set("Q", 1)->set("strip", true));
     final = VImage::new_from_buffer(jpgBuf, jpgLength, "");
     final.set(VIPS_META_PAGE_HEIGHT, pageHeight);
-    if (type == "gif")
+    if (*type == "gif")
       final.set("delay", fried.get_array_int("delay"));
   }
 
   void *buf;
-  final.write_to_buffer(("." + type).c_str(), &buf, DataSize,
+  final.write_to_buffer(("." + *type).c_str(), &buf, DataSize,
-                        type == "gif" ? VImage::option()->set("dither", 0) : 0);
+                        *type == "gif" ? VImage::option()->set("dither", 0) : 0);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/deepfry.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Deepfry(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Deepfry(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/explode.cc

@@ -11,7 +11,7 @@
 using namespace std;
 using namespace Magick;
 
-char *Explode(string type, char *BufferData, size_t BufferLength,
+char *Explode(string *type, char *BufferData, size_t BufferLength,
               ArgumentMap Arguments, size_t *DataSize) {
 
   int amount = GetArgument<int>(Arguments, "amount");
@@ -33,13 +33,13 @@ char *Explode(string type, char *BufferData, size_t BufferLength,
 
   for (Image &image : coalesced) {
     image.implode(amount);
-    image.magick(type);
+    image.magick(*type);
     blurred.push_back(image);
   }
 
   optimizeTransparency(blurred.begin(), blurred.end());
 
-  if (type == "gif") {
+  if (*type == "gif") {
     for (Image &image : blurred) {
       image.quantizeDither(false);
       image.quantize();

natives/explode.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Explode(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Explode(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/flag.cc

@@ -7,7 +7,7 @@
 using namespace std;
 using namespace vips;
 
-char *Flag(string type, char *BufferData, size_t BufferLength,
+char *Flag(string *type, char *BufferData, size_t BufferLength,
            ArgumentMap Arguments, size_t *DataSize) {
 
   string overlay = GetArgument<string>(Arguments, "overlay");
@@ -17,7 +17,7 @@ char *Flag(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   if (!in.has_alpha())
@@ -43,7 +43,7 @@ char *Flag(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage composited =
         img_frame.composite2(overlayImage, VIPS_BLEND_MODE_OVER);
     img.push_back(composited);
@@ -54,8 +54,8 @@ char *Flag(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/flag.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Flag(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Flag(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/flip.cc

@@ -7,13 +7,13 @@
 using namespace std;
 using namespace vips;
 
-char *Flip(string type, char *BufferData, size_t BufferLength,
+char *Flip(string *type, char *BufferData, size_t BufferLength,
            ArgumentMap Arguments, size_t *DataSize) {
 
   bool flop = GetArgument<bool>(Arguments, "flop");
 
   VImage in = VImage::new_from_buffer(BufferData, BufferLength, "",
-                                      type == "gif"
+                                      *type == "gif"
                                           ? VImage::option()->set("n", -1)->set(
                                                 "access", "sequential")
                                           : 0)
@@ -24,7 +24,7 @@ char *Flip(string type, char *BufferData, size_t BufferLength,
   VImage out;
   if (flop) {
     out = in.flip(VIPS_DIRECTION_HORIZONTAL);
-  } else if (type == "gif") {
+  } else if (*type == "gif") {
     // libvips gif handling is both a blessing and a curse
     vector<VImage> img;
     int pageHeight = vips_image_get_page_height(in.get_image());
@@ -42,8 +42,8 @@ char *Flip(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   out.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/flip.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Flip(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Flip(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/freeze.cc

@@ -8,7 +8,7 @@
 using namespace std;
 using namespace vips;
 
-char *Freeze(string type, char *BufferData, size_t BufferLength,
+char *Freeze(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
 
   bool loop = GetArgumentWithFallback<bool>(Arguments, "loop", false);
@@ -54,7 +54,7 @@ char *Freeze(string type, char *BufferData, size_t BufferLength,
 
     VImage in =
         VImage::new_from_buffer(BufferData, BufferLength, "",
-                                type == "gif" ? options->set("n", -1) : options)
+                                *type == "gif" ? options->set("n", -1) : options)
             .colourspace(VIPS_INTERPRETATION_sRGB);
     if (!in.has_alpha())
       in = in.bandjoin(255);
@@ -67,7 +67,7 @@ char *Freeze(string type, char *BufferData, size_t BufferLength,
     out.set("loop", 1);
 
     void *buf;
-    out.write_to_buffer(("." + type).c_str(), &buf, DataSize);
+    out.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
 
     vips_error_clear();
     vips_thread_shutdown();

natives/freeze.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Freeze(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Freeze(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/gamexplain.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Gamexplain(string type, char *BufferData, size_t BufferLength,
+char *Gamexplain(string *type, char *BufferData, size_t BufferLength,
                  ArgumentMap Arguments, size_t *DataSize) {
 
   string basePath = GetArgument<string>(Arguments, "basePath");
@@ -14,7 +14,7 @@ char *Gamexplain(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -29,7 +29,7 @@ char *Gamexplain(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage resized =
         img_frame
             .resize(1181.0 / (double)width,
@@ -43,8 +43,8 @@ char *Gamexplain(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/gamexplain.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Gamexplain(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Gamexplain(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/globe.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Globe(string type, char *BufferData, size_t BufferLength,
+char *Globe(string *type, char *BufferData, size_t BufferLength,
             ArgumentMap Arguments, size_t *DataSize) {
 
   string basePath = GetArgument<string>(Arguments, "basePath");
@@ -15,7 +15,7 @@ char *Globe(string type, char *BufferData, size_t BufferLength,
   VImage in =
       VImage::new_from_buffer(
           BufferData, BufferLength, "",
-          type == "gif" ? options->set("n", -1)->set("access", "sequential")
+          *type == "gif" ? options->set("n", -1)->set("access", "sequential")
                         : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
@@ -23,7 +23,7 @@ char *Globe(string type, char *BufferData, size_t BufferLength,
 
   int width = in.width();
   int pageHeight = vips_image_get_page_height(in.get_image());
-  int nPages = type == "gif" ? vips_image_get_n_pages(in.get_image()) : 30;
+  int nPages = *type == "gif" ? vips_image_get_n_pages(in.get_image()) : 30;
 
   double size = min(width, pageHeight);
 
@@ -51,7 +51,7 @@ char *Globe(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage resized = img_frame.resize(
         size / (double)width,
         VImage::option()->set("vscale", size / (double)pageHeight));
@@ -65,7 +65,7 @@ char *Globe(string type, char *BufferData, size_t BufferLength,
   }
   VImage final = VImage::arrayjoin(img, VImage::option()->set("across", 1));
   final.set(VIPS_META_PAGE_HEIGHT, size);
-  if (type != "gif") {
+  if (*type != "gif") {
     vector<int> delay(30, 50);
     final.set("delay", delay);
   }

natives/globe.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Globe(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Globe(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/image.cc

@@ -51,7 +51,7 @@
 
 using namespace std;
 
-std::map<std::string, char* (*)(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize)> FunctionMap = {
+std::map<std::string, char* (*)(string *type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize)> FunctionMap = {
   {"blur", &Blur},
 	{"caption", &Caption},
 	{"captionTwo", &CaptionTwo},
@@ -67,36 +67,33 @@ std::map<std::string, char* (*)(string type, char* BufferData, size_t BufferLeng
   {"globe", Globe},
   {"invert", Invert},
   {"jpeg", Jpeg},
+  {"magik", Magik},
   {"meme", Meme},
   {"mirror", Mirror},
   {"motivate", Motivate},
   {"reddit", Reddit},
   {"resize", Resize},
   {"reverse", Reverse},
-  {"speed", &Speed},
-	{"uncaption", &Uncaption},
-  {"watermark", &Watermark}
-};
-
-std::map<std::string, char* (*)(string *type, ArgumentMap Arguments, size_t* DataSize)> NoInputFunctionMap = {
-  {"homebrew", Homebrew},
-  {"sonic", Sonic}
-};
-
-std::map<std::string, Napi::Value (*)(const Napi::CallbackInfo &info)> OldFunctionMap = {
-  {"magik", Magik},
   {"scott", Scott},
   {"snapchat", Snapchat},
+  {"speed", &Speed},
   {"spin", Spin},
   {"swirl", Swirl},
   {"tile", Tile},
   {"togif", ToGif},
   {"uncanny", Uncanny},
+	{"uncaption", &Uncaption},
   {"wall", Wall},
+  {"watermark", &Watermark},
   {"whisper", Whisper},
   {"zamn", Zamn}
 };
 
+std::map<std::string, char* (*)(string *type, ArgumentMap Arguments, size_t* DataSize)> NoInputFunctionMap = {
+  {"homebrew", Homebrew},
+  {"sonic", Sonic}
+};
+
 bool isNapiValueInt(Napi::Env& env, Napi::Value& num) {
   return env.Global()
       .Get("Number")
@@ -150,7 +147,7 @@ Napi::Value NewProcessImage(const Napi::CallbackInfo &info, bool input) {
     char* buf;
     if (input) {
       Napi::Buffer<char> data = obj.Has("data") ? obj.Get("data").As<Napi::Buffer<char>>() : Napi::Buffer<char>::New(env, 0);
-      buf = FunctionMap.at(command)(type, data.Data(), data.Length(), Arguments, &length);
+      buf = FunctionMap.at(command)(&type, data.Data(), data.Length(), Arguments, &length);
     } else {
       buf = NoInputFunctionMap.at(command)(&type, Arguments, &length);
     }
@@ -167,10 +164,6 @@ Napi::Value NewProcessImage(const Napi::CallbackInfo &info, bool input) {
   return result;
 }
 
-Napi::Value OldProcessImage(std::string FunctionName, const Napi::CallbackInfo &info) {
-  return OldFunctionMap.at(FunctionName)(info);
-}
-
 Napi::Value ProcessImage(const Napi::CallbackInfo &info) { // janky solution for gradual adoption
   Napi::Env env = info.Env();
 
@@ -180,8 +173,6 @@ Napi::Value ProcessImage(const Napi::CallbackInfo &info) { // janky solution for
     return NewProcessImage(info, true);
   } else if (MAP_HAS(NoInputFunctionMap, command)) {
     return NewProcessImage(info, false);
-  } else if (MAP_HAS(OldFunctionMap, command)) {
-    return OldProcessImage(command, info);
   } else {
     Napi::Error::New(env, "Invalid command").ThrowAsJavaScriptException();
     return env.Null();
@@ -208,11 +199,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports){
       arr[i] = Napi::String::New(env, imap.first);
       i++;
     }
-    for(auto const& imap: OldFunctionMap) {
-      Napi::HandleScope scope(env);
-      arr[i] = Napi::String::New(env, imap.first);
-      i++;
-    }
 
     exports.Set(Napi::String::New(env, "funcs"), arr);
 

natives/invert.cc

@@ -5,14 +5,14 @@
 using namespace std;
 using namespace vips;
 
-char *Invert(string type, char *BufferData, size_t BufferLength,
+char *Invert(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -23,7 +23,7 @@ char *Invert(string type, char *BufferData, size_t BufferLength,
   VImage out = inverted.bandjoin(in.extract_band(3));
 
   void *buf;
-  out.write_to_buffer(("." + type).c_str(), &buf, DataSize);
+  out.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/invert.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Invert(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Invert(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/jpeg.cc

@@ -5,13 +5,13 @@
 using namespace std;
 using namespace vips;
 
-char *Jpeg(string type, char *BufferData, size_t BufferLength,
+char *Jpeg(string *type, char *BufferData, size_t BufferLength,
            ArgumentMap Arguments, size_t *DataSize) {
   int quality = GetArgumentWithFallback<int>(Arguments, "quality", 0);
 
   void *buf;
 
-  if (type == "gif") {
+  if (*type == "gif") {
     VImage in = VImage::new_from_buffer(
                     BufferData, BufferLength, "",
                     VImage::option()->set("access", "sequential")->set("n", -1))
@@ -53,15 +53,15 @@ char *Jpeg(string type, char *BufferData, size_t BufferLength,
       final.set("delay", in.get_array_int("delay"));
     }
 
-    final.write_to_buffer(("." + type).c_str(), &buf, DataSize,
+    final.write_to_buffer(("." + *type).c_str(), &buf, DataSize,
-                          type == "gif" ? VImage::option()->set("dither", 0)
+                          *type == "gif" ? VImage::option()->set("dither", 0)
                                         : 0);
   } else {
     VImage in = VImage::new_from_buffer(BufferData, BufferLength, "");
     in.write_to_buffer(".jpg", &buf, DataSize,
                        VImage::option()->set("Q", quality)->set("strip", true));
 
-    type = "jpg";
+    *type = "jpg";
   }
 
   vips_error_clear();

natives/jpeg.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Jpeg(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Jpeg(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/magik.cc

@@ -1,20 +1,15 @@
+#include "common.h"
 #include <Magick++.h>
-#include <napi.h>
 
+#include <cstring>
 #include <iostream>
 #include <list>
 
 using namespace std;
 using namespace Magick;
 
-Napi::Value Magik(const Napi::CallbackInfo &info) {
+char *Magik(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+            ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
-
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
 
   Blob blob;
 
@@ -22,7 +17,7 @@ Napi::Value Magik(const Napi::CallbackInfo &info) {
   list<Image> coalesced;
   list<Image> blurred;
   try {
-      readImages(&frames, Blob(data.Data(), data.Length()));
+    readImages(&frames, Blob(BufferData, BufferLength));
   } catch (Magick::WarningCoder &warning) {
     cerr << "Coder Warning: " << warning.what() << endl;
   } catch (Magick::Warning &warning) {
@@ -34,13 +29,13 @@ Napi::Value Magik(const Napi::CallbackInfo &info) {
     image.scale(Geometry("350x350"));
     image.liquidRescale(Geometry("175x175"));
     image.liquidRescale(Geometry("350x350"));
-      image.magick(type);
+    image.magick(*type);
     blurred.push_back(image);
   }
 
   optimizeTransparency(blurred.begin(), blurred.end());
 
-    if (type == "gif") {
+  if (*type == "gif") {
     for (Image &image : blurred) {
       image.quantizeDitherMethod(FloydSteinbergDitherMethod);
       image.quantize();
@@ -49,14 +44,9 @@ Napi::Value Magik(const Napi::CallbackInfo &info) {
 
   writeImages(blurred.begin(), blurred.end(), &blob);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
+  *DataSize = blob.length();
-                                                blob.length()));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
 
-  return result;
+  char *data = (char *)malloc(*DataSize);
+  memcpy(data, blob.data(), *DataSize);
+  return data;
 }

natives/magik.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Magik(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Magik(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/meme.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Meme(string type, char *BufferData, size_t BufferLength,
+char *Meme(string *type, char *BufferData, size_t BufferLength,
            ArgumentMap Arguments, size_t *DataSize) {
   string top = GetArgument<string>(Arguments, "top");
   string bottom = GetArgument<string>(Arguments, "bottom");
@@ -16,7 +16,7 @@ char *Meme(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -112,7 +112,7 @@ char *Meme(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     if (top != "") {
       img_frame = img_frame.composite2(
           topText, VIPS_BLEND_MODE_OVER,
@@ -132,8 +132,8 @@ char *Meme(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/meme.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Meme(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Meme(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/mirror.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Mirror(string type, char *BufferData, size_t BufferLength,
+char *Mirror(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
   bool vertical = GetArgumentWithFallback<bool>(Arguments, "vertical", false);
   bool first = GetArgumentWithFallback<bool>(Arguments, "first", false);
@@ -14,7 +14,7 @@ char *Mirror(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -22,7 +22,7 @@ char *Mirror(string type, char *BufferData, size_t BufferLength,
   VImage out;
 
   if (vertical) {
-    if (type == "gif") {
+    if (*type == "gif") {
       // once again, libvips gif handling is both a blessing and a curse
       vector<VImage> img;
       int pageHeight = vips_image_get_page_height(in.get_image());
@@ -59,7 +59,7 @@ char *Mirror(string type, char *BufferData, size_t BufferLength,
   }
 
   void *buf;
-  out.write_to_buffer(("." + type).c_str(), &buf, DataSize);
+  out.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/mirror.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Mirror(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Mirror(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/motivate.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Motivate(string type, char *BufferData, size_t BufferLength,
+char *Motivate(string *type, char *BufferData, size_t BufferLength,
                ArgumentMap Arguments, size_t *DataSize) {
   string top_text = GetArgument<string>(Arguments, "top");
   string bottom_text = GetArgument<string>(Arguments, "bottom");
@@ -16,7 +16,7 @@ char *Motivate(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -70,7 +70,7 @@ char *Motivate(string type, char *BufferData, size_t BufferLength,
   int height;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
 
     int borderSize = max(2, width / 66);
     int borderSize2 = borderSize * 0.5;
@@ -117,8 +117,8 @@ char *Motivate(string type, char *BufferData, size_t BufferLength,
   final.set(VIPS_META_PAGE_HEIGHT, height);
 
   void *buf;
-  final.write_to_buffer(("." + type).c_str(), &buf, DataSize,
+  final.write_to_buffer(("." + *type).c_str(), &buf, DataSize,
-                        type == "gif" ? VImage::option()->set("dither", 1) : 0);
+                        *type == "gif" ? VImage::option()->set("dither", 1) : 0);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/motivate.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Motivate(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Motivate(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/reddit.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Reddit(string type, char *BufferData, size_t BufferLength,
+char *Reddit(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
 
   string text = GetArgument<string>(Arguments, "text");
@@ -15,7 +15,7 @@ char *Reddit(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -50,7 +50,7 @@ char *Reddit(string type, char *BufferData, size_t BufferLength,
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage frame = img_frame.join(watermark, VIPS_DIRECTION_VERTICAL,
                                   VImage::option()->set("expand", true));
     img.push_back(frame);
@@ -60,8 +60,8 @@ char *Reddit(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/reddit.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Reddit(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Reddit(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/resize.cc

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace vips;
 
-char *Resize(string type, char *BufferData, size_t BufferLength,
+char *Resize(string *type, char *BufferData, size_t BufferLength,
              ArgumentMap Arguments, size_t *DataSize) {
   bool stretch = GetArgumentWithFallback<bool>(Arguments, "stretch", false);
   bool wide = GetArgumentWithFallback<bool>(Arguments, "wide", false);
@@ -14,7 +14,7 @@ char *Resize(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
 
   VImage out;
@@ -37,7 +37,7 @@ char *Resize(string type, char *BufferData, size_t BufferLength,
     vector<VImage> img;
     for (int i = 0; i < nPages; i++) {
       VImage img_frame =
-          type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+          *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
       VImage resized = img_frame.resize(0.1).resize(
           10, VImage::option()->set("kernel", VIPS_KERNEL_NEAREST));
       img.push_back(resized);
@@ -48,7 +48,7 @@ char *Resize(string type, char *BufferData, size_t BufferLength,
   out.set(VIPS_META_PAGE_HEIGHT, finalHeight);
 
   void *buf;
-  out.write_to_buffer(("." + type).c_str(), &buf, DataSize);
+  out.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
 
   vips_error_clear();
   vips_thread_shutdown();

natives/resize.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Resize(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Resize(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/reverse.cc

@@ -6,7 +6,7 @@
 using namespace std;
 using namespace vips;
 
-char *Reverse(string type, char *BufferData, size_t BufferLength,
+char *Reverse(string *type, char *BufferData, size_t BufferLength,
               ArgumentMap Arguments, size_t *DataSize) {
   bool soos = GetArgumentWithFallback<bool>(Arguments, "soos", false);
 
@@ -53,7 +53,7 @@ char *Reverse(string type, char *BufferData, size_t BufferLength,
   final.write_to_buffer(".gif", &buf, DataSize,
                         VImage::option()->set("dither", 0));
 
-  type = "gif";
+  *type = "gif";
 
   vips_error_clear();
   vips_thread_shutdown();

natives/reverse.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Reverse(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Reverse(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/scott.cc

@@ -1,21 +1,16 @@
+#include "common.h"
 #include <Magick++.h>
-#include <napi.h>
 
+#include <cstring>
 #include <iostream>
 #include <list>
 
 using namespace std;
 using namespace Magick;
 
-Napi::Value Scott(const Napi::CallbackInfo &info) {
+char *Scott(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+            ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
+  string basePath = GetArgument<string>(Arguments, "basePath");
-
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
-    string basePath = obj.Get("basePath").As<Napi::String>().Utf8Value();
 
   Blob blob;
 
@@ -24,7 +19,7 @@ Napi::Value Scott(const Napi::CallbackInfo &info) {
   list<Image> mid;
   Image watermark;
   try {
-      readImages(&frames, Blob(data.Data(), data.Length()));
+    readImages(&frames, Blob(BufferData, BufferLength));
   } catch (Magick::WarningCoder &warning) {
     cerr << "Coder Warning: " << warning.what() << endl;
   } catch (Magick::Warning &warning) {
@@ -44,14 +39,14 @@ Napi::Value Scott(const Napi::CallbackInfo &info) {
     image.extent(Geometry("864x481"), Magick::CenterGravity);
     watermark_new.composite(image, Geometry("-110+83"),
                             Magick::OverCompositeOp);
-      watermark_new.magick(type);
+    watermark_new.magick(*type);
     watermark_new.animationDelay(image.animationDelay());
     mid.push_back(watermark_new);
   }
 
   optimizeTransparency(mid.begin(), mid.end());
 
-    if (type == "gif") {
+  if (*type == "gif") {
     for (Image &image : mid) {
       image.quantizeDitherMethod(FloydSteinbergDitherMethod);
       image.quantize();
@@ -60,14 +55,9 @@ Napi::Value Scott(const Napi::CallbackInfo &info) {
 
   writeImages(mid.begin(), mid.end(), &blob);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
+  *DataSize = blob.length();
-                                                blob.length()));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
   
-  return result;
+  char *data = (char *)malloc(*DataSize);
+  memcpy(data, blob.data(), *DataSize);
+  return data;
 }

natives/scott.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Scott(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Scott(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/snapchat.cc

@@ -1,28 +1,21 @@
-#include <napi.h>
+#include "common.h"
 
 #include <vips/vips8>
 
 using namespace std;
 using namespace vips;
 
-Napi::Value Snapchat(const Napi::CallbackInfo &info) {
+char *Snapchat(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+               ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
+  string caption = GetArgument<string>(Arguments, "caption");
-
+  float pos = GetArgumentWithFallback<float>(Arguments, "pos", 0.5);
-  try {
+  string basePath = GetArgument<string>(Arguments, "basePath");
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string caption = obj.Get("caption").As<Napi::String>().Utf8Value();
-    float pos =
-        obj.Has("pos") ? obj.Get("pos").As<Napi::Number>().FloatValue() : 0.5;
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
-    string basePath = obj.Get("basePath").As<Napi::String>().Utf8Value();
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
-        VImage::new_from_buffer(data.Data(), data.Length(), "",
+      VImage::new_from_buffer(BufferData, BufferLength, "",
-                                type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -33,8 +26,7 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
   int size = width / 20;
   int textWidth = width - ((width / 25) * 2);
 
-    string font_string =
+  string font_string = "Helvetica Neue, Twemoji Color Font " + to_string(size);
-        "Helvetica Neue, Twemoji Color Font " + to_string(size);
 
   VImage textIn = VImage::text(
       ".", VImage::option()->set(
@@ -50,8 +42,7 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
           ->set("fontfile", (basePath + "assets/fonts/twemoji.otf").c_str())
           ->set("width", textWidth));
   int bgHeight = textIn.height() + (width / 25);
-    textIn =
+  textIn = ((textIn == (vector<double>){0, 0, 0, 0}).bandand())
-        ((textIn == (vector<double>){0, 0, 0, 0}).bandand())
                .ifthenelse({0, 0, 0, 178}, textIn)
                .embed((width / 2) - (textIn.width() / 2),
                       (bgHeight / 2) - (textIn.height() / 2), width, bgHeight,
@@ -62,7 +53,7 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-          type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     img_frame = img_frame.composite2(
         textIn, VIPS_BLEND_MODE_OVER,
         VImage::option()->set("x", 0)->set("y", pageHeight * pos));
@@ -72,21 +63,12 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
   final.set(VIPS_META_PAGE_HEIGHT, pageHeight);
 
   void *buf;
-    size_t length;
   final.write_to_buffer(
-        ("." + type).c_str(), &buf, &length,
+      ("." + *type).c_str(), &buf, DataSize,
-        type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
-
   vips_error_clear();
   vips_thread_shutdown();
-  return result;
+  return (char *)buf;
 }

natives/snapchat.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Snapchat(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Snapchat(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/speed.cc

@@ -42,7 +42,7 @@ char *vipsRemove(char *data, size_t length, size_t *DataSize, int speed) {
   return (char *)buf;
 }
 
-char *Speed(string type, char *BufferData, size_t BufferLength,
+char *Speed(string *type, char *BufferData, size_t BufferLength,
             ArgumentMap Arguments, size_t *DataSize) {
 
   bool slow = GetArgumentWithFallback<bool>(Arguments, "slow", false);

natives/speed.h

@@ -4,4 +4,4 @@
 
 using std::string;
 
-char* Speed(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Speed(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/spin.cc

@@ -1,21 +1,16 @@
+#include "common.h"
 #include <Magick++.h>
-#include <napi.h>
 
+#include <cstring>
 #include <iostream>
 #include <list>
 
 using namespace std;
 using namespace Magick;
 
-Napi::Value Spin(const Napi::CallbackInfo &info) {
+char *Spin(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+           ArgumentMap Arguments, size_t *DataSize) {
-
+  int delay = GetArgumentWithFallback<int>(Arguments, "delay", 0);
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
-    int delay =
-        obj.Has("delay") ? obj.Get("delay").As<Napi::Number>().Int32Value() : 0;
 
   Blob blob;
 
@@ -23,7 +18,7 @@ Napi::Value Spin(const Napi::CallbackInfo &info) {
   list<Image> coalesced;
   list<Image> mid;
   try {
-      readImages(&frames, Blob(data.Data(), data.Length()));
+    readImages(&frames, Blob(BufferData, BufferLength));
   } catch (Magick::WarningCoder &warning) {
     cerr << "Coder Warning: " << warning.what() << endl;
   } catch (Magick::Warning &warning) {
@@ -31,7 +26,7 @@ Napi::Value Spin(const Napi::CallbackInfo &info) {
   }
   coalesceImages(&coalesced, frames.begin(), frames.end());
 
-    if (type != "gif") {
+  if (*type != "gif") {
     list<Image>::iterator it = coalesced.begin();
     for (int i = 0; i < 29; ++i) {
       coalesced.push_back(*it);
@@ -56,7 +51,7 @@ Napi::Value Spin(const Napi::CallbackInfo &info) {
   optimizeTransparency(mid.begin(), mid.end());
   if (delay != 0) {
     for_each(mid.begin(), mid.end(), animationDelayImage(delay));
-    } else if (type != "gif") {
+  } else if (*type != "gif") {
     for_each(mid.begin(), mid.end(), animationDelayImage(5));
   }
 
@@ -67,14 +62,10 @@ Napi::Value Spin(const Napi::CallbackInfo &info) {
 
   writeImages(mid.begin(), mid.end(), &blob);
 
-    Napi::Object result = Napi::Object::New(env);
+  *type = "gif";
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
+  *DataSize = blob.length();
-                                                blob.length()));
+
-    result.Set("type", "gif");
+  char *data = (char *)malloc(*DataSize);
-    return result;
+  memcpy(data, blob.data(), *DataSize);
-  } catch (std::exception const &err) {
+  return data;
-    throw Napi::Error::New(env, err.what());
-  } catch (...) {
-    throw Napi::Error::New(env, "Unknown error");
-  }
 }

natives/spin.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Spin(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Spin(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/swirl.cc

@@ -1,24 +1,18 @@
-#include <napi.h>
+#include "common.h"
 
 #include <vips/vips8>
 
 using namespace std;
 using namespace vips;
 
-Napi::Value Swirl(const Napi::CallbackInfo &info) {
+char *Swirl(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+            ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
-
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
-        VImage::new_from_buffer(data.Data(), data.Length(), "",
+      VImage::new_from_buffer(BufferData, BufferLength, "",
-                                type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -62,15 +56,15 @@ Napi::Value Swirl(const Napi::CallbackInfo &info) {
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-          type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
 
     VImage distort =
         img_frame
             .gravity(VIPS_COMPASS_DIRECTION_CENTRE, newWidth, newHeight,
                      VImage::option()->set("extend", VIPS_EXTEND_COPY))
-              .mapim(distortion, VImage::option()->set(
+            .mapim(distortion,
-                                     "interpolate",
+                   VImage::option()->set(
-                                     VInterpolate::new_from_name("bicubic")));
+                       "interpolate", VInterpolate::new_from_name("bicubic")));
     VImage frame = distort.crop(width, pageHeight, width, pageHeight);
     img.push_back(frame);
   }
@@ -78,18 +72,9 @@ Napi::Value Swirl(const Napi::CallbackInfo &info) {
   final.set(VIPS_META_PAGE_HEIGHT, pageHeight);
 
   void *buf;
-    size_t length;
+  final.write_to_buffer(".gif", &buf, DataSize);
-    final.write_to_buffer(".gif", &buf, &length);
-
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
 
   vips_error_clear();
   vips_thread_shutdown();
-  return result;
+  return (char *)buf;
 }

natives/swirl.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Swirl(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Swirl(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/tile.cc

@@ -1,20 +1,15 @@
+#include "common.h"
 #include <Magick++.h>
-#include <napi.h>
 
+#include <cstring>
 #include <iostream>
 #include <list>
 
 using namespace std;
 using namespace Magick;
 
-Napi::Value Tile(const Napi::CallbackInfo &info) {
+char *Tile(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+           ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
-
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
 
   Blob blob;
 
@@ -22,7 +17,7 @@ Napi::Value Tile(const Napi::CallbackInfo &info) {
   list<Image> coalesced;
   list<Image> mid;
   try {
-      readImages(&frames, Blob(data.Data(), data.Length()));
+    readImages(&frames, Blob(BufferData, BufferLength));
   } catch (Magick::WarningCoder &warning) {
     cerr << "Coder Warning: " << warning.what() << endl;
   } catch (Magick::Warning &warning) {
@@ -35,7 +30,7 @@ Napi::Value Tile(const Napi::CallbackInfo &info) {
     Image appended;
     list<Image> montage;
     Image frame;
-      image.magick(type);
+    image.magick(*type);
     for (int i = 0; i < 5; ++i) {
       duplicated.push_back(image);
     }
@@ -53,7 +48,7 @@ Napi::Value Tile(const Napi::CallbackInfo &info) {
 
   optimizeTransparency(mid.begin(), mid.end());
 
-    if (type == "gif") {
+  if (*type == "gif") {
     for (Image &image : mid) {
       image.quantizeDitherMethod(FloydSteinbergDitherMethod);
       image.quantize();
@@ -62,14 +57,9 @@ Napi::Value Tile(const Napi::CallbackInfo &info) {
 
   writeImages(mid.begin(), mid.end(), &blob);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
+  *DataSize = blob.length();
-                                                blob.length()));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
 
-  return result;
+  char *data = (char *)malloc(*DataSize);
+  memcpy(data, blob.data(), *DataSize);
+  return data;
 }

natives/tile.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Tile(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Tile(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/togif.cc

@@ -1,43 +1,32 @@
-#include <napi.h>
+#include "common.h"
 
 #include <vips/vips8>
 
 using namespace std;
 using namespace vips;
 
-Napi::Value ToGif(const Napi::CallbackInfo &info) {
+char *ToGif(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+            ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
 
-  try {
+  if (*type == "gif") {
-    Napi::Object obj = info[1].As<Napi::Object>();
+    vips_error_clear();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
+    vips_thread_shutdown();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
+    *DataSize = BufferLength;
-
+    return BufferData;
-    if (type == "gif") {
-      result.Set("data", data);
-      result.Set("type", "gif");
   } else {
     VOption *options = VImage::option()->set("access", "sequential");
 
-      VImage in = VImage::new_from_buffer(data.Data(), data.Length(), "",
+    VImage in = VImage::new_from_buffer(BufferData, BufferLength, "",
-                                          type == "webp" ? options->set("n", -1)
+                                        *type == "webp" ? options->set("n", -1)
                                                        : options);
 
     void *buf;
-      size_t length;
+    in.write_to_buffer(".gif", &buf, DataSize);
-      in.write_to_buffer(".gif", &buf, &length);
 
-      result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
+    *type = "gif";
-      result.Set("type", "gif");
-    }
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
 
     vips_error_clear();
     vips_thread_shutdown();
-  return result;
+    return (char *)buf;
+  }
 }

natives/togif.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value ToGif(const Napi::CallbackInfo& info);
+using std::string;
+
+char* ToGif(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/uncanny.cc

@@ -1,48 +1,42 @@
 #include "common.h"
-#include <napi.h>
 
 #include <vips/vips8>
 
 using namespace std;
 using namespace vips;
 
-Napi::Value Uncanny(const Napi::CallbackInfo &info) {
+char *Uncanny(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+              ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
 
-  try {
+  string caption = GetArgument<string>(Arguments, "caption");
-    Napi::Object obj = info[1].As<Napi::Object>();
+  string caption2 = GetArgument<string>(Arguments, "caption2");
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
+  string font = GetArgument<string>(Arguments, "font");
-    string caption = obj.Get("caption").As<Napi::String>().Utf8Value();
+  string path = GetArgument<string>(Arguments, "path");
-    string caption2 = obj.Get("caption2").As<Napi::String>().Utf8Value();
+  string basePath = GetArgument<string>(Arguments, "basePath");
-    string font = obj.Get("font").As<Napi::String>().Utf8Value();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
-    string path = obj.Get("path").As<Napi::String>().Utf8Value();
-    string basePath = obj.Get("basePath").As<Napi::String>().Utf8Value();
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
-        VImage::new_from_buffer(data.Data(), data.Length(), "",
+      VImage::new_from_buffer(BufferData, BufferLength, "",
-                                type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB)
           .extract_band(0, VImage::option()->set("n", 3));
 
   VImage base = VImage::black(1280, 720, VImage::option()->set("bands", 3));
 
-    string font_string = (font == "roboto" ? "Roboto Condensed" : font) + ", Twemoji Color Font " +
+  string font_string = (font == "roboto" ? "Roboto Condensed" : font) +
+                       ", Twemoji Color Font " +
                        (font != "impact" ? "bold" : "normal") + " 72";
 
-    string captionText = "<span background=\"black\" foreground=\"white\">" +
+  string captionText =
-                         caption + "</span>";
+      "<span background=\"black\" foreground=\"white\">" + caption + "</span>";
   string caption2Text =
       "<span background=\"black\" foreground=\"red\">" + caption2 + "</span>";
 
   auto findResult = fontPaths.find(font);
   if (findResult != fontPaths.end()) {
-      VImage::text(
+    VImage::text(".", VImage::option()->set(
-          ".", VImage::option()->set("fontfile",
+                          "fontfile", (basePath + findResult->second).c_str()));
-                                     (basePath + findResult->second).c_str()));
   }
 
   VImage text = VImage::text(
@@ -86,12 +80,11 @@ Napi::Value Uncanny(const Napi::CallbackInfo &info) {
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-          type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     VImage resized = img_frame.resize(690.0 / (double)width);
     if (resized.height() > 590) {
       double vscale = 590.0 / (double)resized.height();
-        resized =
+      resized = resized.resize(vscale, VImage::option()->set("vscale", vscale));
-            resized.resize(vscale, VImage::option()->set("vscale", vscale));
     }
     VImage composited = base.insert(resized, 935 - (resized.width() / 2),
                                     425 - (resized.height() / 2));
@@ -101,20 +94,11 @@ Napi::Value Uncanny(const Napi::CallbackInfo &info) {
   final.set(VIPS_META_PAGE_HEIGHT, 720);
 
   void *buf;
-    size_t length;
+  final.write_to_buffer(("." + *type).c_str(), &buf, DataSize,
-    final.write_to_buffer(("." + type).c_str(), &buf, &length,
+                        *type == "gif" ? VImage::option()->set("reoptimise", 1)
-                          type == "gif" ? VImage::option()->set("reoptimise", 1)
                                        : 0);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
-
   vips_error_clear();
   vips_thread_shutdown();
-  return result;
+  return (char *)buf;
 }

natives/uncanny.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Uncanny(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Uncanny(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/uncaption.cc

@@ -6,7 +6,7 @@
 using namespace std;
 using namespace vips;
 
-char *Uncaption(string type, char *BufferData, size_t BufferLength,
+char *Uncaption(string *type, char *BufferData, size_t BufferLength,
                 ArgumentMap Arguments, size_t *DataSize) {
 
   float tolerance = GetArgumentWithFallback<float>(Arguments, "tolerance", 0.5);
@@ -16,7 +16,7 @@ char *Uncaption(string type, char *BufferData, size_t BufferLength,
   VImage in =
       VImage::new_from_buffer(
           BufferData, BufferLength, "",
-          type == "gif" ? options->set("n", -1)->set("access", "sequential")
+          *type == "gif" ? options->set("n", -1)->set("access", "sequential")
                         : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
@@ -47,8 +47,8 @@ char *Uncaption(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/uncaption.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Uncaption(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Uncaption(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/wall.cc

@@ -1,20 +1,15 @@
+#include "common.h"
 #include <Magick++.h>
-#include <napi.h>
 
+#include <cstring>
 #include <iostream>
 #include <list>
 
 using namespace std;
 using namespace Magick;
 
-Napi::Value Wall(const Napi::CallbackInfo &info) {
+char *Wall(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+           ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
-
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
 
   Blob blob;
 
@@ -22,7 +17,7 @@ Napi::Value Wall(const Napi::CallbackInfo &info) {
   list<Image> coalesced;
   list<Image> mid;
   try {
-      readImages(&frames, Blob(data.Data(), data.Length()));
+    readImages(&frames, Blob(BufferData, BufferLength));
   } catch (Magick::WarningCoder &warning) {
     cerr << "Coder Warning: " << warning.what() << endl;
   } catch (Magick::Warning &warning) {
@@ -40,13 +35,13 @@ Napi::Value Wall(const Napi::CallbackInfo &info) {
                             128, 0, 140, 60, 128, 128, 140, 140};
     image.distort(Magick::PerspectiveDistortion, 16, arguments);
     image.scale(Geometry("800x800>"));
-      image.magick(type);
+    image.magick(*type);
     mid.push_back(image);
   }
 
   optimizeTransparency(mid.begin(), mid.end());
 
-    if (type == "gif") {
+  if (*type == "gif") {
     for (Image &image : mid) {
       image.quantizeDitherMethod(FloydSteinbergDitherMethod);
       image.quantize();
@@ -55,14 +50,9 @@ Napi::Value Wall(const Napi::CallbackInfo &info) {
 
   writeImages(mid.begin(), mid.end(), &blob);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)blob.data(),
+  *DataSize = blob.length();
-                                                blob.length()));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
 
-  return result;
+  char *data = (char *)malloc(*DataSize);
+  memcpy(data, blob.data(), *DataSize);
+  return data;
 }

natives/wall.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Wall(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Wall(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/watermark.cc

@@ -6,7 +6,7 @@
 using namespace std;
 using namespace vips;
 
-char *Watermark(string type, char *BufferData, size_t BufferLength,
+char *Watermark(string *type, char *BufferData, size_t BufferLength,
                 ArgumentMap Arguments, size_t *DataSize) {
 
   string water = GetArgument<string>(Arguments, "water");
@@ -29,7 +29,7 @@ char *Watermark(string type, char *BufferData, size_t BufferLength,
 
   VImage in =
       VImage::new_from_buffer(BufferData, BufferLength, "",
-                              type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -93,7 +93,7 @@ char *Watermark(string type, char *BufferData, size_t BufferLength,
   VImage frame;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-        type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     if (append) {
       VImage appended = img_frame.join(watermark, VIPS_DIRECTION_VERTICAL,
                                        VImage::option()->set("expand", true));
@@ -123,8 +123,8 @@ char *Watermark(string type, char *BufferData, size_t BufferLength,
           bg = frameAlpha.new_from_image({0, 0, 0}).copy(VImage::option()->set(
               "interpretation", VIPS_INTERPRETATION_sRGB));
           frame = bg.bandjoin(frameAlpha);
-          if (type == "jpg" || type == "jpeg") {
+          if (*type == "jpg" || *type == "jpeg") {
-            type = "png";
+            *type = "png";
           }
         }
         VImage content =
@@ -147,8 +147,8 @@ char *Watermark(string type, char *BufferData, size_t BufferLength,
 
   void *buf;
   final.write_to_buffer(
-      ("." + type).c_str(), &buf, DataSize,
+      ("." + *type).c_str(), &buf, DataSize,
-      type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                     : 0);
 
   vips_error_clear();

natives/watermark.h

@@ -6,4 +6,4 @@
 using std::map;
 using std::string;
 
-char* Watermark(string type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);
+char* Watermark(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/whisper.cc

@@ -1,26 +1,20 @@
-#include <napi.h>
+#include "common.h"
 
 #include <vips/vips8>
 
 using namespace std;
 using namespace vips;
 
-Napi::Value Whisper(const Napi::CallbackInfo &info) {
+char *Whisper(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+              ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
+  string caption = GetArgument<string>(Arguments, "caption");
-
+  string basePath = GetArgument<string>(Arguments, "basePath");
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string caption = obj.Get("caption").As<Napi::String>().Utf8Value();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
-    string basePath = obj.Get("basePath").As<Napi::String>().Utf8Value();
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
-        VImage::new_from_buffer(data.Data(), data.Length(), "",
+      VImage::new_from_buffer(BufferData, BufferLength, "",
-                                type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
   if (!in.has_alpha())
     in = in.bandjoin(255);
@@ -41,8 +35,7 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) {
                      VImage::option()->set("fill", true));
   } else {
     mask = VImage::black(rad * 2 + 1, rad * 2 + 1) + 128;
-      mask.draw_circle({255}, rad, rad, rad,
+    mask.draw_circle({255}, rad, rad, rad, VImage::option()->set("fill", true));
-                       VImage::option()->set("fill", true));
   }
 
   VImage textIn = VImage::text(
@@ -60,8 +53,7 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) {
   textIn = textIn.embed(rad + 10, rad + 10, (textIn.width() + 2 * rad) + 20,
                         (textIn.height() + 2 * rad) + 20);
 
-    VImage outline =
+  VImage outline = textIn.morph(mask, VIPS_OPERATION_MORPHOLOGY_DILATE)
-        textIn.morph(mask, VIPS_OPERATION_MORPHOLOGY_DILATE)
                        .gaussblur(0.5, VImage::option()->set("min_ampl", 0.1));
   outline = (outline == (vector<double>){0, 0, 0, 0});
   VImage invert = outline.extract_band(3).invert();
@@ -73,7 +65,7 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) {
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-          type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
     img_frame = img_frame.composite2(
         textImg, VIPS_BLEND_MODE_OVER,
         VImage::option()
@@ -85,21 +77,12 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) {
   final.set(VIPS_META_PAGE_HEIGHT, pageHeight);
 
   void *buf;
-    size_t length;
   final.write_to_buffer(
-        ("." + type).c_str(), &buf, &length,
+      ("." + *type).c_str(), &buf, DataSize,
-        type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
+      *type == "gif" ? VImage::option()->set("dither", 0)->set("reoptimise", 1)
                      : 0);
 
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
-
   vips_error_clear();
   vips_thread_shutdown();
-  return result;
+  return (char *)buf;
 }

natives/whisper.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Whisper(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Whisper(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

natives/zamn.cc

@@ -1,27 +1,22 @@
-#include <napi.h>
+#include "common.h"
 
 #include <vips/vips8>
 
 using namespace std;
 using namespace vips;
 
-Napi::Value Zamn(const Napi::CallbackInfo &info) {
+char *Zamn(string *type, char *BufferData, size_t BufferLength,
-  Napi::Env env = info.Env();
+           ArgumentMap Arguments, size_t *DataSize) {
-  Napi::Object result = Napi::Object::New(env);
+  string basePath = GetArgument<string>(Arguments, "basePath");
-
-  try {
-    Napi::Object obj = info[1].As<Napi::Object>();
-    Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
-    string type = obj.Get("type").As<Napi::String>().Utf8Value();
-    string basePath = obj.Get("basePath").As<Napi::String>().Utf8Value();
 
   VOption *options = VImage::option()->set("access", "sequential");
 
   VImage in =
-        VImage::new_from_buffer(data.Data(), data.Length(), "",
+      VImage::new_from_buffer(BufferData, BufferLength, "",
-                                type == "gif" ? options->set("n", -1) : options)
+                              *type == "gif" ? options->set("n", -1) : options)
           .colourspace(VIPS_INTERPRETATION_sRGB);
-    if (!in.has_alpha()) in = in.bandjoin(255);
+  if (!in.has_alpha())
+    in = in.bandjoin(255);
 
   int width = in.width();
   int pageHeight = vips_image_get_page_height(in.get_image());
@@ -33,11 +28,13 @@ Napi::Value Zamn(const Napi::CallbackInfo &info) {
   vector<VImage> img;
   for (int i = 0; i < nPages; i++) {
     VImage img_frame =
-          type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
+        *type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
-      VImage composited = tmpl.insert(
+    VImage composited =
-          img_frame.extract_band(0, VImage::option()->set("n", 3)).bandjoin(255).resize(
+        tmpl.insert(img_frame.extract_band(0, VImage::option()->set("n", 3))
-              303.0 / (double)width,
+                        .bandjoin(255)
-              VImage::option()->set("vscale", 438.0 / (double)pageHeight)),
+                        .resize(303.0 / (double)width,
+                                VImage::option()->set(
+                                    "vscale", 438.0 / (double)pageHeight)),
                     310, 76);
     img.push_back(composited);
   }
@@ -45,18 +42,9 @@ Napi::Value Zamn(const Napi::CallbackInfo &info) {
   final.set(VIPS_META_PAGE_HEIGHT, 516);
 
   void *buf;
-    size_t length;
+  final.write_to_buffer(("." + *type).c_str(), &buf, DataSize);
-    final.write_to_buffer(("." + type).c_str(), &buf, &length);
-
-    result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
-    result.Set("type", type);
-  } catch (std::exception const &err) {
-    Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
-  } catch (...) {
-    Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
-  }
 
   vips_error_clear();
   vips_thread_shutdown();
-  return result;
+  return (char *)buf;
 }

natives/zamn.h

@@ -1,5 +1,7 @@
 #pragma once
 
-#include <napi.h>
+#include "common.h"
 
-Napi::Value Zamn(const Napi::CallbackInfo& info);
+using std::string;
+
+char* Zamn(string* type, char* BufferData, size_t BufferLength, ArgumentMap Arguments, size_t* DataSize);

utils/tempimages.js

@@ -6,7 +6,7 @@ let dirSizeCache;
 export async function upload(client, result, context, interaction = false) {
   const filename = `${Math.random().toString(36).substring(2, 15)}.${result.name.split(".")[1]}`;
   await writeFile(`${process.env.TEMPDIR}/${filename}`, result.contents);
-  const imageURL = `${process.env.TMP_DOMAIN || "https://tmp.projectlounge.pw"}/${filename}`;
+  const imageURL = `${process.env.TMP_DOMAIN || "https://tmp.esmbot.net"}/${filename}`;
   const payload = {
     embeds: [{
       color: 16711680,