add options for automatic quality and file type conversion and iptc meta

Author: justincarter

packages/forms/configCloudinary.cfc

@@ -18,5 +18,21 @@
 				name="autoUploadFolder" type="string"
 				ftHint="The auto upload folder for this appliation. Should start with '/'." />
 
-	
+
+	<cfproperty ftSeq="10" ftFieldset="Options" ftLabel="Automatic Image File Format"
+				name="formatAuto" type="boolean" default="1" ftDefault="1"
+				ftType="boolean" ftRenderType="checkbox"
+				ftHint="Cloudinary will automatically select the best image format" />
+
+	<cfproperty ftSeq="11" ftFieldset="Options" ftLabel="Automatic Image Quality"
+				name="qualityAuto" type="boolean" default="1" ftDefault="1"
+				ftType="boolean" ftRenderType="checkbox"
+				ftHint="Cloudinary will automatically select the best image quality vs file size" />
+
+	<cfproperty ftSeq="12" ftFieldset="Options" ftLabel="Keep IPTC Metadata"
+				name="keepIPTC" type="boolean" default="0" ftDefault="0"
+				ftType="boolean" ftRenderType="checkbox"
+				ftHint="Cloudinary will retain IPTC Metadata. NOTE: This will NOT WORK if automatic image quality is selected above." />
+
+
 </cfcomponent>

packages/formtools/image.cfc

@@ -372,7 +372,7 @@
 		<cfargument name="padColor" type="string" required="false" default="##ffffff" hint="If AutoGenerateType='Pad', image will be padded with this colour" />
 		<cfargument name="customEffectsObjName" type="string" required="true" default="imageEffects" hint="The object name to run the effects on (must be in the package path)" />
 		<cfargument name="lCustomEffects" type="string" required="false" default="" hint="List of methods to run for effects with their arguments and values. The methods are order dependant replecting how they are listed here. Example: ftLCustomEffects=""roundCorners();reflect(opacity=40,backgroundColor='black');""" />
-		<cfargument name="convertImageToFormat" type="string" required="false" default="" hint6="Convert image to a specific format. Set value to image extension. Example: 'gif'. Leave blank for no conversion. Default=blank (no conversion)" />
+		<cfargument name="convertImageToFormat" type="string" required="false" default="" hint="Convert image to a specific format. Set value to image extension. Example: 'gif'. Leave blank for no conversion. Default=blank (no conversion)" />
 		<cfargument name="bSetAntialiasing" type="boolean" required="true" default="true" hint="Use Antialiasing (better image, but slower performance)" />
 		<cfargument name="interpolation" type="string" required="true" default="blackman" hint="set the interpolation level on the image compression" />
 		<cfargument name="quality" type="string" required="false" default="0.8" hint="Quality of the JPEG destination file. Applies only to files with an extension of JPG or JPEG. Valid values are fractions that range from 0 through 1 (the lower the number, the lower the quality). Examples: 1, 0.9, 0.1. Default = 0.8" />

packages/lib/cloudinary.cfc

@@ -25,9 +25,25 @@
 
 	public string function getTransform(numeric width=0, numeric height=0, string crop="FitInside", string format=""){
 
-		var transform = "fl_keep_iptc";
+		var transform = "";
 		var pixels = "";
-		
+
+		if (arguments.format == "" && application.fapi.getConfig("cloudinary", "formatAuto", 1) == 1) {
+			// enable automatic file format conversion
+			arguments.format = "auto";
+		}
+
+		if (application.fapi.getConfig("cloudinary", "qualityAuto", 1) == 1) {
+			// enable automatic image quality
+			transform = listappend(transform, "q_auto");
+		}
+		else {
+			if (application.fapi.getConfig("cloudinary", "keepIPTC", 0) == 1) {
+				// retain IPTC metadata only if auto image quality is NOT used
+				transform = listappend(transform, "fl_keep_iptc");
+			}
+		}
+
 		switch (lcase(arguments.crop)){
 			case "forcesize":
 				// Simply force the resize of the image into the width/height provided
@@ -159,6 +175,7 @@
 				break;
 			case "auto":
 				transform = listappend(transform, "f_auto");
+				break;
 		}
 
 		return transform;