aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Bowyer <adrian@reprappro.com>2017-09-26 12:07:26 +0100
committerAdrian Bowyer <adrian@reprappro.com>2017-09-26 12:07:26 +0100
commit731a2f6577eb6fab9250964729871ab13f4b60d9 (patch)
tree47424855c75e2934520059096ce66e3a7746926e /src
parent102fa28ac732295b66f8f484c830ae695fd9bd9e (diff)
Final (?) version of the Reichardt-Hassenstein filter.
Diffstat (limited to 'src')
-rw-r--r--src/.deps/callbacks.Po12
-rw-r--r--src/.deps/camorama-display.Po12
-rw-r--r--src/.deps/camorama-filter-reichardt.Po66
-rw-r--r--src/.deps/camorama-stock-items.Po12
-rw-r--r--src/.deps/camorama-window.Po12
-rw-r--r--src/.deps/fileio.Po12
-rw-r--r--src/.deps/filter.Po12
-rw-r--r--src/.deps/main.Po12
-rw-r--r--src/.deps/support.Po12
-rw-r--r--src/.deps/v4l.Po12
-rw-r--r--src/Makefile6
-rw-r--r--src/callbacks.obin111296 -> 111104 bytes
-rwxr-xr-xsrc/camoramabin355392 -> 355728 bytes
-rw-r--r--src/camorama-display.obin81136 -> 81136 bytes
-rw-r--r--src/camorama-filter-chain.obin24128 -> 24136 bytes
-rw-r--r--src/camorama-filter-laplace.obin19736 -> 19720 bytes
-rw-r--r--src/camorama-filter-mirror.obin16088 -> 16096 bytes
-rw-r--r--src/camorama-filter-reichardt.c121
-rw-r--r--src/camorama-filter-reichardt.obin28152 -> 28784 bytes
-rw-r--r--src/camorama-stock-items.obin21472 -> 21544 bytes
-rw-r--r--src/camorama-window.obin137984 -> 137928 bytes
-rwxr-xr-xsrc/camorama.xbin0 -> 355392 bytes
-rw-r--r--src/fileio.obin60576 -> 60576 bytes
-rw-r--r--src/filter.obin73680 -> 73664 bytes
-rw-r--r--src/main.obin61720 -> 61704 bytes
-rw-r--r--src/support.obin48256 -> 48264 bytes
-rw-r--r--src/v4l.obin52856 -> 52832 bytes
27 files changed, 259 insertions, 42 deletions
diff --git a/src/.deps/callbacks.Po b/src/.deps/callbacks.Po
index 2d13901..867e48f 100644
--- a/src/.deps/callbacks.Po
+++ b/src/.deps/callbacks.Po
@@ -149,6 +149,7 @@ callbacks.o: callbacks.c /usr/include/stdc-predef.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -164,6 +165,9 @@ callbacks.o: callbacks.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1113,6 +1117,8 @@ callbacks.o: callbacks.c /usr/include/stdc-predef.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1143,6 +1149,12 @@ callbacks.o: callbacks.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/camorama-display.Po b/src/.deps/camorama-display.Po
index 75ebe72..f0e9130 100644
--- a/src/.deps/camorama-display.Po
+++ b/src/.deps/camorama-display.Po
@@ -150,6 +150,7 @@ camorama-display.o: camorama-display.c /usr/include/stdc-predef.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -165,6 +166,9 @@ camorama-display.o: camorama-display.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -961,6 +965,8 @@ camorama-display.h:
/usr/include/x86_64-linux-gnu/bits/unistd.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -991,6 +997,12 @@ camorama-display.h:
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/camorama-filter-reichardt.Po b/src/.deps/camorama-filter-reichardt.Po
index 1539d07..137fa54 100644
--- a/src/.deps/camorama-filter-reichardt.Po
+++ b/src/.deps/camorama-filter-reichardt.Po
@@ -1,5 +1,20 @@
camorama-filter-reichardt.o: camorama-filter-reichardt.c \
- /usr/include/stdc-predef.h filter.h /usr/include/glib-2.0/glib-object.h \
+ /usr/include/stdc-predef.h /usr/include/math.h /usr/include/features.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/math-vector.h \
+ /usr/include/x86_64-linux-gnu/bits/libm-simd-decl-stubs.h \
+ /usr/include/x86_64-linux-gnu/bits/huge_val.h \
+ /usr/include/x86_64-linux-gnu/bits/huge_valf.h \
+ /usr/include/x86_64-linux-gnu/bits/huge_vall.h \
+ /usr/include/x86_64-linux-gnu/bits/inf.h \
+ /usr/include/x86_64-linux-gnu/bits/nan.h \
+ /usr/include/x86_64-linux-gnu/bits/mathdef.h \
+ /usr/include/x86_64-linux-gnu/bits/mathcalls.h \
+ /usr/include/x86_64-linux-gnu/bits/mathinline.h filter.h \
+ /usr/include/glib-2.0/glib-object.h \
/usr/include/glib-2.0/gobject/gbinding.h /usr/include/glib-2.0/glib.h \
/usr/include/glib-2.0/glib/galloca.h /usr/include/glib-2.0/glib/gtypes.h \
/usr/lib/x86_64-linux-gnu/glib-2.0/include/glibconfig.h \
@@ -7,12 +22,7 @@ camorama-filter-reichardt.o: camorama-filter-reichardt.c \
/usr/lib/gcc/x86_64-linux-gnu/5/include/stddef.h \
/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/limits.h \
/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed/syslimits.h \
- /usr/include/limits.h /usr/include/features.h \
- /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
+ /usr/include/limits.h /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
/usr/include/x86_64-linux-gnu/bits/local_lim.h \
/usr/include/linux/limits.h \
/usr/include/x86_64-linux-gnu/bits/posix2_lim.h \
@@ -136,6 +146,38 @@ camorama-filter-reichardt.o: camorama-filter-reichardt.c \
/usr/include/stdc-predef.h:
+/usr/include/math.h:
+
+/usr/include/features.h:
+
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+
+/usr/include/x86_64-linux-gnu/bits/math-vector.h:
+
+/usr/include/x86_64-linux-gnu/bits/libm-simd-decl-stubs.h:
+
+/usr/include/x86_64-linux-gnu/bits/huge_val.h:
+
+/usr/include/x86_64-linux-gnu/bits/huge_valf.h:
+
+/usr/include/x86_64-linux-gnu/bits/huge_vall.h:
+
+/usr/include/x86_64-linux-gnu/bits/inf.h:
+
+/usr/include/x86_64-linux-gnu/bits/nan.h:
+
+/usr/include/x86_64-linux-gnu/bits/mathdef.h:
+
+/usr/include/x86_64-linux-gnu/bits/mathcalls.h:
+
+/usr/include/x86_64-linux-gnu/bits/mathinline.h:
+
filter.h:
/usr/include/glib-2.0/glib-object.h:
@@ -160,16 +202,6 @@ filter.h:
/usr/include/limits.h:
-/usr/include/features.h:
-
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
-
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
-
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
-
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
-
/usr/include/x86_64-linux-gnu/bits/posix1_lim.h:
/usr/include/x86_64-linux-gnu/bits/local_lim.h:
diff --git a/src/.deps/camorama-stock-items.Po b/src/.deps/camorama-stock-items.Po
index f10c0a3..c83962c 100644
--- a/src/.deps/camorama-stock-items.Po
+++ b/src/.deps/camorama-stock-items.Po
@@ -155,6 +155,7 @@ camorama-stock-items.o: camorama-stock-items.c /usr/include/stdc-predef.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -170,6 +171,9 @@ camorama-stock-items.o: camorama-stock-items.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -715,6 +719,8 @@ camorama-stock-items.h:
/usr/include/x86_64-linux-gnu/bits/unistd.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -745,6 +751,12 @@ camorama-stock-items.h:
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/camorama-window.Po b/src/.deps/camorama-window.Po
index d693c57..83c520f 100644
--- a/src/.deps/camorama-window.Po
+++ b/src/.deps/camorama-window.Po
@@ -178,6 +178,7 @@ camorama-window.o: camorama-window.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gconverterinputstream.h \
/usr/include/glib-2.0/gio/gconverteroutputstream.h \
/usr/include/glib-2.0/gio/gcredentials.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -193,6 +194,9 @@ camorama-window.o: camorama-window.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1086,6 +1090,8 @@ v4l.h:
/usr/include/glib-2.0/gio/gcredentials.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1116,6 +1122,12 @@ v4l.h:
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/fileio.Po b/src/.deps/fileio.Po
index bf0c2ec..5213fb7 100644
--- a/src/.deps/fileio.Po
+++ b/src/.deps/fileio.Po
@@ -178,6 +178,7 @@ fileio.o: fileio.c /usr/include/stdc-predef.h fileio.h v4l.h \
/usr/include/glib-2.0/gio/gconverterinputstream.h \
/usr/include/glib-2.0/gio/gconverteroutputstream.h \
/usr/include/glib-2.0/gio/gcredentials.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -193,6 +194,9 @@ fileio.o: fileio.c /usr/include/stdc-predef.h fileio.h v4l.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1189,6 +1193,8 @@ v4l.h:
/usr/include/glib-2.0/gio/gcredentials.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1219,6 +1225,12 @@ v4l.h:
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/filter.Po b/src/.deps/filter.Po
index 8440fd7..2c3c50e 100644
--- a/src/.deps/filter.Po
+++ b/src/.deps/filter.Po
@@ -180,6 +180,7 @@ filter.o: filter.c /usr/include/stdc-predef.h filter.h \
/usr/include/glib-2.0/gio/gconverterinputstream.h \
/usr/include/glib-2.0/gio/gconverteroutputstream.h \
/usr/include/glib-2.0/gio/gcredentials.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -195,6 +196,9 @@ filter.o: filter.c /usr/include/stdc-predef.h filter.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1048,6 +1052,8 @@ v4l.h:
/usr/include/glib-2.0/gio/gcredentials.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1078,6 +1084,12 @@ v4l.h:
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/main.Po b/src/.deps/main.Po
index ac1eecf..2311736 100644
--- a/src/.deps/main.Po
+++ b/src/.deps/main.Po
@@ -150,6 +150,7 @@ main.o: main.c /usr/include/stdc-predef.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -165,6 +166,9 @@ main.o: main.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1121,6 +1125,8 @@ main.o: main.c /usr/include/stdc-predef.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1151,6 +1157,12 @@ main.o: main.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/support.Po b/src/.deps/support.Po
index e9b9359..97fa2a2 100644
--- a/src/.deps/support.Po
+++ b/src/.deps/support.Po
@@ -155,6 +155,7 @@ support.o: support.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gconverterinputstream.h \
/usr/include/glib-2.0/gio/gconverteroutputstream.h \
/usr/include/glib-2.0/gio/gcredentials.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -170,6 +171,9 @@ support.o: support.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1129,6 +1133,8 @@ support.o: support.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gcredentials.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1159,6 +1165,12 @@ support.o: support.c /usr/include/stdc-predef.h \
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/.deps/v4l.Po b/src/.deps/v4l.Po
index 21d8287..098b006 100644
--- a/src/.deps/v4l.Po
+++ b/src/.deps/v4l.Po
@@ -177,6 +177,7 @@ v4l.o: v4l.c /usr/include/stdc-predef.h v4l.h /usr/include/unistd.h \
/usr/include/glib-2.0/gio/gconverterinputstream.h \
/usr/include/glib-2.0/gio/gconverteroutputstream.h \
/usr/include/glib-2.0/gio/gcredentials.h \
+ /usr/include/glib-2.0/gio/gdatagrambased.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -192,6 +193,9 @@ v4l.o: v4l.c /usr/include/stdc-predef.h v4l.h /usr/include/unistd.h \
/usr/include/glib-2.0/gio/gdbusserver.h \
/usr/include/glib-2.0/gio/gdbusutils.h \
/usr/include/glib-2.0/gio/gdrive.h \
+ /usr/include/glib-2.0/gio/gdtlsclientconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsconnection.h \
+ /usr/include/glib-2.0/gio/gdtlsserverconnection.h \
/usr/include/glib-2.0/gio/gemblemedicon.h \
/usr/include/glib-2.0/gio/gicon.h /usr/include/glib-2.0/gio/gemblem.h \
/usr/include/glib-2.0/gio/gfileattribute.h \
@@ -1149,6 +1153,8 @@ v4l.h:
/usr/include/glib-2.0/gio/gcredentials.h:
+/usr/include/glib-2.0/gio/gdatagrambased.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1179,6 +1185,12 @@ v4l.h:
/usr/include/glib-2.0/gio/gdrive.h:
+/usr/include/glib-2.0/gio/gdtlsclientconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsconnection.h:
+
+/usr/include/glib-2.0/gio/gdtlsserverconnection.h:
+
/usr/include/glib-2.0/gio/gemblemedicon.h:
/usr/include/glib-2.0/gio/gicon.h:
diff --git a/src/Makefile b/src/Makefile
index b4232ea..c06db3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -135,7 +135,7 @@ INTLTOOL_XML_NOMERGE_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_A
INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
LDFLAGS =
LIBOBJS =
-LIBS =
+LIBS = -lm
LTLIBOBJS =
MAKEINFO = ${SHELL} /home/ensab/Git/camorama/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
@@ -145,8 +145,8 @@ MSGFMT_OPTS = -c
OBJEXT = o
PACKAGE = camorama
PACKAGE_BUGREPORT = http://bugzilla.gnome.org/enter_bug.cgi?product=camorama
-PACKAGE_CFLAGS = -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/x86_64-linux-gnu/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libxml2
-PACKAGE_LIBS = -lgdk_pixbuf_xlib-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lgnomecanvas-2 -lart_lgpl_2 -lgnomevfs-2 -lgthread-2.0 -pthread -lgmodule-2.0 -pthread -lgconf-2 -lglade-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype -lxml2
+PACKAGE_CFLAGS = -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/x86_64-linux-gnu/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libxml2
+PACKAGE_LIBS = -lgdk_pixbuf_xlib-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lgnomecanvas-2 -lart_lgpl_2 -lgnomevfs-2 -lgthread-2.0 -pthread -lgmodule-2.0 -pthread -lgconf-2 -lglade-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype -lxml2
PACKAGE_NAME = camorama
PACKAGE_STRING = camorama 0.19
PACKAGE_TARNAME = camorama
diff --git a/src/callbacks.o b/src/callbacks.o
index e1c31d2..3cf0e40 100644
--- a/src/callbacks.o
+++ b/src/callbacks.o
Binary files differ
diff --git a/src/camorama b/src/camorama
index 1495b00..7c4b3fc 100755
--- a/src/camorama
+++ b/src/camorama
Binary files differ
diff --git a/src/camorama-display.o b/src/camorama-display.o
index 93d95ba..e70fe61 100644
--- a/src/camorama-display.o
+++ b/src/camorama-display.o
Binary files differ
diff --git a/src/camorama-filter-chain.o b/src/camorama-filter-chain.o
index 2434e97..d1d3991 100644
--- a/src/camorama-filter-chain.o
+++ b/src/camorama-filter-chain.o
Binary files differ
diff --git a/src/camorama-filter-laplace.o b/src/camorama-filter-laplace.o
index 4e35b4d..e3dde6e 100644
--- a/src/camorama-filter-laplace.o
+++ b/src/camorama-filter-laplace.o
Binary files differ
diff --git a/src/camorama-filter-mirror.o b/src/camorama-filter-mirror.o
index 565eb08..ab66bbe 100644
--- a/src/camorama-filter-mirror.o
+++ b/src/camorama-filter-mirror.o
Binary files differ
diff --git a/src/camorama-filter-reichardt.c b/src/camorama-filter-reichardt.c
index 1a5e7ac..a0e8cb5 100644
--- a/src/camorama-filter-reichardt.c
+++ b/src/camorama-filter-reichardt.c
@@ -23,14 +23,21 @@
/*
- Reichardt movement detection filter coded by Adrian Bowyer
+ Hassenstein-Reichardt movement detection filter written by Adrian Bowyer
12 September 2016
http://adrianbowyer.com
+ https://reprapltd.com
+
+ For an introduction to how this works in biological vision (fly's eyes and yours) see:
+
+ https://en.wikipedia.org/wiki/Motion_sensing_in_vision#The_Reichardt-Hassenstein_model
+
*/
+#include <math.h> // We just need one square root
#include "filter.h"
#ifdef HAVE_CONFIG_H
@@ -51,21 +58,33 @@ G_DEFINE_TYPE(CamoramaFilterReichardt, camorama_filter_reichardt, CAMORAMA_TYPE_
static void
camorama_filter_reichardt_init(CamoramaFilterReichardt* self) {}
+static int count = 0;
+
static gint oldWidth = -1;
static gint oldHeight = -1;
static gint oldDepth = -1;
+// Arrays for holding processed image memories
+
static long *lastSignal = 0;
static long *lastHigh = 0;
static long *lastHighThenLow = 0;
static long *output = 0;
+// Low and high pass filter time constants
+
static int lowPassTC = 1;
static int highPassTC = 5;
-static int count = 0;
+// Set to 1 to print debugging info on standard output
+
+char debug = 0;
+
+//---------------------------------------------------------------------------------------
-char debug = 0;
+
+// When we start, or when the image size changes, we need to malloc some space to put the
+// frame to frame calculations in.
static void MaybeNewMemory(gint width, gint height, gint depth)
{
@@ -125,18 +144,29 @@ static void MaybeNewMemory(gint width, gint height, gint depth)
}
+//--------------------------------------------------------------------------------------------------------------
+
+// This is the function that implements the filter
+
+
static void
camorama_filter_reichardt_filter(CamoramaFilter* filter, guchar *image, gint width, gint height, gint depth)
{
gint x, y, z, row_length, row, column, thisPixel, thisXY, thatXY;
- long signal, thisHigh, thisHighThenLow, thatHigh, thatHighThenLow, thatSignal, newValue, max, min, scale;
+ long signal, thisHigh, thisHighThenLow, thatHigh, thatHighThenLow, thatSignal, newValue, max, min, scale, mean, var;
MaybeNewMemory(width, height, depth);
max = LONG_MIN;
min = LONG_MAX;
thatSignal = 0;
+ mean = 0;
+ var = 0;
+
+ // Run through each pixel doing the filter calculation with the one
+ // immediately to its left. Note that this means that the extreme
+ // left (x=0) column of pixels is not filtered.
row_length = width * depth;
for(y = 0; y < height; y++)
@@ -149,7 +179,7 @@ camorama_filter_reichardt_filter(CamoramaFilter* filter, guchar *image, gint wid
thisXY = y*width+x;
thatXY = thisXY - 1;
- // Go to grey
+ // Go from colour to grey
signal = 0;
for (z = 0; z < depth; z++)
@@ -171,7 +201,10 @@ camorama_filter_reichardt_filter(CamoramaFilter* filter, guchar *image, gint wid
if(newValue > max)
max = newValue;
if(newValue < min)
- min = newValue;
+ min = newValue;
+
+ mean += newValue;
+ var += newValue*newValue;
// Remember for next time
@@ -181,33 +214,77 @@ camorama_filter_reichardt_filter(CamoramaFilter* filter, guchar *image, gint wid
lastSignal[thisXY] = signal;
}
}
+
+ mean = mean/(height*width);
+ var = var/(height*width) - mean*mean;
+ var = (long)(sqrt((double)var));
+
+ // If debugging, print stats every 50 frames
+
count++;
if(debug && !(count%50))
{
- printf("\nmax: %ld, min: %ld\n", max, min);
+ printf("\nmax: %ld, min: %ld mean: %ld, sd: %ld\n", max, min, mean, var);
}
- scale = max - min;
- if(scale == 0)
- scale = 1;
- for(y = 0; y < height; y++)
+ // If anything's going on (var > 10, say) let's see it
+ // This scales the filtered output to the range 0-255
+ // The range scaled is four standard deviations (i.e. mean +/- 2 SD).
+ // Anything outside that range is clipped to 0 or 255.
+
+ if(var > 10)
{
- row = y*row_length;
- for (z = 0; z < depth; z++)
+
+ /*
+
+ NB - if you are just concerned to detect movement (wildlife camera trap, burglar alarm etc)
+ put the call to start recording (or phone the police) in at this point.
+
+
+ */
+ scale = 4*var;
+
+ for(y = 0; y < height; y++)
{
- image[thisPixel + z] = 0;
+ row = y*row_length;
+ for (z = 0; z < depth; z++)
+ {
+ image[row + z] = 0;
+ }
+ for (x = 1; x < width; x++)
+ {
+ column = x*depth;
+ thisPixel = row + column;
+ thisXY = y*width+x;
+ signal = output[thisXY];
+ signal = ((2*var + signal - mean)*255)/scale;
+ if(signal < 0)
+ signal = 0;
+ if(signal > 255)
+ signal = 255;
+ for (z = 0; z < depth; z++)
+ {
+ image[thisPixel + z] = (guchar)signal;
+ }
+ }
}
- for (x = 1; x < width; x++)
+ } else
+
+// Nothing to see here, move on.
+
+ {
+ for(y = 0; y < height; y++)
{
- column = x*depth;
- thisPixel = row + column;
- thisXY = y*width+x;
- signal = output[thisXY];
- signal = ((signal - min)*255)/scale;
- for (z = 0; z < depth; z++)
+ row = y*row_length;
+ for (x = 0; x < width; x++)
{
- image[thisPixel + z] = (guchar)signal;
+ column = x*depth;
+ thisPixel = row + column;
+ for (z = 0; z < depth; z++)
+ {
+ image[thisPixel + z] = 127;
+ }
}
}
}
diff --git a/src/camorama-filter-reichardt.o b/src/camorama-filter-reichardt.o
index d62020f..acf34de 100644
--- a/src/camorama-filter-reichardt.o
+++ b/src/camorama-filter-reichardt.o
Binary files differ
diff --git a/src/camorama-stock-items.o b/src/camorama-stock-items.o
index 8a471a8..bf7942b 100644
--- a/src/camorama-stock-items.o
+++ b/src/camorama-stock-items.o
Binary files differ
diff --git a/src/camorama-window.o b/src/camorama-window.o
index 12e85f1..23d04a7 100644
--- a/src/camorama-window.o
+++ b/src/camorama-window.o
Binary files differ
diff --git a/src/camorama.x b/src/camorama.x
new file mode 100755
index 0000000..1495b00
--- /dev/null
+++ b/src/camorama.x
Binary files differ
diff --git a/src/fileio.o b/src/fileio.o
index e1f6c52..f4a26f6 100644
--- a/src/fileio.o
+++ b/src/fileio.o
Binary files differ
diff --git a/src/filter.o b/src/filter.o
index 3f8bc25..85b1600 100644
--- a/src/filter.o
+++ b/src/filter.o
Binary files differ
diff --git a/src/main.o b/src/main.o
index facb8de..d300df7 100644
--- a/src/main.o
+++ b/src/main.o
Binary files differ
diff --git a/src/support.o b/src/support.o
index 0ec696e..32d7222 100644
--- a/src/support.o
+++ b/src/support.o
Binary files differ
diff --git a/src/v4l.o b/src/v4l.o
index b0624a8..f52b791 100644
--- a/src/v4l.o
+++ b/src/v4l.o
Binary files differ

Privacy Policy