From 4067ef886d0cd82c5cbdc8ad3b1a840b0a99c587 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 25 Nov 2010 18:42:33 +0100 Subject: [PATCH] opencv: Remove dead assignments ... and fix indentation --- ext/opencv/gstcvdilateerode.c | 4 ---- ext/opencv/gstcvlaplace.c | 13 ++++--------- ext/opencv/gstcvsmooth.c | 2 -- ext/opencv/gstcvsobel.c | 13 ++++--------- ext/opencv/gstedgedetect.c | 2 -- ext/opencv/gstfaceblur.c | 2 -- ext/opencv/gstfacedetect.c | 2 -- ext/opencv/gstopencvutils.c | 10 ++++++---- ext/opencv/gstopencvvideofilter.c | 4 +--- ext/opencv/gstpyramidsegment.c | 2 -- ext/opencv/gsttemplatematch.c | 2 -- ext/opencv/gsttextwrite.c | 2 -- 12 files changed, 15 insertions(+), 43 deletions(-) diff --git a/ext/opencv/gstcvdilateerode.c b/ext/opencv/gstcvdilateerode.c index 8b689f21b7..446c08d4d3 100644 --- a/ext/opencv/gstcvdilateerode.c +++ b/ext/opencv/gstcvdilateerode.c @@ -153,12 +153,8 @@ static void gst_cv_dilate_erode_class_init (GstCvDilateErodeClass * klass) { GObjectClass *gobject_class; - GstOpencvVideoFilterClass *gstopencvbasefilter_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - gstopencvbasefilter_class = (GstOpencvVideoFilterClass *) klass; parent_class = g_type_class_peek_parent (klass); diff --git a/ext/opencv/gstcvlaplace.c b/ext/opencv/gstcvlaplace.c index eddcbb12cc..de8649cd1a 100644 --- a/ext/opencv/gstcvlaplace.c +++ b/ext/opencv/gstcvlaplace.c @@ -60,9 +60,9 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", ); #if G_BYTE_ORDER == G_BIG_ENDIAN - #define BYTE_ORDER_STRING "BIG_ENDIAN" +#define BYTE_ORDER_STRING "BIG_ENDIAN" #else - #define BYTE_ORDER_STRING "LITTLE_ENDIAN" +#define BYTE_ORDER_STRING "LITTLE_ENDIAN" #endif static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", @@ -141,10 +141,8 @@ gst_cv_laplace_class_init (GstCvLaplaceClass * klass) GObjectClass *gobject_class; GstBaseTransformClass *gstbasetransform_class; GstOpencvVideoFilterClass *gstopencvbasefilter_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasetransform_class = (GstBaseTransformClass *) klass; gstopencvbasefilter_class = (GstOpencvVideoFilterClass *) klass; @@ -220,17 +218,14 @@ gst_cv_laplace_transform_caps (GstBaseTransform * trans, GstPadDirection dir, gst_structure_set (structure, "depth", G_TYPE_INT, 16, "bpp", G_TYPE_INT, 16, - "endianness", G_TYPE_INT, G_BYTE_ORDER, - NULL); + "endianness", G_TYPE_INT, G_BYTE_ORDER, NULL); } break; case GST_PAD_SRC: for (i = 0; i < gst_caps_get_size (output); i++) { structure = gst_caps_get_structure (output, i); gst_structure_set (structure, - "depth", G_TYPE_INT, 8, - "bpp", G_TYPE_INT, 8, - NULL); + "depth", G_TYPE_INT, 8, "bpp", G_TYPE_INT, 8, NULL); gst_structure_remove_field (structure, "endianness"); } break; diff --git a/ext/opencv/gstcvsmooth.c b/ext/opencv/gstcvsmooth.c index 62f54b27fe..a40ad35ddb 100644 --- a/ext/opencv/gstcvsmooth.c +++ b/ext/opencv/gstcvsmooth.c @@ -160,10 +160,8 @@ gst_cv_smooth_class_init (GstCvSmoothClass * klass) { GObjectClass *gobject_class; GstOpencvVideoFilterClass *gstopencvbasefilter_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstopencvbasefilter_class = (GstOpencvVideoFilterClass *) klass; parent_class = g_type_class_peek_parent (klass); diff --git a/ext/opencv/gstcvsobel.c b/ext/opencv/gstcvsobel.c index 9ee55d9158..0e1b33b664 100644 --- a/ext/opencv/gstcvsobel.c +++ b/ext/opencv/gstcvsobel.c @@ -60,9 +60,9 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", ); #if G_BYTE_ORDER == G_BIG_ENDIAN - #define BYTE_ORDER_STRING "BIG_ENDIAN" +#define BYTE_ORDER_STRING "BIG_ENDIAN" #else - #define BYTE_ORDER_STRING "LITTLE_ENDIAN" +#define BYTE_ORDER_STRING "LITTLE_ENDIAN" #endif static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", @@ -136,10 +136,8 @@ gst_cv_sobel_class_init (GstCvSobelClass * klass) GObjectClass *gobject_class; GstBaseTransformClass *gstbasetransform_class; GstOpencvVideoFilterClass *gstopencvbasefilter_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasetransform_class = (GstBaseTransformClass *) klass; gstopencvbasefilter_class = (GstOpencvVideoFilterClass *) klass; @@ -195,17 +193,14 @@ gst_cv_sobel_transform_caps (GstBaseTransform * trans, GstPadDirection dir, gst_structure_set (structure, "depth", G_TYPE_INT, 16, "bpp", G_TYPE_INT, 16, - "endianness", G_TYPE_INT, G_BYTE_ORDER, - NULL); + "endianness", G_TYPE_INT, G_BYTE_ORDER, NULL); } break; case GST_PAD_SRC: for (i = 0; i < gst_caps_get_size (output); i++) { structure = gst_caps_get_structure (output, i); gst_structure_set (structure, - "depth", G_TYPE_INT, 8, - "bpp", G_TYPE_INT, 8, - NULL); + "depth", G_TYPE_INT, 8, "bpp", G_TYPE_INT, 8, NULL); gst_structure_remove_field (structure, "endianness"); } break; diff --git a/ext/opencv/gstedgedetect.c b/ext/opencv/gstedgedetect.c index f6d90e09b3..dbe86cf9f5 100644 --- a/ext/opencv/gstedgedetect.c +++ b/ext/opencv/gstedgedetect.c @@ -149,10 +149,8 @@ static void gst_edgedetect_class_init (GstedgedetectClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_edgedetect_finalize); diff --git a/ext/opencv/gstfaceblur.c b/ext/opencv/gstfaceblur.c index 8f901af90c..3ac2af41b4 100644 --- a/ext/opencv/gstfaceblur.c +++ b/ext/opencv/gstfaceblur.c @@ -149,10 +149,8 @@ static void gst_faceblur_class_init (GstfaceblurClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_faceblur_finalize); diff --git a/ext/opencv/gstfacedetect.c b/ext/opencv/gstfacedetect.c index 887b327472..0254b74b65 100644 --- a/ext/opencv/gstfacedetect.c +++ b/ext/opencv/gstfacedetect.c @@ -201,11 +201,9 @@ static void gst_facedetect_class_init (GstfacedetectClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstOpencvVideoFilterClass *gstopencvbasefilter_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstopencvbasefilter_class = (GstOpencvVideoFilterClass *) klass; parent_class = g_type_class_peek_parent (klass); diff --git a/ext/opencv/gstopencvutils.c b/ext/opencv/gstopencvutils.c index 1f5502a158..dc42f90d58 100644 --- a/ext/opencv/gstopencvutils.c +++ b/ext/opencv/gstopencvutils.c @@ -96,7 +96,7 @@ gst_opencv_parse_iplimage_params_from_caps (GstCaps * caps, gint * width, GstCaps * gst_opencv_caps_from_cv_image_type (int cv_type) { - GstCaps * caps = gst_caps_new_empty (); + GstCaps *caps = gst_caps_new_empty (); switch (cv_type) { case CV_8UC1: gst_caps_append (caps, gst_caps_from_string (GST_VIDEO_CAPS_GRAY8)); @@ -116,9 +116,11 @@ gst_opencv_caps_from_cv_image_type (int cv_type) gst_caps_append (caps, gst_caps_from_string (GST_VIDEO_CAPS_ABGR)); break; case CV_16UC1: - gst_caps_append (caps, gst_caps_from_string (GST_VIDEO_CAPS_GRAY16("1234"))); - gst_caps_append (caps, gst_caps_from_string (GST_VIDEO_CAPS_GRAY16("4321"))); + gst_caps_append (caps, + gst_caps_from_string (GST_VIDEO_CAPS_GRAY16 ("1234"))); + gst_caps_append (caps, + gst_caps_from_string (GST_VIDEO_CAPS_GRAY16 ("4321"))); break; } return caps; -} \ No newline at end of file +} diff --git a/ext/opencv/gstopencvvideofilter.c b/ext/opencv/gstopencvvideofilter.c index ed70656975..7c42b19569 100644 --- a/ext/opencv/gstopencvvideofilter.c +++ b/ext/opencv/gstopencvvideofilter.c @@ -136,11 +136,9 @@ static void gst_opencv_video_filter_class_init (GstOpencvVideoFilterClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseTransformClass *basetrans_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; basetrans_class = (GstBaseTransformClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -238,7 +236,7 @@ gst_opencv_video_filter_set_caps (GstBaseTransform * trans, GstCaps * incaps, if (klass->cv_set_caps) { if (!klass->cv_set_caps (transform, in_width, in_height, in_depth, - in_channels, out_width, out_height, out_depth, out_channels)) + in_channels, out_width, out_height, out_depth, out_channels)) return FALSE; } diff --git a/ext/opencv/gstpyramidsegment.c b/ext/opencv/gstpyramidsegment.c index 760c571345..b2d981ea10 100644 --- a/ext/opencv/gstpyramidsegment.c +++ b/ext/opencv/gstpyramidsegment.c @@ -150,10 +150,8 @@ static void gst_pyramidsegment_class_init (GstpyramidsegmentClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_pyramidsegment_finalize); diff --git a/ext/opencv/gsttemplatematch.c b/ext/opencv/gsttemplatematch.c index 8e96d1ac1d..bc15d815db 100644 --- a/ext/opencv/gsttemplatematch.c +++ b/ext/opencv/gsttemplatematch.c @@ -140,10 +140,8 @@ static void gst_templatematch_class_init (GstTemplateMatchClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gobject_class->finalize = gst_templatematch_finalize; gobject_class->set_property = gst_templatematch_set_property; diff --git a/ext/opencv/gsttextwrite.c b/ext/opencv/gsttextwrite.c index 0a84bbab4f..612e20a432 100644 --- a/ext/opencv/gsttextwrite.c +++ b/ext/opencv/gsttextwrite.c @@ -164,10 +164,8 @@ static void gst_textwrite_class_init (GsttextwriteClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_textwrite_finalize);