| Message ID | 20201015223750.58563-10-kieran.bingham@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Kieran, On 2020-10-15 23:37:48 +0100, Kieran Bingham wrote: > The function gauss_seidel2_SOR() makes use of a function scoped iterator > 'i', for several loops, and has a precedence of re-using the function > scoped iterator declaration in the majority of cases, except the first > where it is declared in the loop scope before the function scope, and > later which aliases a new declaration. > > Re-use the existing iterator variable for consistency, and to prevent > variable aliasing. > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > src/ipa/raspberrypi/controller/rpi/alsc.cpp | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp > index 42fbc8a476ad..183a0c953b9f 100644 > --- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp > +++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp > @@ -606,9 +606,9 @@ static double gauss_seidel2_SOR(double const M[XY][4], double omega, > double lambda[XY]) > { > double old_lambda[XY]; > - for (int i = 0; i < XY; i++) > - old_lambda[i] = lambda[i]; > int i; > + for (i = 0; i < XY; i++) > + old_lambda[i] = lambda[i]; > lambda[0] = compute_lambda_bottom_start(0, M, lambda); > for (i = 1; i < X; i++) > lambda[i] = compute_lambda_bottom(i, M, lambda); > @@ -628,7 +628,7 @@ static double gauss_seidel2_SOR(double const M[XY][4], double omega, > lambda[i] = compute_lambda_bottom(i, M, lambda); > lambda[0] = compute_lambda_bottom_start(0, M, lambda); > double max_diff = 0; > - for (int i = 0; i < XY; i++) { > + for (i = 0; i < XY; i++) { > lambda[i] = old_lambda[i] + (lambda[i] - old_lambda[i]) * omega; > if (fabs(lambda[i] - old_lambda[i]) > fabs(max_diff)) > max_diff = lambda[i] - old_lambda[i]; > -- > 2.25.1 > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp index 42fbc8a476ad..183a0c953b9f 100644 --- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp @@ -606,9 +606,9 @@ static double gauss_seidel2_SOR(double const M[XY][4], double omega, double lambda[XY]) { double old_lambda[XY]; - for (int i = 0; i < XY; i++) - old_lambda[i] = lambda[i]; int i; + for (i = 0; i < XY; i++) + old_lambda[i] = lambda[i]; lambda[0] = compute_lambda_bottom_start(0, M, lambda); for (i = 1; i < X; i++) lambda[i] = compute_lambda_bottom(i, M, lambda); @@ -628,7 +628,7 @@ static double gauss_seidel2_SOR(double const M[XY][4], double omega, lambda[i] = compute_lambda_bottom(i, M, lambda); lambda[0] = compute_lambda_bottom_start(0, M, lambda); double max_diff = 0; - for (int i = 0; i < XY; i++) { + for (i = 0; i < XY; i++) { lambda[i] = old_lambda[i] + (lambda[i] - old_lambda[i]) * omega; if (fabs(lambda[i] - old_lambda[i]) > fabs(max_diff)) max_diff = lambda[i] - old_lambda[i];