Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gl-react-native-v2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Jira
Jira
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ym
gl-react-native-v2
Commits
1258934d
Commit
1258934d
authored
Jul 02, 2016
by
Gaëtan Renaudeau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix EXIF orientation bug on Android
Fixes
https://github.com/gre/gl-react-image/issues/1
parent
8e3cde75
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
12 deletions
+13
-12
android/RNGL.iml
android/RNGL.iml
+9
-9
android/src/main/java/com/projectseptember/RNGL/GLImage.java
android/src/main/java/com/projectseptember/RNGL/GLImage.java
+1
-0
android/src/main/java/com/projectseptember/RNGL/GLShader.java
...oid/src/main/java/com/projectseptember/RNGL/GLShader.java
+0
-1
example/android/app/app.iml
example/android/app/app.iml
+3
-2
No files found.
android/RNGL.iml
View file @
1258934d
...
@@ -65,14 +65,6 @@
...
@@ -65,14 +65,6 @@
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/jni"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/jni"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/rs"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/rs"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/shaders"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/shaders"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/res"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/resources"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/assets"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/aidl"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/java"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/jni"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/rs"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/shaders"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/res"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/res"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/resources"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/resources"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/assets"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/assets"
type=
"java-test-resource"
/>
...
@@ -81,6 +73,14 @@
...
@@ -81,6 +73,14 @@
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/jni"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/jni"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/rs"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/rs"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/shaders"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/test/shaders"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/res"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/resources"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/assets"
type=
"java-test-resource"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/aidl"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/java"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/jni"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/rs"
isTestSource=
"true"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/androidTest/shaders"
isTestSource=
"true"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/annotations"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/annotations"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/assets"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/assets"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/blame"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/blame"
/>
...
@@ -116,8 +116,8 @@
...
@@ -116,8 +116,8 @@
<orderEntry
type=
"library"
exported=
""
name=
"okio-1.6.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okio-1.6.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"stetho-okhttp-1.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"stetho-okhttp-1.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okhttp-2.5.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okhttp-2.5.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"jsr305-3.0.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"stetho-1.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"stetho-1.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"jsr305-3.0.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"jackson-core-2.2.3"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"jackson-core-2.2.3"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"fbcore-0.8.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"fbcore-0.8.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"commons-cli-1.2"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"commons-cli-1.2"
level=
"project"
/>
...
...
android/src/main/java/com/projectseptember/RNGL/GLImage.java
View file @
1258934d
...
@@ -51,6 +51,7 @@ public class GLImage {
...
@@ -51,6 +51,7 @@ public class GLImage {
final
Uri
uri
=
src
;
final
Uri
uri
=
src
;
ImageRequest
imageRequest
=
ImageRequestBuilder
ImageRequest
imageRequest
=
ImageRequestBuilder
.
newBuilderWithSource
(
uri
)
.
newBuilderWithSource
(
uri
)
.
setAutoRotateEnabled
(
false
)
// I don't really understand why need to disable this. but it actually fixes the image is properly rotated according to EXIF data
.
build
();
.
build
();
pending
=
Fresco
.
getImagePipeline
().
fetchDecodedImage
(
imageRequest
,
null
);
pending
=
Fresco
.
getImagePipeline
().
fetchDecodedImage
(
imageRequest
,
null
);
...
...
android/src/main/java/com/projectseptember/RNGL/GLShader.java
View file @
1258934d
...
@@ -80,7 +80,6 @@ public class GLShader {
...
@@ -80,7 +80,6 @@ public class GLShader {
glUniform1f
(
uniformLocations
.
get
(
name
),
f
);
glUniform1f
(
uniformLocations
.
get
(
name
),
f
);
}
}
public
void
setUniform
(
String
name
,
FloatBuffer
buf
,
int
type
)
{
public
void
setUniform
(
String
name
,
FloatBuffer
buf
,
int
type
)
{
System
.
out
.
println
(
"setUniform "
+
name
);
switch
(
type
)
{
switch
(
type
)
{
case
GL_FLOAT_VEC2:
case
GL_FLOAT_VEC2:
glUniform2fv
(
uniformLocations
.
get
(
name
),
1
,
buf
);
glUniform2fv
(
uniformLocations
.
get
(
name
),
1
,
buf
);
...
...
example/android/app/app.iml
View file @
1258934d
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.10.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.10.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.10.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.10.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.10.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.10.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.28.0
-rc.0
/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.28.0/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/incremental"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/incremental"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/incremental-classes"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/incremental-classes"
/>
...
@@ -105,6 +105,7 @@
...
@@ -105,6 +105,7 @@
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/instant-run-support"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/instant-run-support"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/jniLibs"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/jniLibs"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/manifests"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/manifests"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/pre-dexed"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/reload-dex"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/reload-dex"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/res"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/res"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/restart-dex"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/build/intermediates/restart-dex"
/>
...
@@ -117,7 +118,6 @@
...
@@ -117,7 +118,6 @@
</content>
</content>
<orderEntry
type=
"jdk"
jdkName=
"Android API 23 Platform"
jdkType=
"Android SDK"
/>
<orderEntry
type=
"jdk"
jdkName=
"Android API 23 Platform"
jdkType=
"Android SDK"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
exported=
""
name=
"react-native-0.28.0-rc.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okio-1.8.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okio-1.8.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"library-2.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"library-2.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"imagepipeline-base-0.10.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"imagepipeline-base-0.10.0"
level=
"project"
/>
...
@@ -130,6 +130,7 @@
...
@@ -130,6 +130,7 @@
<orderEntry
type=
"library"
exported=
""
name=
"recyclerview-v7-23.0.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"recyclerview-v7-23.0.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"support-v4-23.1.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"support-v4-23.1.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"android-jsc-r174650"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"android-jsc-r174650"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"react-native-0.28.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okhttp-3.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okhttp-3.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"bolts-android-1.1.4"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"bolts-android-1.1.4"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"imagepipeline-okhttp3-0.10.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"imagepipeline-okhttp3-0.10.0"
level=
"project"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment