Add face detection and update algorithm

pom.xml

@@ -13,6 +13,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv-platform</artifactId>
+            <version>1.4.4</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/com/github/quadflask/smartcrop/Boost.java

@@ -0,0 +1,9 @@
+package com.github.quadflask.smartcrop;
+
+public class Boost {
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public float weight;
+}

src/main/java/com/github/quadflask/smartcrop/CropResult.java

@@ -1,22 +1,17 @@
 package com.github.quadflask.smartcrop;
 
-import java.awt.image.BufferedImage;
 import java.util.List;
 
 public class CropResult {
 	public final Crop topCrop;
 	public final List<Crop> crops;
-	public final BufferedImage debugImage;
-	public final BufferedImage resultImage;
 
-	private CropResult(Crop topCrop, List<Crop> crops, BufferedImage debugImage, BufferedImage resultImage) {
+	private CropResult(Crop topCrop, List<Crop> crops) {
 		this.topCrop = topCrop;
 		this.crops = crops;
-		this.debugImage = debugImage;
-		this.resultImage = resultImage;
 	}
 
-	static CropResult newInstance(Crop topCrop, List<Crop> crops, BufferedImage debugImage, BufferedImage resultImage) {
-		return new CropResult(topCrop, crops, debugImage, resultImage);
+	static CropResult newInstance(Crop topCrop, List<Crop> crops) {
+		return new CropResult(topCrop, crops);
 	}
 }

src/main/java/com/github/quadflask/smartcrop/Options.java

@@ -1,18 +1,20 @@
 package com.github.quadflask.smartcrop;
 
-import java.awt.image.BufferedImage;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Created by flask on 2015. 10. 30..
  */
 public class Options {
-	public static final Options DEFAULT = new Options();
-
-	private int cropWidth = 100;
-	private int cropHeight = 100;
-	private float detailWeight = .2f;
-	private float[] skinColor = {0.7f, 0.57f, 0.44f};
-	private float skinBias = .01f;
+	private float width = 0.0f;
+	private float height = 0.0f;
+	private float aspect = 0.0f;
+	private int cropWidth = 0;
+	private int cropHeight = 0;
+	private float detailWeight = 0.2f;
+	private float[] skinColor = {0.78f, 0.57f, 0.44f};
+	private float skinBias = 0.01f;
 	private float skinBrightnessMin = 0.2f;
 	private float skinBrightnessMax = 1.0f;
 	private float skinThreshold = 0.8f;
@@ -21,18 +23,47 @@ public class Options {
 	private float saturationBrightnessMax = 0.9f;
 	private float saturationThreshold = 0.4f;
 	private float saturationBias = 0.2f;
-	private float saturationWeight = 0.3f;
+	private float saturationWeight = 0.1f;
 	// step * minscale rounded down to the next power of two should be good
 	private int scoreDownSample = 8;
-	//	private int step = 8;
+	private int step = 8;
 	private float scaleStep = 0.1f;
 	private float minScale = 0.8f;
 	private float maxScale = 1.0f;
 	private float edgeRadius = 0.4f;
 	private float edgeWeight = -20f;
 	private float outsideImportance = -.5f;
-	private boolean ruleOfThirds = false;
-	private int bufferedBitmapType = BufferedImage.TYPE_INT_ARGB;
+	private List<Boost> boost = Collections.emptyList();
+	private float boostWeight = 100.0f;
+	private boolean ruleOfThirds = true;
+	private boolean prescale = false;
+
+	public float getWidth() {
+		return width;
+	}
+
+	public Options width(float width) {
+		this.width = width;
+		return this;
+	}
+
+	public float getHeight() {
+		return height;
+	}
+
+	public Options height(float height) {
+		this.height = height;
+		return this;
+	}
+
+	public float getAspect() {
+		return aspect;
+	}
+
+	public Options aspect(float aspect) {
+		this.aspect = aspect;
+		return this;
+	}
 
 	public int getCropWidth() {
 		return cropWidth;
@@ -169,6 +200,15 @@ public Options scoreDownSample(int scoreDownSample) {
 		return this;
 	}
 
+	public int getStep() {
+		return step;
+	}
+
+	public Options step(int step) {
+		this.step = step;
+		return this;
+	}
+
 	public float getScaleStep() {
 		return scaleStep;
 	}
@@ -223,6 +263,24 @@ public Options outsideImportance(float outsideImportance) {
 		return this;
 	}
 
+	public Options boost(List<Boost> boost) {
+		this.boost = boost;
+		return this;
+	}
+
+	public List<Boost> getBoost() {
+		return boost;
+	}
+
+	public Options boostWeight(float boostWeight) {
+		this.boostWeight = boostWeight;
+		return this;
+	}
+
+	public float getBoostWeight() {
+		return boostWeight;
+	}
+
 	public boolean isRuleOfThirds() {
 		return ruleOfThirds;
 	}
@@ -232,12 +290,12 @@ public Options ruleOfThirds(boolean ruleOfThirds) {
 		return this;
 	}
 
-	public int getBufferedBitmapType() {
-		return bufferedBitmapType;
+	public boolean isPrescale() {
+		return prescale;
 	}
 
-	public Options bufferedBitmapType(int bufferedBitmapType) {
-		this.bufferedBitmapType = bufferedBitmapType;
+	public Options prescale(boolean prescale) {
+		this.prescale = prescale;
 		return this;
 	}
 }

src/main/java/com/github/quadflask/smartcrop/Score.java

@@ -4,5 +4,6 @@ public class Score {
 	public float detail;
 	public float saturation;
 	public float skin;
+	public float boost;
 	public float total;
 }