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

how the hell did I manage to miss squish

Browse source
This commit is contained in:
Essem 2022-12-28 00:49:38 -06:00
parent 47b2d9fcff
commit 89caa43068
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
3 changed files with 45 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
natives/image.cc
View file

@ -78,6 +78,7 @@ std::map<std::string, char* (*)(string *type, char* BufferData, size_t BufferLen
{"snapchat", Snapchat},
{"speed", &Speed},
{"spin", Spin},
{"squish", Squish},
{"swirl", Swirl},
{"tile", Tile},
{"togif", ToGif},
@ -105,7 +106,7 @@ bool isNapiValueInt(Napi::Env& env, Napi::Value& num) {
.Value();
}
Napi::Value NewProcessImage(const Napi::CallbackInfo &info, bool input) {
Napi::Value ProcessImage(const Napi::CallbackInfo &info) {
Napi::Env env = info.Env();
Napi::Object result = Napi::Object::New(env);
@ -145,7 +146,7 @@ Napi::Value NewProcessImage(const Napi::CallbackInfo &info, bool input) {
size_t length = 0;
char* buf;
if (input) {
if (obj.Has("data")) {
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);
} else {
@ -164,21 +165,6 @@ Napi::Value NewProcessImage(const Napi::CallbackInfo &info, bool input) {
return result;
}
Napi::Value ProcessImage(const Napi::CallbackInfo &info) { // janky solution for gradual adoption
Napi::Env env = info.Env();
string command = info[0].As<Napi::String>().Utf8Value();
if (MAP_HAS(FunctionMap, command)) {
return NewProcessImage(info, true);
} else if (MAP_HAS(NoInputFunctionMap, command)) {
return NewProcessImage(info, false);
} else {
Napi::Error::New(env, "Invalid command").ThrowAsJavaScriptException();
return env.Null();
}
}
Napi::Object Init(Napi::Env env, Napi::Object exports){
#ifdef _WIN32
Magick::InitializeMagick("");

89
natives/squish.cc
View file

@ -1,67 +1,54 @@
#include "common.h"
#include <math.h>
#include <napi.h>
#include <vips/vips8>
using namespace std;
using namespace vips;
Napi::Value Squish(const Napi::CallbackInfo &info) {
Napi::Env env = info.Env();
Napi::Object result = Napi::Object::New(env);
char *Squish(string *type, char *BufferData, size_t BufferLength,
ArgumentMap Arguments, size_t *DataSize) {
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();
VOption *options = VImage::option();
VImage in =
VImage::new_from_buffer(
BufferData, BufferLength, "",
*type == "gif" ? options->set("n", -1)->set("access", "sequential")
: options)
.colourspace(VIPS_INTERPRETATION_sRGB);
if (!in.has_alpha())
in = in.bandjoin(255);
VImage in =
VImage::new_from_buffer(
data.Data(), data.Length(), "",
type == "gif" ? options->set("n", -1)->set("access", "sequential")
: options)
.colourspace(VIPS_INTERPRETATION_sRGB);
if (!in.has_alpha())
in = in.bandjoin(255);
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;
double mult = (2 * M_PI) / nPages;
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;
double mult = (2 * M_PI) / nPages;
vector<VImage> img;
for (int i = 0; i < nPages; i++) {
VImage img_frame =
type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
double newWidth = (sin(i * mult) / 4) + 0.75;
double newHeight = (cos(i * mult) / 4) + 0.75;
VImage resized =
img_frame.resize(newWidth, VImage::option()->set("vscale", newHeight))
.gravity(VIPS_COMPASS_DIRECTION_CENTRE, width, pageHeight);
img.push_back(resized);
}
VImage final = VImage::arrayjoin(img, VImage::option()->set("across", 1));
final.set(VIPS_META_PAGE_HEIGHT, pageHeight);
if (type != "gif") {
vector<int> delay(30, 50);
final.set("delay", delay);
}
void *buf;
size_t length;
final.write_to_buffer(".gif", &buf, &length);
result.Set("data", Napi::Buffer<char>::Copy(env, (char *)buf, length));
result.Set("type", "gif");
} catch (std::exception const &err) {
Napi::Error::New(env, err.what()).ThrowAsJavaScriptException();
} catch (...) {
Napi::Error::New(env, "Unknown error").ThrowAsJavaScriptException();
vector<VImage> img;
for (int i = 0; i < nPages; i++) {
VImage img_frame =
*type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in;
double newWidth = (sin(i * mult) / 4) + 0.75;
double newHeight = (cos(i * mult) / 4) + 0.75;
VImage resized =
img_frame.resize(newWidth, VImage::option()->set("vscale", newHeight))
.gravity(VIPS_COMPASS_DIRECTION_CENTRE, width, pageHeight);
img.push_back(resized);
}
VImage final = VImage::arrayjoin(img, VImage::option()->set("across", 1));
final.set(VIPS_META_PAGE_HEIGHT, pageHeight);
if (*type != "gif") {
vector<int> delay(30, 50);
final.set("delay", delay);
}
void *buf;
final.write_to_buffer(".gif", &buf, DataSize);
*type = "gif";
vips_error_clear();
vips_thread_shutdown();
return result;
return (char *)buf;
}

6
natives/squish.h
View file

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