From b2420b0408f71d8a6e1deae7e2df94d9849072fd Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Sat, 10 Oct 2015 14:10:32 +0100 Subject: [PATCH] cverode: Switch to C++ Switch gstcverode to C++ for consistency with other OpenCV elements, and support of the new 2.4.11 API. https://bugzilla.gnome.org/show_bug.cgi?id=754148 --- ext/opencv/Makefile.am | 4 ++-- ext/opencv/{gstcvdilateerode.c => gstcvdilateerode.cpp} | 5 +++-- ext/opencv/{gstcverode.c => gstcverode.cpp} | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename ext/opencv/{gstcvdilateerode.c => gstcvdilateerode.cpp} (98%) rename ext/opencv/{gstcverode.c => gstcverode.cpp} (99%) diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index b2b75f4186..e3427985bc 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -5,9 +5,9 @@ libgstopencv_la_SOURCES = gstopencv.cpp \ gstopencvvideofilter.c \ gstopencvutils.c \ gstcvdilate.cpp \ - gstcvdilateerode.c \ + gstcvdilateerode.cpp \ gstcvequalizehist.c \ - gstcverode.c \ + gstcverode.cpp \ gstcvlaplace.c \ gstcvsmooth.cpp \ gstcvsobel.c \ diff --git a/ext/opencv/gstcvdilateerode.c b/ext/opencv/gstcvdilateerode.cpp similarity index 98% rename from ext/opencv/gstcvdilateerode.c rename to ext/opencv/gstcvdilateerode.cpp index 422654d08c..763761b350 100644 --- a/ext/opencv/gstcvdilateerode.c +++ b/ext/opencv/gstcvdilateerode.cpp @@ -1,7 +1,7 @@ /* * GStreamer * Copyright (C) 2010 Thiago Santos - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation @@ -131,7 +131,8 @@ gst_cv_dilate_erode_class_init (GstCvDilateErodeClass * klass) g_object_class_install_property (gobject_class, PROP_ITERATIONS, g_param_spec_int ("iterations", "iterations", "Number of iterations to run the algorithm", 1, G_MAXINT, - DEFAULT_ITERATIONS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + DEFAULT_ITERATIONS, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); /* add sink and source pad templates */ caps = gst_opencv_caps_from_cv_image_type (CV_16UC1); diff --git a/ext/opencv/gstcverode.c b/ext/opencv/gstcverode.cpp similarity index 99% rename from ext/opencv/gstcverode.c rename to ext/opencv/gstcverode.cpp index ecc0d0344d..91f460a86e 100644 --- a/ext/opencv/gstcverode.c +++ b/ext/opencv/gstcverode.cpp @@ -1,7 +1,7 @@ /* * GStreamer * Copyright (C) 2010 Thiago Santos - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation