Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, neltester/cvmatadapter has been updated discards bda60132885aa144dc7b8930ef5be4cbf5a79c44 (commit) discards 076f56304d15f36e4dd037e1e93d49496b688e6a (commit) discards 4febfd29ac3c9d829cf57bb90d9644e7d3623a42 (commit) to 3248a7a9e83821e1974d624d7d364dc2289524ab (commit) via 3cad9bfd9d1ab6b523c6dc95f3e05d67dc76de74 (commit) via 3adf5966b31ef81f146b56c6e2f52a60d3afc022 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (bda60132885aa144dc7b8930ef5be4cbf5a79c44) \ N -- N -- N (3248a7a9e83821e1974d624d7d364dc2289524ab) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. https://github.com/fawkesrobotics/fawkes/tree/neltester/cvmatadapter Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 3adf5966b31ef81f146b56c6e2f52a60d3afc022 Author: Niklas Sebastian Eltester <[email protected]> AuthorDate: Wed May 26 13:23:10 2021 +0200 Commit: Niklas Sebastian Eltester <[email protected]> CommitDate: Wed May 26 13:29:13 2021 +0200 buildsys: adapt fvconf to opencv4 https://github.com/fawkesrobotics/fawkes/commit/3adf5966b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3cad9bfd9d1ab6b523c6dc95f3e05d67dc76de74 Author: Niklas Sebastian Eltester <[email protected]> AuthorDate: Wed May 26 13:23:43 2021 +0200 Commit: Niklas Sebastian Eltester <[email protected]> CommitDate: Wed May 26 13:29:21 2021 +0200 libs: Adapt Makefiles to opencv4 Replaces Wno-error with Wno-overloaded-virtual https://github.com/fawkesrobotics/fawkes/commit/3cad9bfd9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3248a7a9e83821e1974d624d7d364dc2289524ab Author: Niklas Sebastian Eltester <[email protected]> AuthorDate: Wed May 26 13:24:41 2021 +0200 Commit: Niklas Sebastian Eltester <[email protected]> CommitDate: Wed May 26 13:29:21 2021 +0200 bumblebee2: Revert wrong adpations for opencv4 Further replace Wno-error with Wno-overloaded-virtual https://github.com/fawkesrobotics/fawkes/commit/3248a7a9e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- etc/buildsys/fvconf.mk | 3 --- 1 file changed, 3 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 3adf5966b31ef81f146b56c6e2f52a60d3afc022 - - - - - - - - - - Author: Niklas Sebastian Eltester <[email protected]> Date: Wed May 26 13:23:10 2021 +0200 Subject: buildsys: adapt fvconf to opencv4 etc/buildsys/fvconf.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/fvconf.mk b/etc/buildsys/fvconf.mk index 7d04fbdcf..c6d66cdfb 100644 --- a/etc/buildsys/fvconf.mk +++ b/etc/buildsys/fvconf.mk @@ -117,14 +117,10 @@ ifeq ($(HAVE_OPENCV),1) VERSION_SPLITTED_OPENCV = $(call split,.,$(VERSION_OPENCV)) VERSION_MAJOR_OPENCV = $(word 1,$(VERSION_SPLITTED_OPENCV)) VERSION_MINOR_OPENCV = $(word 2,$(VERSION_SPLITTED_OPENCV)) - ifeq ($(VERSION_MAJOR_OPENCV),4) - # We do not support opencv4 yet. - HAVE_OPENCV=0 - endif CFLAGS_OPENCV = -DHAVE_OPENCV -Wno-deprecated-declarations \ $(shell $(PKGCONFIG) --cflags 'opencv$(OPENCV_VERSION_SUFFIX)') \ $(CFLAG_W_NO_UNUSED_LOCAL_TYPEDEFS) - LDFLAGS_OPENCV = $(shell $(PKGCONFIG) --libs-only-L 'opencv$(OPENCV_VERSION_SUFFIX)') + LDFLAGS_OPENCV = $(shell $(PKGCONFIG) --libs-only-l 'opencv$(OPENCV_VERSION_SUFFIX)') ifeq ($(filter-out 2.0 2.1,$(VERSION_MAJOR_OPENCV).$(VERSION_MINOR_OPENCV)),) LDFLAGS_OPENCV += -lcxcore -lcv LDFLAGS_OPENCV_GUI = -lhighgui - *commit* 3cad9bfd9d1ab6b523c6dc95f3e05d67dc76de74 - - - - - - - - - - Author: Niklas Sebastian Eltester <[email protected]> Date: Wed May 26 13:23:43 2021 +0200 Subject: libs: Adapt Makefiles to opencv4 src/libs/fvcams/Makefile | 4 +--- src/libs/fvclassifiers/Makefile | 4 ++-- src/libs/fvfilters/Makefile | 4 ++-- src/libs/fvutils/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) _Diff for modified files_: diff --git a/src/libs/fvcams/Makefile b/src/libs/fvcams/Makefile index d04f7670c..ccfec1840 100644 --- a/src/libs/fvcams/Makefile +++ b/src/libs/fvcams/Makefile @@ -41,9 +41,7 @@ OBJS_libfvcams = camera.o \ cam_exceptions.o \ factory.o \ control/factory.o -ifeq ($(HAVE_OPENCV),0) - HAVE_OPENCV=1 -endif + ifeq ($(HAVE_VISCA_CTRL),1) OBJS_libfvcams += control/visca.o endif diff --git a/src/libs/fvclassifiers/Makefile b/src/libs/fvclassifiers/Makefile index 24f257166..9b49ed2eb 100644 --- a/src/libs/fvclassifiers/Makefile +++ b/src/libs/fvclassifiers/Makefile @@ -18,13 +18,13 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/fvconf.mk -CFLAGS += $(VISION_CFLAGS) -Wno-error +CFLAGS += $(VISION_CFLAGS) -Wno-overloaded-virtual LDFLAGS += $(VISION_LDFLAGS) INCDIRS += $(VISION_INCDIRS) LIBDIRS += $(VISION_LIBDIRS) LIBS += $(VISION_LIBS) -ifeq ($(HAVE_OPENCV),0) +ifeq ($(HAVE_OPENCV),1) CFLAGS += $(CFLAGS_OPENCV) LDFLAGS += $(LDFLAGS_OPENCV) ifeq ($(filter-out 2.0 2.1,$(VERSION_MAJOR_OPENCV).$(VERSION_MINOR_OPENCV)),) diff --git a/src/libs/fvfilters/Makefile b/src/libs/fvfilters/Makefile index 4ec497af6..c49ac3876 100644 --- a/src/libs/fvfilters/Makefile +++ b/src/libs/fvfilters/Makefile @@ -18,13 +18,13 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/fvconf.mk -CFLAGS += $(VISION_CFLAGS) -Wno-error +CFLAGS += $(VISION_CFLAGS) -Wno-overloaded-virtual LDFLAGS += $(VISION_LDFLAGS) INCDIRS += $(VISION_INCDIRS) LIBDIRS += $(VISION_LIBDIRS) LIBS += $(VISION_LIBS) -ifeq ($(HAVE_IPP)$(HAVE_OPENCV),01) +ifeq ($(HAVE_IPP)$(HAVE_OPENCV),00) # We neither IPP nor OpenCV, hence we have to eliminate some filters IPPI_FILTERS = $(wildcard $(SRCDIR)/morphology/*.cpp) ALLFILES=$(realpath $(wildcard $(SRCDIR)/*.cpp $(SRCDIR)/*/*.cpp $(SRCDIR)/*/*/*.cpp)) diff --git a/src/libs/fvutils/Makefile b/src/libs/fvutils/Makefile index aa3f64b5f..0efada2c4 100644 --- a/src/libs/fvutils/Makefile +++ b/src/libs/fvutils/Makefile @@ -19,7 +19,7 @@ include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/fvconf.mk include $(BUILDSYSDIR)/pcl.mk -CFLAGS += $(VISION_CFLAGS) -Wno-unknown-pragmas -Wno-deprecated-declarations +CFLAGS += $(VISION_CFLAGS) -Wno-unknown-pragmas -Wno-deprecated-declarations -Wno-overloaded-virtual LDFLAGS += $(VISION_LDFLAGS) INCDIRS += $(VISION_INCDIRS) LIBDIRS += $(VISION_LIBDIRS) @@ -50,7 +50,7 @@ else LDFLAGS += $(LDFLAGS_LIBPNG) endif -ifneq ($(HAVE_OPENCV),0) +ifneq ($(HAVE_OPENCV),1) WARN_TARGETS += warning_opencv FILTER_OUT += recognition/faces.o $(patsubst %.cpp,%.o,$(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/recognition/forest/*.cpp))) FILTER_OUT += adapters/iplimage.o - *commit* 3248a7a9e83821e1974d624d7d364dc2289524ab - - - - - - - - - - Author: Niklas Sebastian Eltester <[email protected]> Date: Wed May 26 13:24:41 2021 +0200 Subject: bumblebee2: Revert wrong adpations for opencv4 src/plugins/bumblebee2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/bumblebee2/Makefile b/src/plugins/bumblebee2/Makefile index 27af62b42..f4966e0f6 100644 --- a/src/plugins/bumblebee2/Makefile +++ b/src/plugins/bumblebee2/Makefile @@ -35,8 +35,8 @@ OBJS_bumblebee2 = bumblebee2_plugin.o bumblebee2_thread.o OBJS_all = $(OBJS_bumblebee2) PLUGINS_all = $(PLUGINDIR)/bumblebee2.$(SOEXT) -ifeq ($(HAVE_PCL)$(HAVE_TF)$(HAVE_TRICLOPS)$(HAVE_OPENCV),1110) - CFLAGS += $(CFLAGS_TF) $(CFLAGS_PCL) $(CFLAGS_TRICLOPS) $(CFLAGS_OPENCV) -Wno-error +ifeq ($(HAVE_PCL)$(HAVE_TF)$(HAVE_TRICLOPS)$(HAVE_OPENCV),1111) + CFLAGS += $(CFLAGS_TF) $(CFLAGS_PCL) $(CFLAGS_TRICLOPS) $(CFLAGS_OPENCV) -Wno-overloaded-virtual LDFLAGS += $(LDFLAGS_TF) $(LDFLAGS_PCL) $(LDFLAGS_TRICLOPS) PLUGINS_build = $(PLUGINS_all) else @@ -49,7 +49,7 @@ else ifneq ($(HAVE_TRICLOPS),1) WARN_TARGETS += warning_triclops endif - ifneq ($(HAVE_OPENCV),0) + ifneq ($(HAVE_OPENCV),1) WARN_TARGETS += warning_opencv endif endif _______________________________________________ fawkes-commits mailing list [email protected] https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
