From 72750f03a49efbb528697976e86f66573bb9832e Mon Sep 17 00:00:00 2001 From: Michael Feldstein Date: Tue, 22 Sep 2015 15:53:50 -0500 Subject: [PATCH 1/3] Use NS_ENUM instead of typedef enum to eliminate 'ambiguous use' errors --- framework/Source/iOS/GPUImageContext.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/framework/Source/iOS/GPUImageContext.h b/framework/Source/iOS/GPUImageContext.h index 7e4fa0352..71142b886 100755 --- a/framework/Source/iOS/GPUImageContext.h +++ b/framework/Source/iOS/GPUImageContext.h @@ -4,7 +4,16 @@ #define GPUImageRotationSwapsWidthAndHeight(rotation) ((rotation) == kGPUImageRotateLeft || (rotation) == kGPUImageRotateRight || (rotation) == kGPUImageRotateRightFlipVertical || (rotation) == kGPUImageRotateRightFlipHorizontal) -typedef enum { kGPUImageNoRotation, kGPUImageRotateLeft, kGPUImageRotateRight, kGPUImageFlipVertical, kGPUImageFlipHorizonal, kGPUImageRotateRightFlipVertical, kGPUImageRotateRightFlipHorizontal, kGPUImageRotate180 } GPUImageRotationMode; +typedef NS_ENUM(NSUInteger, GPUImageRotationMode) { + kGPUImageNoRotation, + kGPUImageRotateLeft, + kGPUImageRotateRight, + kGPUImageFlipVertical, + kGPUImageFlipHorizonal, + kGPUImageRotateRightFlipVertical, + kGPUImageRotateRightFlipHorizontal, + kGPUImageRotate180 +}; @interface GPUImageContext : NSObject From ffbc0b4a8ff278d4eefd47f4ae0016eaf75641b1 Mon Sep 17 00:00:00 2001 From: Michael Feldstein Date: Tue, 6 Oct 2015 13:54:01 -0700 Subject: [PATCH 2/3] Update GPUImageFillModeType enum to use NS_ENUM --- framework/Source/iOS/GPUImageView.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/Source/iOS/GPUImageView.h b/framework/Source/iOS/GPUImageView.h index 03e12ee5e..b42651d3c 100755 --- a/framework/Source/iOS/GPUImageView.h +++ b/framework/Source/iOS/GPUImageView.h @@ -1,11 +1,13 @@ #import #import "GPUImageContext.h" -typedef enum { +typedef NS_ENUM(NSUInteger, GPUImageFillModeType) { kGPUImageFillModeStretch, // Stretch to fill the full view, which may distort the image outside of its normal aspect ratio kGPUImageFillModePreserveAspectRatio, // Maintains the aspect ratio of the source image, adding bars of the specified background color kGPUImageFillModePreserveAspectRatioAndFill // Maintains the aspect ratio of the source image, zooming in on its center to fill the view -} GPUImageFillModeType; +}; + + /** UIView subclass to use as an endpoint for displaying GPUImage outputs From ebd035bd0c71519d9f9a529f37e8040d857c0099 Mon Sep 17 00:00:00 2001 From: Michael Feldstein Date: Tue, 6 Oct 2015 13:56:18 -0700 Subject: [PATCH 3/3] Use ios sdk 9.0, 7.0 is really old --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 999f66b65..399c72e2e 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ set -e -IOSSDK_VER="7.0" +IOSSDK_VER="9.0" # xcodebuild -showsdks