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

Commit 7f3c8b9f authored by Mark Harman's avatar Mark Harman
Browse files

Fix bug for supports_tonemap_curve.

parent ab3fcf99

_docs/history.html

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ Version 1.48.1 (Work in progress) 
FIXED   Crash on devices with Camera2 API where camera reports no picture, video or preview

        resolutions, instead fail to open camera gracefully instead.

FIXED   Fix switch camera buttons behaviour if a camera with ID greater than 0 failed to open.

FIXED   Some devices lost custom video profiles in 1.48.

ADDED   If camera fails to open, display ID of current camera that we tried to open.



Version 1.48 (2020/04/22)

app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java

+4 −3
Original line number Diff line number Diff line
@@ -2699,11 +2699,12 @@ public class CameraController2 extends CameraController { 
                camera_features.tonemap_max_curve_points = tonemap_max_curve_points;

                // for now we only expose supporting of custom tonemap curves if there are enough curve points for all the

                // profiles we support

                // remember to divide by 2 if we're comparing against the raw array length!

                camera_features.supports_tonemap_curve =

                    tonemap_max_curve_points >= tonemap_log_max_curve_points_c &&

                            tonemap_max_curve_points >= jtvideo_values.length &&

                            tonemap_max_curve_points >= jtlog_values.length &&

                            tonemap_max_curve_points >= jtlog2_values.length;

                            tonemap_max_curve_points >= jtvideo_values.length/2 &&

                            tonemap_max_curve_points >= jtlog_values.length/2 &&

                            tonemap_max_curve_points >= jtlog2_values.length/2;

            }

            else {

                if( MyDebug.LOG )