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

Commit 2d670a08 authored by Mark Harman's avatar Mark Harman
Browse files

Fix warnings.

parent ef7ac64a

app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java

+0 −357

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −3
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ public class HDRProcessor { 
    }



    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

    private void processSingleImage(List<Bitmap> bitmaps, boolean release_bitmaps, Bitmap output_bitmap, float hdr_alpha, int n_tiles, boolean ce_preserve_blacks, DROTonemappingAlgorithm dro_tonemapping_algorithm) throws HDRProcessorException {

    private void processSingleImage(List<Bitmap> bitmaps, boolean release_bitmaps, Bitmap output_bitmap, float hdr_alpha, int n_tiles, boolean ce_preserve_blacks, DROTonemappingAlgorithm dro_tonemapping_algorithm) {

        if( MyDebug.LOG )

            Log.d(TAG, "processSingleImage");
@@ -1263,10 +1263,9 @@ public class HDRProcessor { 
     * @param bitmap_avg_align Should be supplied if allocation_avg_align is non-null, and stores

     *                         the bitmap corresponding to the allocation_avg_align.

     * @param time_s         Time, for debugging.

     * @throws HDRProcessorException

     */

    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

    private AvgData processAvgCore(Allocation allocation_out, Allocation allocation_avg, Bitmap bitmap_avg, Bitmap bitmap_new, int width, int height, float avg_factor, int iso, float zoom_factor, Allocation allocation_avg_align, Bitmap bitmap_avg_align, long time_s) throws HDRProcessorException {

    private AvgData processAvgCore(Allocation allocation_out, Allocation allocation_avg, Bitmap bitmap_avg, Bitmap bitmap_new, int width, int height, float avg_factor, int iso, float zoom_factor, Allocation allocation_avg_align, Bitmap bitmap_avg_align, long time_s) {

        if( MyDebug.LOG ) {

            Log.d(TAG, "processAvgCore");

            Log.d(TAG, "iso: " + iso);

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

+0 −1
Original line number Diff line number Diff line
@@ -1761,7 +1761,6 @@ public class MainActivity extends Activity { 


    /**

     * Toggles Photo/Video mode

     * @param view

     */

    public void clickedSwitchVideo(View view) {

        if( MyDebug.LOG )

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

+0 −2
Original line number Diff line number Diff line
@@ -750,8 +750,6 @@ public class StorageUtils { 
                }

                break;

            case MEDIA_TYPE_PREFS:

                mimeType = "text/xml";

                break;

            case MEDIA_TYPE_GYRO_INFO:

                mimeType = "text/xml";

                break;

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

+1 −1
Original line number Diff line number Diff line
@@ -1902,7 +1902,7 @@ public class CameraController1 extends CameraController { 
    }



    @Override

    public void initVideoRecorderPostPrepare(MediaRecorder video_recorder, boolean want_photo_video_recording) throws CameraControllerException {

    public void initVideoRecorderPostPrepare(MediaRecorder video_recorder, boolean want_photo_video_recording) {

        // no further actions necessary

    }