1From 152e1ab7151fe8461ba4243a9d6bdea0edda7690 Mon Sep 17 00:00:00 2001
2From: Michael Forney <mforney@mforney.org>
3Date: Fri, 30 Apr 2021 18:56:27 -0700
4Subject: [PATCH] Remove invalid ';' at top-level
5
6This is not allowed in the ISO C grammar.
7---
8 src/cdef_tmpl.c | 6 +-
9 src/film_grain_tmpl.c | 12 ++--
10 src/looprestoration.h | 4 +-
11 src/mc_tmpl.c | 6 +-
12 src/x86/looprestoration_init_tmpl.c | 16 ++---
13 src/x86/mc_init_tmpl.c | 106 ++++++++++++++--------------
14 6 files changed, 75 insertions(+), 75 deletions(-)
15
16diff --git a/src/cdef_tmpl.c b/src/cdef_tmpl.c
17index 91ac45b..7ad3cb0 100644
18--- a/src/cdef_tmpl.c
19+++ b/src/cdef_tmpl.c
20@@ -222,9 +222,9 @@ static void cdef_filter_block_##w##x##h##_c(pixel *const dst, \
21 dir, damping, w, h, edges HIGHBD_TAIL_SUFFIX); \
22 }
23
24-cdef_fn(4, 4);
25-cdef_fn(4, 8);
26-cdef_fn(8, 8);
27+cdef_fn(4, 4)
28+cdef_fn(4, 8)
29+cdef_fn(8, 8)
30
31 static int cdef_find_dir_c(const pixel *img, const ptrdiff_t stride,
32 unsigned *const var HIGHBD_DECL_SUFFIX)
33diff --git a/src/film_grain_tmpl.c b/src/film_grain_tmpl.c
34index 0c6a17c..0ee4e53 100644
35--- a/src/film_grain_tmpl.c
36+++ b/src/film_grain_tmpl.c
37@@ -149,9 +149,9 @@ static decl_generate_grain_uv_fn(generate_grain_uv_##nm##_c) { \
38 generate_grain_uv_c(buf, buf_y, data, uv, ss_x, ss_y HIGHBD_TAIL_SUFFIX); \
39 }
40
41-gnuv_ss_fn(420, 1, 1);
42-gnuv_ss_fn(422, 1, 0);
43-gnuv_ss_fn(444, 0, 0);
44+gnuv_ss_fn(420, 1, 1)
45+gnuv_ss_fn(422, 1, 0)
46+gnuv_ss_fn(444, 0, 0)
47
48 // samples from the correct block of a grain LUT, while taking into account the
49 // offsets provided by the offsets cache
50@@ -408,9 +408,9 @@ static decl_fguv_32x32xn_fn(fguv_32x32xn_##nm##_c) { \
51 HIGHBD_TAIL_SUFFIX); \
52 }
53
54-fguv_ss_fn(420, 1, 1);
55-fguv_ss_fn(422, 1, 0);
56-fguv_ss_fn(444, 0, 0);
57+fguv_ss_fn(420, 1, 1)
58+fguv_ss_fn(422, 1, 0)
59+fguv_ss_fn(444, 0, 0)
60
61 COLD void bitfn(dav1d_film_grain_dsp_init)(Dav1dFilmGrainDSPContext *const c) {
62 c->generate_grain_y = generate_grain_y_c;
63diff --git a/src/looprestoration.h b/src/looprestoration.h
64index a0a917f..3626aa4 100644
65--- a/src/looprestoration.h
66+++ b/src/looprestoration.h
67@@ -66,8 +66,8 @@ void (name)(pixel *dst, ptrdiff_t dst_stride, \
68 const_left_pixel_row left, \
69 const pixel *lpf, ptrdiff_t lpf_stride, \
70 int w, int h, const LooprestorationParams *params, \
71- enum LrEdgeFlags edges HIGHBD_DECL_SUFFIX)
72-typedef decl_lr_filter_fn(*looprestorationfilter_fn);
73+ enum LrEdgeFlags edges HIGHBD_DECL_SUFFIX);
74+typedef decl_lr_filter_fn(*looprestorationfilter_fn)
75
76 typedef struct Dav1dLoopRestorationDSPContext {
77 looprestorationfilter_fn wiener[2]; /* 7-tap, 5-tap */
78diff --git a/src/mc_tmpl.c b/src/mc_tmpl.c
79index f8d3e3b..374db4c 100644
80--- a/src/mc_tmpl.c
81+++ b/src/mc_tmpl.c
82@@ -735,9 +735,9 @@ static void w_mask_##ssn##_c(pixel *const dst, const ptrdiff_t dst_stride, \
83 HIGHBD_TAIL_SUFFIX); \
84 }
85
86-w_mask_fns(444, 0, 0);
87-w_mask_fns(422, 1, 0);
88-w_mask_fns(420, 1, 1);
89+w_mask_fns(444, 0, 0)
90+w_mask_fns(422, 1, 0)
91+w_mask_fns(420, 1, 1)
92
93 #undef w_mask_fns
94
95diff --git a/src/x86/looprestoration_init_tmpl.c b/src/x86/looprestoration_init_tmpl.c
96index ae64cc8..c92b7cc 100644
97--- a/src/x86/looprestoration_init_tmpl.c
98+++ b/src/x86/looprestoration_init_tmpl.c
99@@ -31,19 +31,19 @@
100 #include "common/intops.h"
101
102 #define decl_wiener_filter_fns(ext) \
103-decl_lr_filter_fn(BF(dav1d_wiener_filter7, ext)); \
104+decl_lr_filter_fn(BF(dav1d_wiener_filter7, ext)) \
105 decl_lr_filter_fn(BF(dav1d_wiener_filter5, ext))
106
107 #define decl_sgr_filter_fns(ext) \
108-decl_lr_filter_fn(BF(dav1d_sgr_filter_5x5, ext)); \
109-decl_lr_filter_fn(BF(dav1d_sgr_filter_3x3, ext)); \
110+decl_lr_filter_fn(BF(dav1d_sgr_filter_5x5, ext)) \
111+decl_lr_filter_fn(BF(dav1d_sgr_filter_3x3, ext)) \
112 decl_lr_filter_fn(BF(dav1d_sgr_filter_mix, ext))
113
114-decl_wiener_filter_fns(sse2);
115-decl_wiener_filter_fns(ssse3);
116-decl_wiener_filter_fns(avx2);
117-decl_sgr_filter_fns(ssse3);
118-decl_sgr_filter_fns(avx2);
119+decl_wiener_filter_fns(sse2)
120+decl_wiener_filter_fns(ssse3)
121+decl_wiener_filter_fns(avx2)
122+decl_sgr_filter_fns(ssse3)
123+decl_sgr_filter_fns(avx2)
124
125 COLD void bitfn(dav1d_loop_restoration_dsp_init_x86)(Dav1dLoopRestorationDSPContext *const c,
126 const int bpc)
127diff --git a/src/x86/mc_init_tmpl.c b/src/x86/mc_init_tmpl.c
128index 3991004..0bd6188 100644
129--- a/src/x86/mc_init_tmpl.c
130+++ b/src/x86/mc_init_tmpl.c
131@@ -42,68 +42,68 @@
132 #define init_mct_scaled_fn(type, name, suffix) \
133 c->mct_scaled[type] = BF(dav1d_prep_##name, suffix)
134
135-decl_fn(mc, dav1d_put_8tap_regular);
136-decl_fn(mc, dav1d_put_8tap_regular_smooth);
137-decl_fn(mc, dav1d_put_8tap_regular_sharp);
138-decl_fn(mc, dav1d_put_8tap_smooth);
139-decl_fn(mc, dav1d_put_8tap_smooth_regular);
140-decl_fn(mc, dav1d_put_8tap_smooth_sharp);
141-decl_fn(mc, dav1d_put_8tap_sharp);
142-decl_fn(mc, dav1d_put_8tap_sharp_regular);
143-decl_fn(mc, dav1d_put_8tap_sharp_smooth);
144-decl_fn(mc, dav1d_put_bilin);
145+decl_fn(mc, dav1d_put_8tap_regular)
146+decl_fn(mc, dav1d_put_8tap_regular_smooth)
147+decl_fn(mc, dav1d_put_8tap_regular_sharp)
148+decl_fn(mc, dav1d_put_8tap_smooth)
149+decl_fn(mc, dav1d_put_8tap_smooth_regular)
150+decl_fn(mc, dav1d_put_8tap_smooth_sharp)
151+decl_fn(mc, dav1d_put_8tap_sharp)
152+decl_fn(mc, dav1d_put_8tap_sharp_regular)
153+decl_fn(mc, dav1d_put_8tap_sharp_smooth)
154+decl_fn(mc, dav1d_put_bilin)
155
156-decl_fn(mct, dav1d_prep_8tap_regular);
157-decl_fn(mct, dav1d_prep_8tap_regular_smooth);
158-decl_fn(mct, dav1d_prep_8tap_regular_sharp);
159-decl_fn(mct, dav1d_prep_8tap_smooth);
160-decl_fn(mct, dav1d_prep_8tap_smooth_regular);
161-decl_fn(mct, dav1d_prep_8tap_smooth_sharp);
162-decl_fn(mct, dav1d_prep_8tap_sharp);
163-decl_fn(mct, dav1d_prep_8tap_sharp_regular);
164-decl_fn(mct, dav1d_prep_8tap_sharp_smooth);
165-decl_fn(mct, dav1d_prep_bilin);
166+decl_fn(mct, dav1d_prep_8tap_regular)
167+decl_fn(mct, dav1d_prep_8tap_regular_smooth)
168+decl_fn(mct, dav1d_prep_8tap_regular_sharp)
169+decl_fn(mct, dav1d_prep_8tap_smooth)
170+decl_fn(mct, dav1d_prep_8tap_smooth_regular)
171+decl_fn(mct, dav1d_prep_8tap_smooth_sharp)
172+decl_fn(mct, dav1d_prep_8tap_sharp)
173+decl_fn(mct, dav1d_prep_8tap_sharp_regular)
174+decl_fn(mct, dav1d_prep_8tap_sharp_smooth)
175+decl_fn(mct, dav1d_prep_bilin)
176
177-decl_fn(mc_scaled, dav1d_put_8tap_scaled_regular);
178-decl_fn(mc_scaled, dav1d_put_8tap_scaled_regular_smooth);
179-decl_fn(mc_scaled, dav1d_put_8tap_scaled_regular_sharp);
180-decl_fn(mc_scaled, dav1d_put_8tap_scaled_smooth);
181-decl_fn(mc_scaled, dav1d_put_8tap_scaled_smooth_regular);
182-decl_fn(mc_scaled, dav1d_put_8tap_scaled_smooth_sharp);
183-decl_fn(mc_scaled, dav1d_put_8tap_scaled_sharp);
184-decl_fn(mc_scaled, dav1d_put_8tap_scaled_sharp_regular);
185-decl_fn(mc_scaled, dav1d_put_8tap_scaled_sharp_smooth);
186-decl_fn(mc_scaled, dav1d_put_bilin_scaled);
187+decl_fn(mc_scaled, dav1d_put_8tap_scaled_regular)
188+decl_fn(mc_scaled, dav1d_put_8tap_scaled_regular_smooth)
189+decl_fn(mc_scaled, dav1d_put_8tap_scaled_regular_sharp)
190+decl_fn(mc_scaled, dav1d_put_8tap_scaled_smooth)
191+decl_fn(mc_scaled, dav1d_put_8tap_scaled_smooth_regular)
192+decl_fn(mc_scaled, dav1d_put_8tap_scaled_smooth_sharp)
193+decl_fn(mc_scaled, dav1d_put_8tap_scaled_sharp)
194+decl_fn(mc_scaled, dav1d_put_8tap_scaled_sharp_regular)
195+decl_fn(mc_scaled, dav1d_put_8tap_scaled_sharp_smooth)
196+decl_fn(mc_scaled, dav1d_put_bilin_scaled)
197
198-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_regular);
199-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_regular_smooth);
200-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_regular_sharp);
201-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_smooth);
202-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_smooth_regular);
203-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_smooth_sharp);
204-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_sharp);
205-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_sharp_regular);
206-decl_fn(mct_scaled, dav1d_prep_8tap_scaled_sharp_smooth);
207-decl_fn(mct_scaled, dav1d_prep_bilin_scaled);
208+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_regular)
209+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_regular_smooth)
210+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_regular_sharp)
211+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_smooth)
212+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_smooth_regular)
213+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_smooth_sharp)
214+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_sharp)
215+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_sharp_regular)
216+decl_fn(mct_scaled, dav1d_prep_8tap_scaled_sharp_smooth)
217+decl_fn(mct_scaled, dav1d_prep_bilin_scaled)
218
219-decl_fn(avg, dav1d_avg);
220-decl_fn(w_avg, dav1d_w_avg);
221-decl_fn(mask, dav1d_mask);
222-decl_fn(w_mask, dav1d_w_mask_420);
223-decl_fn(w_mask, dav1d_w_mask_422);
224-decl_fn(w_mask, dav1d_w_mask_444);
225-decl_fn(blend, dav1d_blend);
226-decl_fn(blend_dir, dav1d_blend_v);
227-decl_fn(blend_dir, dav1d_blend_h);
228+decl_fn(avg, dav1d_avg)
229+decl_fn(w_avg, dav1d_w_avg)
230+decl_fn(mask, dav1d_mask)
231+decl_fn(w_mask, dav1d_w_mask_420)
232+decl_fn(w_mask, dav1d_w_mask_422)
233+decl_fn(w_mask, dav1d_w_mask_444)
234+decl_fn(blend, dav1d_blend)
235+decl_fn(blend_dir, dav1d_blend_v)
236+decl_fn(blend_dir, dav1d_blend_h)
237
238-decl_fn(warp8x8, dav1d_warp_affine_8x8);
239+decl_fn(warp8x8, dav1d_warp_affine_8x8)
240 decl_warp8x8_fn(BF(dav1d_warp_affine_8x8, sse4));
241-decl_fn(warp8x8t, dav1d_warp_affine_8x8t);
242+decl_fn(warp8x8t, dav1d_warp_affine_8x8t)
243 decl_warp8x8t_fn(BF(dav1d_warp_affine_8x8t, sse4));
244
245-decl_fn(emu_edge, dav1d_emu_edge);
246+decl_fn(emu_edge, dav1d_emu_edge)
247
248-decl_fn(resize, dav1d_resize);
249+decl_fn(resize, dav1d_resize)
250
251 COLD void bitfn(dav1d_mc_dsp_init_x86)(Dav1dMCDSPContext *const c) {
252 const unsigned flags = dav1d_get_cpu_flags();
253--
2542.32.0
255
