diff options
| author | Luis de Bethencourt <luisbg@osg.samsung.com> | 2015-10-10 14:10:32 +0100 |
|---|---|---|
| committer | Luis de Bethencourt <luisbg@osg.samsung.com> | 2015-10-10 14:14:32 +0100 |
| commit | b2420b0408f71d8a6e1deae7e2df94d9849072fd (patch) | |
| tree | ad03dae4fc7fc4e387d11f8720ec6a3528e4d453 /ext | |
| parent | 0ac769194fddc0ca59e5443918e3c5a32f4d8d5e (diff) | |
| download | gstreamer-plugins-bad-b2420b0408f71d8a6e1deae7e2df94d9849072fd.tar.gz | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opencv/Makefile.am | 4 | ||||
| -rw-r--r-- | ext/opencv/gstcvdilateerode.cpp (renamed from ext/opencv/gstcvdilateerode.c) | 5 | ||||
| -rw-r--r-- | ext/opencv/gstcverode.cpp (renamed from ext/opencv/gstcverode.c) | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index b2b75f418..e3427985b 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 index 422654d08..763761b35 100644 --- a/ext/opencv/gstcvdilateerode.c +++ b/ext/opencv/gstcvdilateerode.cpp @@ -1,7 +1,7 @@ /* * GStreamer * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk> - * + * * 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 index ecc0d0344..91f460a86 100644 --- a/ext/opencv/gstcverode.c +++ b/ext/opencv/gstcverode.cpp @@ -1,7 +1,7 @@ /* * GStreamer * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk> - * + * * 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 |