added plugin hooks so that imagemagick can still be called, as a plugin, for image manipulation tasks, falling back to using lwip

src/image.js

@@ -1,31 +1,48 @@
 'use strict';
 
 var fs = require('fs'),
-	lwip = require('lwip');
+	lwip = require('lwip'),
+	plugins = require('./plugins');
 
 var image = {};
 
 image.resizeImage = function(path, extension, width, height, callback) {
-	lwip.open(path, function(err, image) {
+	if (plugins.hasListeners('filter:image.resize')) {
-		image.batch()
+		plugins.fireHook('filter:image.resize', {
-			.cover(width, height)
+			path: path,
-			.crop(width, height)
+			extension: extension,
-			.writeFile(path, function(err) {
+			width: width,
-				callback(err)
+			height: height
-			})
+		}, function(err, data) {
+			callback(err);
 		});
+	} else {
+		lwip.open(path, function(err, image) {
+			image.batch()
+				.cover(width, height)
+				.crop(width, height)
+				.writeFile(path, function(err) {
+					callback(err)
+				})
+			});
+	}
 };
 
-image.convertImageToPng = function(path, extension, callback) {
+image.normalise = function(path, extension, callback) {
-	if(extension !== '.png') {
+	if (plugins.hasListeners('filter:image.normalise')) {
+		plugins.fireHook('filter:image.normalise', {
+			path: path,
+			extension: extension
+		}, function(err, data) {
+			callback(err);
+		});
+	} else {
 		lwip.open(path, function(err, image) {
 			if (err) {
 				return callback(err);
 			}
 			image.writeFile(path, 'png', callback)
 		});
-	} else {
-		callback();
 	}
 };
 

src/user/picture.js

@@ -41,7 +41,7 @@ module.exports = function(User) {
 			},
 			function(next) {
 				if (convertToPNG) {
-					image.convertImageToPng(picture.path, extension, next);
+					image.normalise(picture.path, extension, next);
 				} else {
 					next();
 				}