Skip to content

Commit

Permalink
Merge pull request CameraKit#253 from wonderkiln/release/0.12.1
Browse files Browse the repository at this point in the history
Release 0.12.1
  • Loading branch information
Dylan McIntyre authored Nov 21, 2017
2 parents 169ff4d + 1cae2f5 commit 77a3441
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ With CameraKit you are able to seamlessly do the following...
Add __CameraKit__ to the dependencies block in your `app` level `build.gradle`:

```groovy
compile 'com.wonderkiln:camerakit:0.12.0'
compile 'com.wonderkiln:camerakit:0.12.1'
```


Expand Down
2 changes: 1 addition & 1 deletion camerakit/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'com.android.library'

def ver = '0.12.0'
def ver = '0.12.1'

def isSnapshot(version) {
return version.contains('-Snapshot') || System.getenv('CIRCLE_TAG') == null || System.getenv('CIRCLE_TAG').length() == 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import android.support.media.ExifInterface;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;

Expand Down Expand Up @@ -76,12 +75,15 @@ private Bitmap getBitmap() throws IOException {
options.inJustDecodeBounds = true;
BitmapFactory.decodeByteArray(picture, 0, picture.length, options);

BitmapFactory.Options regionOptions = new BitmapFactory.Options();
options.inPreferredConfig = Bitmap.Config.ARGB_8888;

return BitmapRegionDecoder.newInstance(
picture,
0,
picture.length,
true
).decodeRegion(new Rect(0, 0, options.outWidth, options.outHeight), null);
).decodeRegion(new Rect(0, 0, options.outWidth, options.outHeight), regionOptions);
}

private static class ExifPostProcessor {
Expand Down
5 changes: 2 additions & 3 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

if [[ "$CIRCLE_BRANCH" == "master" ]]; then
./gradlew clean build bintrayUpload -Puser=$BINTRAY_USER -Pkey=$BINTRAY_KEY
fi
./gradlew clean build bintrayUpload -Puser=$BINTRAY_USER -Pkey=$BINTRAY_KEY

exit 0

0 comments on commit 77a3441

Please sign in to comment.