FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cvlaplace: Switch to C++

Browse Source 
Switch gstcvlaplace 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
This commit is contained in:
Luis de Bethencourt 2015-10-10 17:00:55 +01:00
parent 49287b1e04
commit a4429cf769
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opencv/Makefile.am
View File

@ -8,7 +8,7 @@ libgstopencv_la_SOURCES = gstopencv.cpp \
gstcvdilateerode.cpp \ gstcvdilateerode.cpp \
gstcvequalizehist.cpp \ gstcvequalizehist.cpp \
gstcverode.cpp \ gstcverode.cpp \
gstcvlaplace.c \ gstcvlaplace.cpp \
gstcvsmooth.cpp \ gstcvsmooth.cpp \
gstcvsobel.c \ gstcvsobel.c \
gstedgedetect.cpp \ gstedgedetect.cpp \

10
ext/opencv/gstcvlaplace.c → ext/opencv/gstcvlaplace.cpp
View File

@ -1,7 +1,7 @@
/* /*
* GStreamer * GStreamer
* Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk> * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation * to deal in the Software without restriction, including without limitation
@ -146,15 +146,15 @@ gst_cv_laplace_class_init (GstCvLaplaceClass * klass)
g_object_class_install_property (gobject_class, PROP_APERTURE_SIZE, g_object_class_install_property (gobject_class, PROP_APERTURE_SIZE,
g_param_spec_int ("aperture-size", "aperture size", g_param_spec_int ("aperture-size", "aperture size",
"Size of the extended Laplace Kernel (1, 3, 5 or 7)", 1, 7, "Size of the extended Laplace Kernel (1, 3, 5 or 7)", 1, 7,
DEFAULT_APERTURE_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_APERTURE_SIZE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (gobject_class, PROP_SCALE, g_object_class_install_property (gobject_class, PROP_SCALE,
g_param_spec_double ("scale", "scale factor", g_param_spec_double ("scale", "scale factor",
"Scale factor", 0.0, G_MAXDOUBLE, "Scale factor", 0.0, G_MAXDOUBLE,
DEFAULT_SCALE_FACTOR, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_SCALE_FACTOR, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (gobject_class, PROP_SHIFT, g_object_class_install_property (gobject_class, PROP_SHIFT,
g_param_spec_double ("shift", "Shift", g_param_spec_double ("shift", "Shift",
"Value added to the scaled source array elements", 0.0, G_MAXDOUBLE, "Value added to the scaled source array elements", 0.0, G_MAXDOUBLE,
DEFAULT_SHIFT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_SHIFT, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_factory)); gst_static_pad_template_get (&src_factory));
@ -215,7 +215,7 @@ gst_cv_laplace_transform_caps (GstBaseTransform * trans, GstPadDirection dir,
GstCaps *templ; GstCaps *templ;
GstStructure *structure; GstStructure *structure;
GstPad *other; GstPad *other;
gint i; guint i;
to = gst_caps_new_empty (); to = gst_caps_new_empty ();