diff --git a/effects/wobblywindows/wobblywindows.cpp b/effects/wobblywindows/wobblywindows.cpp index 05910a5221..da652dcad8 100644 --- a/effects/wobblywindows/wobblywindows.cpp +++ b/effects/wobblywindows/wobblywindows.cpp @@ -1202,9 +1202,9 @@ bool WobblyWindowsEffect::updateWindowWobblyDatas(EffectWindow* w, qreal time) return true; } -void WobblyWindowsEffect::heightRingLinearMean(Pair** datas_pointer, WindowWobblyInfos& wwi) +void WobblyWindowsEffect::heightRingLinearMean(Pair** data_pointer, WindowWobblyInfos& wwi) { - Pair* datas = *datas_pointer; + Pair* data = *data_pointer; Pair neibourgs[8]; // for corners @@ -1212,10 +1212,10 @@ void WobblyWindowsEffect::heightRingLinearMean(Pair** datas_pointer, WindowWobbl // top-left { Pair& res = wwi.buffer[0]; - Pair vit = datas[0]; - neibourgs[0] = datas[1]; - neibourgs[1] = datas[wwi.width]; - neibourgs[2] = datas[wwi.width+1]; + Pair vit = data[0]; + neibourgs[0] = data[1]; + neibourgs[1] = data[wwi.width]; + neibourgs[2] = data[wwi.width+1]; res.x = (neibourgs[0].x + neibourgs[1].x + neibourgs[2].x + 3.0*vit.x) / 6.0; res.y = (neibourgs[0].y + neibourgs[1].y + neibourgs[2].y + 3.0*vit.y) / 6.0; @@ -1225,10 +1225,10 @@ void WobblyWindowsEffect::heightRingLinearMean(Pair** datas_pointer, WindowWobbl // top-right { Pair& res = wwi.buffer[wwi.width-1]; - Pair vit = datas[wwi.width-1]; - neibourgs[0] = datas[wwi.width-2]; - neibourgs[1] = datas[2*wwi.width-1]; - neibourgs[2] = datas[2*wwi.width-2]; + Pair vit = data[wwi.width-1]; + neibourgs[0] = data[wwi.width-2]; + neibourgs[1] = data[2*wwi.width-1]; + neibourgs[2] = data[2*wwi.width-2]; res.x = (neibourgs[0].x + neibourgs[1].x + neibourgs[2].x + 3.0*vit.x) / 6.0; res.y = (neibourgs[0].y + neibourgs[1].y + neibourgs[2].y + 3.0*vit.y) / 6.0; @@ -1238,10 +1238,10 @@ void WobblyWindowsEffect::heightRingLinearMean(Pair** datas_pointer, WindowWobbl // bottom-left { Pair& res = wwi.buffer[wwi.width*(wwi.height-1)]; - Pair vit = datas[wwi.width*(wwi.height-1)]; - neibourgs[0] = datas[wwi.width*(wwi.height-1)+1]; - neibourgs[1] = datas[wwi.width*(wwi.height-2)]; - neibourgs[2] = datas[wwi.width*(wwi.height-2)+1]; + Pair vit = data[wwi.width*(wwi.height-1)]; + neibourgs[0] = data[wwi.width*(wwi.height-1)+1]; + neibourgs[1] = data[wwi.width*(wwi.height-2)]; + neibourgs[2] = data[wwi.width*(wwi.height-2)+1]; res.x = (neibourgs[0].x + neibourgs[1].x + neibourgs[2].x + 3.0*vit.x) / 6.0; res.y = (neibourgs[0].y + neibourgs[1].y + neibourgs[2].y + 3.0*vit.y) / 6.0; @@ -1251,10 +1251,10 @@ void WobblyWindowsEffect::heightRingLinearMean(Pair** datas_pointer, WindowWobbl // bottom-right { Pair& res = wwi.buffer[wwi.count-1]; - Pair vit = datas[wwi.count-1]; - neibourgs[0] = datas[wwi.count-2]; - neibourgs[1] = datas[wwi.width*(wwi.height-1)-1]; - neibourgs[2] = datas[wwi.width*(wwi.height-1)-2]; + Pair vit = data[wwi.count-1]; + neibourgs[0] = data[wwi.count-2]; + neibourgs[1] = data[wwi.width*(wwi.height-1)-1]; + neibourgs[2] = data[wwi.width*(wwi.height-1)-2]; res.x = (neibourgs[0].x + neibourgs[1].x + neibourgs[2].x + 3.0*vit.x) / 6.0; res.y = (neibourgs[0].y + neibourgs[1].y + neibourgs[2].y + 3.0*vit.y) / 6.0; @@ -1267,12 +1267,12 @@ void WobblyWindowsEffect::heightRingLinearMean(Pair** datas_pointer, WindowWobbl for (unsigned int i=1; i