Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d86a0c authored by Mark Harman's avatar Mark Harman
Browse files

Fix Android warnings.

parent 8faece77

app/src/main/java/net/sourceforge/opencamera/JavaImageFunctions.java

+12 −12
Original line number Diff line number Diff line
@@ -4106,9 +4106,9 @@ public class JavaImageFunctions { 


                        // end unrolled loop



                        sum_fr *= 2.0;

                        sum_fg *= 2.0;

                        sum_fb *= 2.0;

                        sum_fr *= 2.0f;

                        sum_fg *= 2.0f;

                        sum_fb *= 2.0f;



                        int r = (int)(sum_fr+0.5f);

                        int g = (int)(sum_fg+0.5f);
@@ -4275,9 +4275,9 @@ public class JavaImageFunctions { 


                        // end unrolled loop



                        sum_fr *= 2.0;

                        sum_fg *= 2.0;

                        sum_fb *= 2.0;

                        sum_fr *= 2.0f;

                        sum_fg *= 2.0f;

                        sum_fb *= 2.0f;



                        int r = (int)(sum_fr+0.5f);

                        int g = (int)(sum_fg+0.5f);
@@ -4500,9 +4500,9 @@ public class JavaImageFunctions { 


                        // end unrolled loop



                        sum_fr *= 2.0;

                        sum_fg *= 2.0;

                        sum_fb *= 2.0;

                        sum_fr *= 2.0f;

                        sum_fg *= 2.0f;

                        sum_fb *= 2.0f;



                        int r = (int)(sum_fr+0.5f);

                        int g = (int)(sum_fg+0.5f);
@@ -4635,9 +4635,9 @@ public class JavaImageFunctions { 


                        // end unrolled loop



                        sum_fr *= 2.0;

                        sum_fg *= 2.0;

                        sum_fb *= 2.0;

                        sum_fr *= 2.0f;

                        sum_fg *= 2.0f;

                        sum_fb *= 2.0f;



                        int r = (int)(sum_fr+0.5f);

                        int g = (int)(sum_fg+0.5f);

app/src/main/java/net/sourceforge/opencamera/PanoramaProcessor.java

+4 −4
Original line number Diff line number Diff line
@@ -2196,9 +2196,9 @@ public class PanoramaProcessor { 


                        float angle = (float)(Math.atan2(dy1, dx1) - Math.atan2(dy0, dx0));

                        if( angle < -Math.PI )

                            angle += 2.0f*Math.PI;

                            angle += (float) (2.0f*Math.PI);

                        else if( angle > Math.PI )

                            angle -= 2.0f*Math.PI;

                            angle -= (float) (2.0f*Math.PI);

                        if( Math.abs(angle) > 30.0f*Math.PI/180.0f ) {

                            // reject too large angles

                            continue;
@@ -2373,9 +2373,9 @@ public class PanoramaProcessor { 


                float angle = (float)(Math.atan2(dy1, dx1) - Math.atan2(dy0, dx0));

                if( angle < -Math.PI )

                    angle += 2.0f*Math.PI;

                    angle += (float) (2.0f*Math.PI);

                else if( angle > Math.PI )

                    angle -= 2.0f*Math.PI;

                    angle -= (float) (2.0f*Math.PI);

                if( MyDebug.LOG )

                    Log.d(TAG, "    match has angle: " + angle);

                angle_sum += angle;