Change PictureResult to reflect new format

pull/691/head
Mattia Iavarone 6 years ago
parent 86298f8d30
commit 659f6063bb
  1. 3
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/PictureResultTest.java
  2. 16
      cameraview/src/main/java/com/otaliastudios/cameraview/PictureResult.java

@ -4,6 +4,7 @@ package com.otaliastudios.cameraview;
import android.location.Location; import android.location.Location;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.PictureFormat;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@ -24,7 +25,7 @@ public class PictureResultTest extends BaseTest {
@Test @Test
public void testResult() { public void testResult() {
int format = PictureResult.FORMAT_JPEG; PictureFormat format = PictureFormat.JPEG;
int rotation = 90; int rotation = 90;
Size size = new Size(20, 120); Size size = new Size(20, 120);
byte[] jpeg = new byte[]{2, 4, 1, 5, 2}; byte[] jpeg = new byte[]{2, 4, 1, 5, 2};

@ -4,6 +4,7 @@ import android.graphics.BitmapFactory;
import android.location.Location; import android.location.Location;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.PictureFormat;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;
import java.io.File; import java.io.File;
@ -31,19 +32,16 @@ public class PictureResult {
public Size size; public Size size;
public Facing facing; public Facing facing;
public byte[] data; public byte[] data;
public int format; public PictureFormat format;
} }
public final static int FORMAT_JPEG = 0;
// public final static int FORMAT_PNG = 1;
private final boolean isSnapshot; private final boolean isSnapshot;
private final Location location; private final Location location;
private final int rotation; private final int rotation;
private final Size size; private final Size size;
private final Facing facing; private final Facing facing;
private final byte[] data; private final byte[] data;
private final int format; private final PictureFormat format;
PictureResult(@NonNull Stub builder) { PictureResult(@NonNull Stub builder) {
isSnapshot = builder.isSnapshot; isSnapshot = builder.isSnapshot;
@ -118,12 +116,12 @@ public class PictureResult {
} }
/** /**
* Returns the image format. At the moment this will always be * Returns the format for {@link #getData()}.
* {@link #FORMAT_JPEG}.
* *
* @return the current format * @return the format
*/ */
public int getFormat() { @NonNull
public PictureFormat getFormat() {
return format; return format;
} }

Loading…
Cancel
Save