Merge pull request #7 from CameraKit/v0.2.1

v0.2.1
CameraKit · Jan 28, 2019 · 7c03ec2 · 7c03ec2
2 parents 9c79772 + 402bf1b
commit 7c03ec2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ This is all done without decoding the JPEG to RGB. All operations on the JPEG ar
 Add __JpegKit__ to the dependencies block in your `app` level `build.gradle`:
 
 ```groovy		
-compile 'com.camerakit:jpegkit:0.2.0'
+compile 'com.camerakit:jpegkit:0.2.1'
 ```
 
 ## Usage

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,13 +5,13 @@ plugins {
 
 android {
     compileSdkVersion = 28
-    buildToolsVersion = '28.0.0'
+    buildToolsVersion = '28.0.3'
     defaultConfig {
         applicationId 'jpegkit.app'
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
-        versionName '0.2.0'
+        versionName '0.2.1'
         externalNativeBuild {
             cmake {
                 cppFlags ''

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 11 14:39:14 EDT 2018
+#Sun Jan 27 23:38:01 EST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/jpegkit/build.gradle b/jpegkit/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 android {
     compileSdkVersion = 28
-    buildToolsVersion = '28.0.0'
+    buildToolsVersion = '28.0.3'
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
@@ -85,9 +85,9 @@ task deploySnapshot {
     finalizedBy bintrayUpload
 
     doLast {
-        bintrayUpload.setVersionName(bintrayUpload.getVersionName() + '-Snapshot')
+        bintrayUpload.setVersionName(bintrayUpload.getVersionName())
         bintrayUpload.setUserOrg('camerakit')
-        bintrayUpload.setRepoName('jpegkit-android-snapshots')
+        bintrayUpload.setRepoName('jpegkit-android')
         bintrayUpload.setOverride(true)
         bintrayUpload.setPublish(true)
 
@@ -111,7 +111,7 @@ task deployRelease {
 }
 
 group = 'com.camerakit'
-version = '0.2.0'
+version = '0.2.1'
 
 install {
     repositories.mavenInstaller {

diff --git a/jpegkit/src/main/cpp/jpegkit/jpeg.cpp b/jpegkit/src/main/cpp/jpegkit/jpeg.cpp
@@ -160,6 +160,8 @@ Java_jpegkit_Jpeg_jniRotate
         transform->op = TJXOP_ROT270;
     }
 
+    transform->options = TJXOPT_TRIM;
+
     tjTransform(jpeg->transformer, jpeg->buffer, jpeg->size, 1, &jpeg->buffer, &jpeg->size, transform, 0);
 }
 
@@ -170,6 +172,7 @@ Java_jpegkit_Jpeg_jniFlipHorizontal
 
     tjtransform *transform = new tjtransform();
     transform->op = TJXOP_HFLIP;
+    transform->options = TJXOPT_TRIM;
 
     tjTransform(jpeg->transformer, jpeg->buffer, jpeg->size, 1, &jpeg->buffer, &jpeg->size, transform, 0);
 }
@@ -181,6 +184,7 @@ Java_jpegkit_Jpeg_jniFlipVertical
 
     tjtransform *transform = new tjtransform();
     transform->op = TJXOP_VFLIP;
+    transform->options = TJXOPT_TRIM;
 
     tjTransform(jpeg->transformer, jpeg->buffer, jpeg->size, 1, &jpeg->buffer, &jpeg->size, transform, 0);
 }