Skip to content

Commit ffa3307

Browse files
Effects
0 parents  commit ffa3307

File tree

112 files changed

+8142
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+8142
-0
lines changed

.gitattributes

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

.gitignore

+215
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
1+
#################
2+
## Eclipse
3+
#################
4+
5+
*.pydevproject
6+
.project
7+
.metadata
8+
bin/
9+
tmp/
10+
*.tmp
11+
*.bak
12+
*.swp
13+
*~.nib
14+
local.properties
15+
.classpath
16+
.settings/
17+
.loadpath
18+
19+
# External tool builders
20+
.externalToolBuilders/
21+
22+
# Locally stored "Eclipse launch configurations"
23+
*.launch
24+
25+
# CDT-specific
26+
.cproject
27+
28+
# PDT-specific
29+
.buildpath
30+
31+
32+
#################
33+
## Visual Studio
34+
#################
35+
36+
## Ignore Visual Studio temporary files, build results, and
37+
## files generated by popular Visual Studio add-ons.
38+
39+
# User-specific files
40+
*.suo
41+
*.user
42+
*.sln.docstates
43+
44+
# Build results
45+
46+
[Dd]ebug/
47+
[Rr]elease/
48+
x64/
49+
build/
50+
[Bb]in/
51+
[Oo]bj/
52+
53+
# MSTest test Results
54+
[Tt]est[Rr]esult*/
55+
[Bb]uild[Ll]og.*
56+
57+
*_i.c
58+
*_p.c
59+
*.ilk
60+
*.meta
61+
*.obj
62+
*.pch
63+
*.pdb
64+
*.pgc
65+
*.pgd
66+
*.rsp
67+
*.sbr
68+
*.tlb
69+
*.tli
70+
*.tlh
71+
*.tmp
72+
*.tmp_proj
73+
*.log
74+
*.vspscc
75+
*.vssscc
76+
.builds
77+
*.pidb
78+
*.log
79+
*.scc
80+
81+
# Visual C++ cache files
82+
ipch/
83+
*.aps
84+
*.ncb
85+
*.opensdf
86+
*.sdf
87+
*.cachefile
88+
89+
# Visual Studio profiler
90+
*.psess
91+
*.vsp
92+
*.vspx
93+
94+
# Guidance Automation Toolkit
95+
*.gpState
96+
97+
# ReSharper is a .NET coding add-in
98+
_ReSharper*/
99+
*.[Rr]e[Ss]harper
100+
101+
# TeamCity is a build add-in
102+
_TeamCity*
103+
104+
# DotCover is a Code Coverage Tool
105+
*.dotCover
106+
107+
# NCrunch
108+
*.ncrunch*
109+
.*crunch*.local.xml
110+
111+
# Installshield output folder
112+
[Ee]xpress/
113+
114+
# DocProject is a documentation generator add-in
115+
DocProject/buildhelp/
116+
DocProject/Help/*.HxT
117+
DocProject/Help/*.HxC
118+
DocProject/Help/*.hhc
119+
DocProject/Help/*.hhk
120+
DocProject/Help/*.hhp
121+
DocProject/Help/Html2
122+
DocProject/Help/html
123+
124+
# Click-Once directory
125+
publish/
126+
127+
# Publish Web Output
128+
*.Publish.xml
129+
*.pubxml
130+
131+
# NuGet Packages Directory
132+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
133+
#packages/
134+
135+
# Windows Azure Build Output
136+
csx
137+
*.build.csdef
138+
139+
# Windows Store app package directory
140+
AppPackages/
141+
142+
# Others
143+
sql/
144+
*.Cache
145+
ClientBin/
146+
[Ss]tyle[Cc]op.*
147+
~$*
148+
*~
149+
*.dbmdl
150+
*.[Pp]ublish.xml
151+
*.pfx
152+
*.publishsettings
153+
154+
# RIA/Silverlight projects
155+
Generated_Code/
156+
157+
# Backup & report files from converting an old project file to a newer
158+
# Visual Studio version. Backup files are not needed, because we have git ;-)
159+
_UpgradeReport_Files/
160+
Backup*/
161+
UpgradeLog*.XML
162+
UpgradeLog*.htm
163+
164+
# SQL Server files
165+
App_Data/*.mdf
166+
App_Data/*.ldf
167+
168+
#############
169+
## Windows detritus
170+
#############
171+
172+
# Windows image file caches
173+
Thumbs.db
174+
ehthumbs.db
175+
176+
# Folder config file
177+
Desktop.ini
178+
179+
# Recycle Bin used on file shares
180+
$RECYCLE.BIN/
181+
182+
# Mac crap
183+
.DS_Store
184+
185+
186+
#############
187+
## Python
188+
#############
189+
190+
*.py[co]
191+
192+
# Packages
193+
*.egg
194+
*.egg-info
195+
dist/
196+
build/
197+
eggs/
198+
parts/
199+
var/
200+
sdist/
201+
develop-eggs/
202+
.installed.cfg
203+
204+
# Installer logs
205+
pip-log.txt
206+
207+
# Unit test / coverage reports
208+
.coverage
209+
.tox
210+
211+
#Translations
212+
*.mo
213+
214+
#Mr Developer
215+
.mr.developer.cfg

android-gpuimage-master/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#OSX
2+
.DS_Store
3+
target/
4+
5+
.idea/
6+
*.iml

android-gpuimage-master/README.md

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# GPUImage for Android
2+
3+
Idea from: [iOS GPUImage framework](https://github.com/BradLarson/GPUImage)
4+
5+
Goal is to have something as similar to GPUImage as possible. Vertex and fragment shaders are exactly the same. That way it makes it easier to port filters from GPUImage iOS to Android.
6+
7+
## Requirements
8+
* Android 2.2 or higher (OpenGL ES 2.0)
9+
10+
## Usage
11+
12+
### Include in own project
13+
GPUImage can be used as a library project or by copying the following files/folders to your libs folder.
14+
15+
* library/libs/armeabi (only needed for camera live preview)
16+
* library/bin/gpuimage.jar
17+
18+
### Maven dependency
19+
20+
<dependency>
21+
<groupId>jp.co.cyberagent.android.gpuimage</groupId>
22+
<artifactId>gpuimage-library</artifactId>
23+
<type>apklib</type>
24+
<version>(use current version here)</version>
25+
</dependency>
26+
27+
If you want to use it with live camera preview, than you will need to add the following as well:
28+
29+
<dependency>
30+
<groupId>jp.co.cyberagent.android.gpuimage</groupId>
31+
<artifactId>gpuimage-library</artifactId>
32+
<classifier>armeabi</classifier>
33+
<type>so</type>
34+
<version>(use current version here)</version>
35+
</dependency>
36+
37+
38+
### Sample Code
39+
With preview:
40+
41+
@Override
42+
public void onCreate(final Bundle savedInstanceState) {
43+
super.onCreate(savedInstanceState);
44+
setContentView(R.layout.activity);
45+
46+
Uri imageUri = ...;
47+
mGPUImage = new GPUImage(this);
48+
mGPUImage.setGLSurfaceView((GLSurfaceView) findViewById(R.id.surfaceView));
49+
mGPUImage.setImage(imageUri); // this loads image on the current thread, should be run in a thread
50+
mGPUImage.setFilter(new GPUImageSepiaFilter());
51+
52+
// Later when image should be saved saved:
53+
mGPUImage.saveToPictures("GPUImage", "ImageWithFilter.jpg", null);
54+
}
55+
56+
Without preview:
57+
58+
Uri imageUri = ...;
59+
mGPUImage = new GPUImage(context);
60+
mGPUImage.setFilter(new GPUImageSobelEdgeDetection());
61+
mGPUImage.setImage(imageUri);
62+
mGPUImage.saveToPictures("GPUImage", "ImageWithFilter.jpg", null);
63+
64+
## Create libs/armeabi
65+
Run the following command in the library folder. Make sure you have android-ndk in your PATH.
66+
67+
cd library
68+
ndk-build
69+
70+
### Maven
71+
Make sure that you run the clean target when using maven.
72+
73+
mvn clean install
74+
75+
## License
76+
Copyright 2012 CyberAgent
77+
78+
Licensed under the Apache License, Version 2.0 (the "License");
79+
you may not use this file except in compliance with the License.
80+
You may obtain a copy of the License at
81+
82+
http://www.apache.org/licenses/LICENSE-2.0
83+
84+
Unless required by applicable law or agreed to in writing, software
85+
distributed under the License is distributed on an "AS IS" BASIS,
86+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
87+
See the License for the specific language governing permissions and
88+
limitations under the License.

android-gpuimage-master/VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.3
+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#Android generated
2+
bin
3+
gen
4+
obj
5+
6+
#Eclipse
7+
#.project
8+
#.classpath
9+
.settings
10+
11+
#IntelliJ IDEA
12+
.idea
13+
*.iml
14+
*.ipr
15+
*.iws
16+
out
17+
18+
#Checkstyle
19+
.checkstyle
20+
21+
#Maven
22+
target
23+
release.properties
24+
pom.xml.*
25+
26+
#Ant
27+
build.xml
28+
local.properties
29+
proguard.cfg
30+
31+
#OSX
32+
.DS_Store
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="jp.co.cyberagent.android.gpuimage"
3+
android:versionCode="4"
4+
android:versionName="1.0.3" >
5+
6+
<uses-sdk
7+
android:minSdkVersion="8"
8+
android:targetSdkVersion="15" />
9+
10+
<application />
11+
12+
</manifest>

0 commit comments

Comments
 (0)