diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-02 01:58:30 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-02 01:58:30 +0000 |
| commit | d895ac645f017f4d048b0fcbde44b3ef6c9fb4f3 (patch) | |
| tree | 205b2f58447f15a79fda0714c41f1ee428f7dd6b /gst/effectv/gstripple.c | |
| parent | f1558baf835105dd81c74ea8a6b097f5c3b60471 (diff) | |
| parent | f18f23896875cb1fb39da0745713505773109aa9 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
docs/plugins/inspect/plugin-esdsink.xml
docs/plugins/inspect/plugin-gconfelements.xml
ext/pulse/pulseaudiosink.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/multifile/gstmultifilesink.c
Diffstat (limited to 'gst/effectv/gstripple.c')
| -rw-r--r-- | gst/effectv/gstripple.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/effectv/gstripple.c b/gst/effectv/gstripple.c index 285b92ad6..170fd3a65 100644 --- a/gst/effectv/gstripple.c +++ b/gst/effectv/gstripple.c @@ -418,18 +418,18 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in, v = (gint) vp[1]; dx = x + h; dy = y + v; - dx = CLAMP (dx, 0, (v_w - 1)); - dy = CLAMP (dy, 0, (v_h - 1)); + dx = CLAMP (dx, 0, (v_w - 2)); + dy = CLAMP (dy, 0, (v_h - 2)); dest[0] = src[dy * v_w + dx]; o_dx = dx; dx = x + 1 + (h + (gint) vp[2]) / 2; - dx = CLAMP (dx, 0, (v_w - 1)); + dx = CLAMP (dx, 0, (v_w - 2)); dest[1] = src[dy * v_w + dx]; dy = y + 1 + (v + (gint) vp[m_w * 2 + 1]) / 2; - dy = CLAMP (dy, 0, (v_h - 1)); + dy = CLAMP (dy, 0, (v_h - 2)); dest[v_w] = src[dy * v_w + o_dx]; dest[v_w + 1] = src[dy * v_w + dx]; |