highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-09 19:52:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rotate after resize; Use most vips functions directly

Browse Source
This commit is contained in:
DarthSim
2017-10-16 17:40:24 +06:00
parent 78b9fd50a2
commit 50e68556d0
2 changed files with 81 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
vips.h
View File

@@ -11,7 +11,8 @@
#define EXIF_ORIENTATION "exif-ifd0-Orientation"
enum types {
JPEG = 0,
UNKNOWN = 0,
JPEG,
PNG,
WEBP,
GIF
@@ -32,12 +33,6 @@ g_free_go(void **buf) {
g_free(*buf);
}
VipsAccess
access_mode(int random) {
if (random > 0) return VIPS_ACCESS_RANDOM;
return VIPS_ACCESS_SEQUENTIAL;
}
void
swap_and_clear(VipsImage **in, VipsImage *out) {
clear_image(in);
@@ -76,27 +71,20 @@ vips_type_find_save_go(int imgtype) {
}
int
vips_jpegload_buffer_go(void *buf, size_t len, VipsImage **out, int random) {
return vips_jpegload_buffer(buf, len, out, "access", access_mode(random), NULL);
}
int
vips_pngload_buffer_go(void *buf, size_t len, VipsImage **out, int random) {
return vips_pngload_buffer(buf, len, out, "access", access_mode(random), NULL);
}
int
vips_gifload_buffer_go(void *buf, size_t len, VipsImage **out, int random) {
#if VIPS_SUPPORT_GIF
return vips_gifload_buffer(buf, len, out, "access", access_mode(random), NULL);
#else
return 0;
#endif
}
int
vips_webpload_buffer_go(void *buf, size_t len, VipsImage **out, int random) {
return vips_webpload_buffer(buf, len, out, "access", access_mode(random), NULL);
vips_load_buffer(void *buf, size_t len, int imgtype, VipsImage **out) {
switch (imgtype) {
case JPEG:
return vips_jpegload_buffer(buf, len, out, "access", VIPS_ACCESS_SEQUENTIAL, NULL);
case PNG:
return vips_pngload_buffer(buf, len, out, "access", VIPS_ACCESS_SEQUENTIAL, NULL);
case WEBP:
return vips_webpload_buffer(buf, len, out, "access", VIPS_ACCESS_SEQUENTIAL, NULL);
#if VIPS_SUPPORT_GIF
case GIF:
return vips_gifload_buffer(buf, len, out, "access", VIPS_ACCESS_SEQUENTIAL, NULL);
#endif
}
return 1;
}
int
@@ -111,39 +99,6 @@ vips_get_exif_orientation(VipsImage *image) {
return 1;
}
int
vips_exif_rotate(VipsImage **img, int orientation) {
int err;
int angle = VIPS_ANGLE_D0;
gboolean flip = FALSE;
VipsImage *tmp;
if (orientation == 3 || orientation == 4) angle = VIPS_ANGLE_D180;
if (orientation == 5 || orientation == 6) angle = VIPS_ANGLE_D90;
if (orientation == 7 || orientation == 8) angle = VIPS_ANGLE_D270;
if (orientation == 2 || orientation == 4 || orientation == 5 || orientation == 7) {
flip = TRUE;
}
err = vips_rot(*img, &tmp, angle, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return err; }
if (flip) {
err = vips_flip(*img, &tmp, VIPS_DIRECTION_HORIZONTAL, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return err; }
}
return 0;
}
int
vips_resize_go(VipsImage *in, VipsImage **out, double scale) {
return vips_resize(in, out, scale, NULL);
}
int
vips_support_smartcrop() {
#if VIPS_SUPPORT_SMARTCROP
@@ -154,55 +109,50 @@ vips_support_smartcrop() {
}
int
vips_smartcrop_go(VipsImage *in, VipsImage **out, int width, int height) {
#if VIPS_SUPPORT_SMARTCROP
return vips_smartcrop(in, out, width, height, NULL);
#else
return 0;
#endif
}
int
vips_colourspace_go(VipsImage *in, VipsImage **out, VipsInterpretation space) {
return vips_colourspace(in, out, space, NULL);
}
int
vips_extract_area_go(VipsImage *in, VipsImage **out, int left, int top, int width, int height) {
return vips_extract_area(in, out, left, top, width, height, NULL);
}
int
vips_process_image(VipsImage **img, int resize, double scale, int crop, int smart, int left, int top, int width, int height) {
vips_process_image(VipsImage **img, gboolean resize, double scale, gboolean crop, gboolean smart, int left, int top, int width, int height, VipsAngle angle, gboolean flip) {
VipsImage *tmp;
int err;
int exif_orientation = vips_get_exif_orientation(*img);
if (exif_orientation > 1) {
vips_exif_rotate(img, exif_orientation);
if (err > 0) { return 1; }
}
if (resize > 0) {
err = vips_resize_go(*img, &tmp, scale);
if (resize && scale != 1.0) {
err = vips_resize(*img, &tmp, scale, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return 1; }
}
if (crop > 0) {
if (smart > 0) {
err = vips_smartcrop_go(*img, &tmp, width, height);
if (angle != VIPS_ANGLE_D0 || flip) {
tmp = vips_image_copy_memory(*img);
swap_and_clear(img, tmp);
if (tmp == NULL) { return 1; }
if (angle != VIPS_ANGLE_D0) {
err = vips_rot(*img, &tmp, angle, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return err; }
}
if (flip) {
err = vips_flip(*img, &tmp, VIPS_DIRECTION_HORIZONTAL, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return err; }
}
}
if (crop) {
if (smart) {
#if VIPS_SUPPORT_SMARTCROP
err = vips_smartcrop(*img, &tmp, width, height, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return 1; }
#endif
} else {
vips_extract_area_go(*img, &tmp, left, top, width, height);
vips_extract_area(*img, &tmp, left, top, width, height, NULL);
swap_and_clear(img, tmp);
if (err > 0) { return 1; }
}
}
if (vips_image_guess_interpretation(*img) != VIPS_INTERPRETATION_sRGB) {
err = vips_colourspace_go(*img, &tmp, VIPS_INTERPRETATION_sRGB);
err = vips_colourspace(*img, &tmp, VIPS_INTERPRETATION_sRGB, NULL);
swap_and_clear(img, tmp);
}