azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

return & use lwip-stripped image in skins.save_image

Browse Source 
no need to pass along (possibly) bulky or broken images!
see #147
This commit is contained in:
jomo 2015-09-29 23:32:16 +02:00
parent 6fbfd6c355
commit fd4fb0764c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/helpers.js
View File

@ -42,7 +42,7 @@ function store_skin(rid, userId, profile, cache_details, callback) {
if (err1 || !img) { if (err1 || !img) {
callback(err1, null); callback(err1, null);
} else { } else {
skins.save_image(img, skinpath, function(skin_err) { skins.save_image(img, skinpath, function(skin_err, skin_img) {
if (skin_err) { if (skin_err) {
callback(skin_err, null); callback(skin_err, null);
} else { } else {
@ -95,7 +95,7 @@ function store_cape(rid, userId, profile, cache_details, callback) {
if (net_err || !img) { if (net_err || !img) {
callback(net_err, null); callback(net_err, null);
} else { } else {
skins.save_image(img, capepath, function(skin_err) { skins.save_image(img, capepath, function(skin_err, skin_img) {
logging.debug(rid, "cape saved"); logging.debug(rid, "cape saved");
callback(skin_err, cape_hash); callback(skin_err, cape_hash);
}); });

4
lib/networking.js
View File

@ -197,8 +197,8 @@ exp.save_texture = function(rid, tex_hash, outpath, callback) {
if (err) { if (err) {
callback(err, response, null); callback(err, response, null);
} else { } else {
skins.save_image(img, outpath, function(img_err) { skins.save_image(img, outpath, function(img_err, saved_img) {
callback(img_err, response, img); callback(img_err, response, saved_img);
}); });
} }
}); });

12
lib/skins.js
View File

@ -134,18 +134,18 @@ exp.open_skin = function(rid, skinpath, callback) {
}; };
// write the image +buffer+ to the +outpath+ file // write the image +buffer+ to the +outpath+ file
// callback: error // the image is stripped down by lwip.
// callback: error, image
exp.save_image = function(buffer, outpath, callback) { exp.save_image = function(buffer, outpath, callback) {
lwip.open(buffer, "png", function(err, image) { lwip.open(buffer, "png", function(err, image) {
if (err) { if (err) {
callback(err); callback(err, image);
} else { } else {
image.batch() image.writeFile(outpath, function(write_err) {
.writeFile(outpath, function(write_err) {
if (write_err) { if (write_err) {
callback(write_err); callback(write_err, image);
} else { } else {
callback(null); callback(null, image);
} }
}); });
} }