Skip to content

Commit 3fb9451

Browse files
authored
Merge branch 'master' into master
2 parents b891058 + c4f55c6 commit 3fb9451

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public override fun onCreate(savedInstanceState: Bundle?) {
149149
- [x] Transform Operation
150150
- [ ] Crop
151151
- [x] Gamma
152-
- [ ] Highlights and Shadows
152+
- [x] Highlights and Shadows
153153
- [x] Haze
154154
- [x] Sepia Tone
155155
- [ ] Amatorka
@@ -158,7 +158,7 @@ public override fun onCreate(savedInstanceState: Bundle?) {
158158
- [x] Color Inversion
159159
- [x] Solarize
160160
- [x] Vibrance
161-
- [x] Highlight and Shadow Tint
161+
- [ ] Highlight and Shadow Tint
162162
- [x] Luminance
163163
- [x] Luminance Threshold
164164
- [ ] Average Color
@@ -214,7 +214,7 @@ public override fun onCreate(savedInstanceState: Bundle?) {
214214
- [ ] Local Binary Pattern
215215
- [ ] Color Local Binary Pattern
216216
- [x] Dissolve Blend
217-
- [ ] Chroma Key Blend
217+
- [x] Chroma Key Blend
218218
- [x] Add Blend
219219
- [x] Divide Blend
220220
- [x] Multiply Blend
@@ -231,7 +231,7 @@ public override fun onCreate(savedInstanceState: Bundle?) {
231231
- [x] HardLight Blend
232232
- [x] SoftLight Blend
233233
- [x] Color Blend
234-
- [ ] Hue Blend
234+
- [x] Hue Blend
235235
- [x] Saturation Blend
236236
- [x] Luminosity Blend
237237
- [x] Normal Blend

library/src/main/java/jp/co/cyberagent/android/gpuimage/filter/GPUImageZoomBlurFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ public void setBlurCenter(final PointF blurCenter) {
6666

6767
public void setBlurSize(final float blurSize) {
6868
this.blurSize = blurSize;
69-
setFloat(blurSizeLocation, blurSizeLocation);
69+
setFloat(blurSizeLocation, blurSize);
7070
}
7171
}

0 commit comments

Comments
 (0)