From: Callum Date: Sat, 26 Oct 2013 07:27:13 +0000 (-0700) Subject: Merge pull request #67 from Callum-/master X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=d85d3dc85940572c0a516dbf3217ab240ca00a6e;hp=88497ad20dbc7b92041ad5d441b26e2bfc0775a5;p=matches%2FMCTX3420.git Merge pull request #67 from Callum-/master Added some more tests --- diff --git a/testing/Camera/test 1/test_blurred.jpg b/testing/Camera/test 1/test_blurred.jpg new file mode 100644 index 0000000..78c484d Binary files /dev/null and b/testing/Camera/test 1/test_blurred.jpg differ diff --git a/testing/Camera/test 1/test_edge.jpg b/testing/Camera/test 1/test_edge.jpg new file mode 100644 index 0000000..9b076f8 Binary files /dev/null and b/testing/Camera/test 1/test_edge.jpg differ diff --git a/testing/Camera/test 1/test_edge_avg.jpg b/testing/Camera/test 1/test_edge_avg.jpg new file mode 100644 index 0000000..45ff0bd Binary files /dev/null and b/testing/Camera/test 1/test_edge_avg.jpg differ diff --git a/testing/Camera/test 1/testimage.jpg b/testing/Camera/test 1/testimage.jpg new file mode 100644 index 0000000..caaf9e6 Binary files /dev/null and b/testing/Camera/test 1/testimage.jpg differ diff --git a/testing/Camera/test 1/values b/testing/Camera/test 1/values new file mode 100644 index 0000000..f7e99b7 --- /dev/null +++ b/testing/Camera/test 1/values @@ -0,0 +1,2 @@ +Blur = 9,9 +Low threshold = 35 diff --git a/testing/Camera/test 1/values~ b/testing/Camera/test 1/values~ new file mode 100644 index 0000000..e69de29 diff --git a/testing/Camera/test 2/test_blurred.jpg b/testing/Camera/test 2/test_blurred.jpg new file mode 100644 index 0000000..72ece1a Binary files /dev/null and b/testing/Camera/test 2/test_blurred.jpg differ diff --git a/testing/Camera/test 2/test_edge.jpg b/testing/Camera/test 2/test_edge.jpg new file mode 100644 index 0000000..4e87ccb Binary files /dev/null and b/testing/Camera/test 2/test_edge.jpg differ diff --git a/testing/Camera/test 2/test_edge_avg.jpg b/testing/Camera/test 2/test_edge_avg.jpg new file mode 100644 index 0000000..bc6248b Binary files /dev/null and b/testing/Camera/test 2/test_edge_avg.jpg differ diff --git a/testing/Camera/test 2/testimage2.jpg b/testing/Camera/test 2/testimage2.jpg new file mode 100644 index 0000000..ef47265 Binary files /dev/null and b/testing/Camera/test 2/testimage2.jpg differ diff --git a/testing/Camera/test 2/values b/testing/Camera/test 2/values new file mode 100644 index 0000000..f7e99b7 --- /dev/null +++ b/testing/Camera/test 2/values @@ -0,0 +1,2 @@ +Blur = 9,9 +Low threshold = 35 diff --git a/testing/Camera/test 3/test_blurred.jpg b/testing/Camera/test 3/test_blurred.jpg new file mode 100644 index 0000000..e76fa63 Binary files /dev/null and b/testing/Camera/test 3/test_blurred.jpg differ diff --git a/testing/Camera/test 3/test_edge.jpg b/testing/Camera/test 3/test_edge.jpg new file mode 100644 index 0000000..e35e374 Binary files /dev/null and b/testing/Camera/test 3/test_edge.jpg differ diff --git a/testing/Camera/test 3/test_edge_avg.jpg b/testing/Camera/test 3/test_edge_avg.jpg new file mode 100644 index 0000000..7d41059 Binary files /dev/null and b/testing/Camera/test 3/test_edge_avg.jpg differ diff --git a/testing/Camera/test 3/testimage2.jpg b/testing/Camera/test 3/testimage2.jpg new file mode 100644 index 0000000..ef47265 Binary files /dev/null and b/testing/Camera/test 3/testimage2.jpg differ diff --git a/testing/Camera/test 3/values b/testing/Camera/test 3/values new file mode 100644 index 0000000..0ed6414 --- /dev/null +++ b/testing/Camera/test 3/values @@ -0,0 +1,2 @@ +Blur = 5,5 +Low threshold = 40 diff --git a/testing/Camera/test 3/values~ b/testing/Camera/test 3/values~ new file mode 100644 index 0000000..f7e99b7 --- /dev/null +++ b/testing/Camera/test 3/values~ @@ -0,0 +1,2 @@ +Blur = 9,9 +Low threshold = 35 diff --git a/testing/Camera/test 4/test_blurred.jpg b/testing/Camera/test 4/test_blurred.jpg new file mode 100644 index 0000000..73c4e62 Binary files /dev/null and b/testing/Camera/test 4/test_blurred.jpg differ diff --git a/testing/Camera/test 4/test_edge.jpg b/testing/Camera/test 4/test_edge.jpg new file mode 100644 index 0000000..323b365 Binary files /dev/null and b/testing/Camera/test 4/test_edge.jpg differ diff --git a/testing/Camera/test 4/test_edge_avg.jpg b/testing/Camera/test 4/test_edge_avg.jpg new file mode 100644 index 0000000..7849485 Binary files /dev/null and b/testing/Camera/test 4/test_edge_avg.jpg differ diff --git a/testing/Camera/test 4/testimage2.jpg b/testing/Camera/test 4/testimage2.jpg new file mode 100644 index 0000000..ef47265 Binary files /dev/null and b/testing/Camera/test 4/testimage2.jpg differ diff --git a/testing/Camera/test 4/values b/testing/Camera/test 4/values new file mode 100644 index 0000000..2ad1fb1 --- /dev/null +++ b/testing/Camera/test 4/values @@ -0,0 +1,2 @@ +Blur = 7,7 +Low threshold = 36 diff --git a/testing/Camera/test 4/values~ b/testing/Camera/test 4/values~ new file mode 100644 index 0000000..2ad1fb1 --- /dev/null +++ b/testing/Camera/test 4/values~ @@ -0,0 +1,2 @@ +Blur = 7,7 +Low threshold = 36 diff --git a/testing/Camera/test 5/test_blurred.jpg b/testing/Camera/test 5/test_blurred.jpg new file mode 100644 index 0000000..e136542 Binary files /dev/null and b/testing/Camera/test 5/test_blurred.jpg differ diff --git a/testing/Camera/test 5/test_edge.jpg b/testing/Camera/test 5/test_edge.jpg new file mode 100644 index 0000000..2100541 Binary files /dev/null and b/testing/Camera/test 5/test_edge.jpg differ diff --git a/testing/Camera/test 5/test_edge_avg.jpg b/testing/Camera/test 5/test_edge_avg.jpg new file mode 100644 index 0000000..9cbc9a4 Binary files /dev/null and b/testing/Camera/test 5/test_edge_avg.jpg differ diff --git a/testing/Camera/test 5/testimage.jpg b/testing/Camera/test 5/testimage.jpg new file mode 100644 index 0000000..caaf9e6 Binary files /dev/null and b/testing/Camera/test 5/testimage.jpg differ diff --git a/testing/Camera/test 5/values b/testing/Camera/test 5/values new file mode 100644 index 0000000..0149619 --- /dev/null +++ b/testing/Camera/test 5/values @@ -0,0 +1,2 @@ +Blur = 5,5 +Low threshold = 35 diff --git a/testing/Camera/test 5/values~ b/testing/Camera/test 5/values~ new file mode 100644 index 0000000..2ad1fb1 --- /dev/null +++ b/testing/Camera/test 5/values~ @@ -0,0 +1,2 @@ +Blur = 7,7 +Low threshold = 36