Merge pull request atduskgreg#75 from jbobrow/flowFix

atduskgreg · atduskgreg · commit 157888a5df87 · 2015-04-20T12:37:24.000-04:00
Region Flow Fix
diff --git a/src/gab/opencv/Flow.java b/src/gab/opencv/Flow.java
@@ -59,7 +59,7 @@ public PVector getTotalFlowInRegion(int x, int y, int w, int h) {
 
 	public PVector getAverageFlowInRegion(int x, int y, int w, int h) {
 	    PVector total = getTotalFlowInRegion(x, y, w, h);
-	    return new PVector(total.x/(flow.width() * flow.height()), total.y/(flow.width()*flow.height()));
+	    return new PVector(total.x/(w*h), total.y/(w*h));
 	}
 
 	public PVector getTotalFlow() {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public PVector getTotalFlowInRegion(int x, int y, int w, int h) {`
`59`	`59`
`60`	`60`	`public PVector getAverageFlowInRegion(int x, int y, int w, int h) {`
`61`	`61`	`PVector total = getTotalFlowInRegion(x, y, w, h);`
`62`		`- return new PVector(total.x/(flow.width() * flow.height()), total.y/(flow.width()*flow.height()));`
	`62`	`+ return new PVector(total.x/(wh), total.y/(wh));`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public PVector getTotalFlow() {`