From 8e8818af78178c6a497207346fb58c348bff35af Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Fri, 4 Jan 2019 10:40:26 +0100 Subject: [PATCH] Fix Javadocs --- .../src/main/java/com/otaliastudios/cameraview/CameraView.java | 2 +- .../main/utils/com/otaliastudios/cameraview/CameraUtils.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index de0c5d24..ea7a8429 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -1068,7 +1068,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver { /** * ADVANCED FEATURE - sets a size selector for the preview stream. * The {@link SizeSelector} will be invoked with the list of available sizes, and the first - * acceptable size will be accepted and passed to the internal engine & surface. + * acceptable size will be accepted and passed to the internal engine and surface. * * This is typically NOT NEEDED. The default size selector is already smart enough to respect * the picture/video output aspect ratio, and be bigger than the surface so that there is no diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java index 57aaa964..7870d53e 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java +++ b/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java @@ -121,6 +121,7 @@ public class CameraUtils { * is that this cares about orientation, reading it from the EXIF header. * * @param source a JPEG byte array + * @return decoded bitmap or null if error is encountered */ @SuppressWarnings("WeakerAccess") @Nullable @@ -223,6 +224,7 @@ public class CameraUtils { * @param maxWidth the max allowed width * @param maxHeight the max allowed height * @param options the options to be passed to decodeByteArray + * @return decoded bitmap or null if error is encountered */ @SuppressWarnings({"SuspiciousNameCombination", "WeakerAccess"}) @Nullable