Skip to content

Commit 7c03ec2

Browse files
Merge pull request #7 from CameraKit/v0.2.1
v0.2.1
2 parents 9c79772 + 402bf1b commit 7c03ec2

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This is all done without decoding the JPEG to RGB. All operations on the JPEG ar
3131
Add __JpegKit__ to the dependencies block in your `app` level `build.gradle`:
3232

3333
```groovy
34-
compile 'com.camerakit:jpegkit:0.2.0'
34+
compile 'com.camerakit:jpegkit:0.2.1'
3535
```
3636

3737
## Usage

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ plugins {
55

66
android {
77
compileSdkVersion = 28
8-
buildToolsVersion = '28.0.0'
8+
buildToolsVersion = '28.0.3'
99
defaultConfig {
1010
applicationId 'jpegkit.app'
1111
minSdkVersion 15
1212
targetSdkVersion 28
1313
versionCode 1
14-
versionName '0.2.0'
14+
versionName '0.2.1'
1515
externalNativeBuild {
1616
cmake {
1717
cppFlags ''

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.1.3'
8-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50'
7+
classpath 'com.android.tools.build:gradle:3.2.1'
8+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11'
99
}
1010
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jun 11 14:39:14 EDT 2018
1+
#Sun Jan 27 23:38:01 EST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

jpegkit/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
android {
99
compileSdkVersion = 28
10-
buildToolsVersion = '28.0.0'
10+
buildToolsVersion = '28.0.3'
1111
defaultConfig {
1212
minSdkVersion 15
1313
targetSdkVersion 28
@@ -85,9 +85,9 @@ task deploySnapshot {
8585
finalizedBy bintrayUpload
8686

8787
doLast {
88-
bintrayUpload.setVersionName(bintrayUpload.getVersionName() + '-Snapshot')
88+
bintrayUpload.setVersionName(bintrayUpload.getVersionName())
8989
bintrayUpload.setUserOrg('camerakit')
90-
bintrayUpload.setRepoName('jpegkit-android-snapshots')
90+
bintrayUpload.setRepoName('jpegkit-android')
9191
bintrayUpload.setOverride(true)
9292
bintrayUpload.setPublish(true)
9393

@@ -111,7 +111,7 @@ task deployRelease {
111111
}
112112

113113
group = 'com.camerakit'
114-
version = '0.2.0'
114+
version = '0.2.1'
115115

116116
install {
117117
repositories.mavenInstaller {

jpegkit/src/main/cpp/jpegkit/jpeg.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ Java_jpegkit_Jpeg_jniRotate
160160
transform->op = TJXOP_ROT270;
161161
}
162162

163+
transform->options = TJXOPT_TRIM;
164+
163165
tjTransform(jpeg->transformer, jpeg->buffer, jpeg->size, 1, &jpeg->buffer, &jpeg->size, transform, 0);
164166
}
165167

@@ -170,6 +172,7 @@ Java_jpegkit_Jpeg_jniFlipHorizontal
170172

171173
tjtransform *transform = new tjtransform();
172174
transform->op = TJXOP_HFLIP;
175+
transform->options = TJXOPT_TRIM;
173176

174177
tjTransform(jpeg->transformer, jpeg->buffer, jpeg->size, 1, &jpeg->buffer, &jpeg->size, transform, 0);
175178
}
@@ -181,6 +184,7 @@ Java_jpegkit_Jpeg_jniFlipVertical
181184

182185
tjtransform *transform = new tjtransform();
183186
transform->op = TJXOP_VFLIP;
187+
transform->options = TJXOPT_TRIM;
184188

185189
tjTransform(jpeg->transformer, jpeg->buffer, jpeg->size, 1, &jpeg->buffer, &jpeg->size, transform, 0);
186190
}

0 commit comments

Comments
 (0)