Skip to content

Commit 19b725e

Browse files
author
wangyang
committed
fix issue #42
1 parent 099064d commit 19b725e

File tree

17 files changed

+28
-1398
lines changed

17 files changed

+28
-1398
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ __New feature__: Face effects will be created with the ios11's `VNSequenceReques
1717
>pod 'libCGE', :git => 'https://github.com/wysaid/ios-gpuimage-plus-pod.git'
1818
1919
or with the newest version tag:
20-
>pod 'libCGE', :git => 'https://github.com/wysaid/ios-gpuimage-plus-pod.git', :tag => '2.4.10'
20+
>pod 'libCGE', :git => 'https://github.com/wysaid/ios-gpuimage-plus-pod.git', :tag => '2.5.1'
2121
2222
__Dependencies__: libc++, ImageIO.framework, MobileCoreServices.framework
2323

demo/cgeDemoStatic.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
TargetAttributes = {
258258
DB4342121B4FCC8A00ED886F = {
259259
CreatedOnToolsVersion = 6.4;
260-
DevelopmentTeam = V2DTUY5PQ8;
260+
DevelopmentTeam = KHWJX47LP8;
261261
};
262262
};
263263
};
@@ -481,7 +481,7 @@
481481
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
482482
CODE_SIGN_IDENTITY = "iPhone Developer";
483483
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
484-
DEVELOPMENT_TEAM = V2DTUY5PQ8;
484+
DEVELOPMENT_TEAM = KHWJX47LP8;
485485
ENABLE_BITCODE = NO;
486486
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../library";
487487
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
@@ -508,7 +508,7 @@
508508
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
509509
CODE_SIGN_IDENTITY = "iPhone Developer";
510510
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
511-
DEVELOPMENT_TEAM = V2DTUY5PQ8;
511+
DEVELOPMENT_TEAM = KHWJX47LP8;
512512
ENABLE_BITCODE = NO;
513513
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../library";
514514
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;

library/cge.framework/Headers/cgeEyeBrightenFilter.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

library/cge.framework/Headers/cgeEyeTintFilter.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

library/cge.framework/Headers/cgeGlobal.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@
99
#ifndef _CGEGLOBAL_H_
1010
#define _CGEGLOBAL_H_
1111

12+
#if defined(__APPLE__)
13+
#include <TargetConditionals.h>
14+
#endif
15+
1216
#ifdef GLEW_USED
1317
#include "cgePlatform_GLEW.h"
1418
#elif defined(ANDROID_NDK)
1519
#include "cgePlatform_ANDROID.h"
16-
#elif defined(IOS_SDK)
20+
#elif defined(IOS_SDK) || (defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
1721
#include "cgePlatform_iOS.h"
1822
#elif defined(LIBCGE4QT_LIB)
1923
#include "cgePlatform_QT.h"

library/cge.framework/Headers/cgeUtilFunctions.h

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99

10-
// 仅提供与安卓版一致的接口, 如需更佳的使用体验, 可直接调用C++代码!
10+
// Provide some useful functions.
1111

1212
#ifndef _CGE_UTILFUNCTIONS_H_
1313
#define _CGE_UTILFUNCTIONS_H_
@@ -34,18 +34,16 @@ extern "C" {
3434

3535
GLuint cgeGlobalTextureLoadFunc(const char* source, GLint* w, GLint* h, void* arg);
3636

37-
//通过配置创建单个滤镜
37+
//Create single filter with config
3838
void* cgeCreateFilterByConfig(const char* config);
3939

40-
//通过配置创建多重滤镜, 返回值一定是 CGEMutipleEffectFilter 类型
40+
//Create multiple filter with config. the return value must be kind of `CGEMutipleEffectFilter`
4141
void* cgeCreateMultipleFilterByConfig(const char* config, float intensity);
4242

4343
typedef struct CGETextureInfo
4444
{
4545
GLint width, height;
4646
GLuint name;
47-
// GLenum channelFormat; //取值: GL_RGBA, GL_RGB, GL_LUMINANCE_ALPHA, GL_LUMINANCE
48-
// GLenum dataFormat; //一般为 GL_UNSIGNED_BYTE
4947
}CGETextureInfo;
5048

5149
CGETextureInfo cgeLoadTextureByFile(const char* path);
@@ -60,18 +58,17 @@ extern "C" {
6058
int height; //图片高 (真实高度, 需要将对齐计算在内)
6159
}CGEFilterImageInfo;
6260

63-
//图像处理接口 (废弃)
61+
// deprecated.
6462
void cgeFilterImage_MultipleEffects(CGEFilterImageInfo dataIn, CGEFilterImageInfo dataOut, const char* config, float intensity, CGESharedGLContext* processingContext);
6563

66-
//图像处理接口 (推荐)
67-
//参数: uiimage - 输入图像
68-
// config - 附加等滤镜配置
69-
// intensity - 滤镜强度, 范围 [0, 1]
70-
// processingContext - 附加的context, 如果为 nil, 将使用 globalContext。 如果需要多线程使用, 请自行创建新的 context.
64+
//image processing interface (recommand)
65+
//args: uiimage - the input image
66+
// config - the filter rule string
67+
// intensity - range [0, 1]
68+
// processingContext - additional context, if it's nil, the function will use a globalContext。
69+
// So if you want to use it in different threads, you need to create it in each thread.
7170
UIImage* cgeFilterUIImage_MultipleEffects(UIImage* uiimage, const char* config, float intensity, CGESharedGLContext* processingContext);
7271

73-
//通过Buffer创建GL纹理, 如果可能, 请使用 GLKTextureLoader 直接完成
74-
//某些情况下 GLKTextureLoader 工作不正常, 在 GLKTextureLoader 工作不正常的情况下, 请使用本函数
7572
//info 的 width 和 height 将被写入texture的真实宽高 (tips: 后期可能存在UIImage过大时, 纹理将被压缩, 所以只有从这里获得的参数才是准确值)
7673
CGETextureInfo cgeUIImage2Texture(UIImage* uiimage);
7774

library/cge.framework/Info.plist

0 Bytes
Binary file not shown.
-158 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)