Merge pull request BradLarson#2203 from digitalfx/master

Adds texture input/output to the Mac framework
Poopi · Apr 3, 2016 · ecdcafb · ecdcafb
2 parents 7f20a2c + 35e3230
commit ecdcafb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/framework/GPUImageMac.xcodeproj/project.pbxproj b/framework/GPUImageMac.xcodeproj/project.pbxproj
@@ -15,6 +15,10 @@
 		79840B841C8B29240079A83B /* GPUImageSolarizeFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 79840B821C8B29240079A83B /* GPUImageSolarizeFilter.m */; settings = {ASSET_TAGS = (); }; };
 		A4741D5A19A92098005EE1A4 /* GPUImageHistogramEqualizationFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A4741D5819A92098005EE1A4 /* GPUImageHistogramEqualizationFilter.h */; };
 		A4741D5B19A92098005EE1A4 /* GPUImageHistogramEqualizationFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = A4741D5919A92098005EE1A4 /* GPUImageHistogramEqualizationFilter.m */; };
+		A50607171C78BF7C0095D0BB /* GPUImageTextureOutput.h in Headers */ = {isa = PBXBuildFile; fileRef = A50607151C78BF7C0095D0BB /* GPUImageTextureOutput.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A50607181C78BF7C0095D0BB /* GPUImageTextureOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = A50607161C78BF7C0095D0BB /* GPUImageTextureOutput.m */; };
+		A506071B1C78BF8E0095D0BB /* GPUImageTextureInput.h in Headers */ = {isa = PBXBuildFile; fileRef = A50607191C78BF8E0095D0BB /* GPUImageTextureInput.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A506071C1C78BF8E0095D0BB /* GPUImageTextureInput.m in Sources */ = {isa = PBXBuildFile; fileRef = A506071A1C78BF8E0095D0BB /* GPUImageTextureInput.m */; };
 		A87E5E12177648F3007FD5B1 /* GPUImageRawDataOutput.h in Headers */ = {isa = PBXBuildFile; fileRef = A87E5E10177648F3007FD5B1 /* GPUImageRawDataOutput.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A87E5E13177648F3007FD5B1 /* GPUImageRawDataOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = A87E5E11177648F3007FD5B1 /* GPUImageRawDataOutput.m */; };
 		A87E5E1617764B16007FD5B1 /* GPUImageRawDataInput.h in Headers */ = {isa = PBXBuildFile; fileRef = A87E5E1417764B16007FD5B1 /* GPUImageRawDataInput.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -342,6 +346,10 @@
 		79840B821C8B29240079A83B /* GPUImageSolarizeFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageSolarizeFilter.m; path = Source/GPUImageSolarizeFilter.m; sourceTree = SOURCE_ROOT; };
 		A4741D5819A92098005EE1A4 /* GPUImageHistogramEqualizationFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageHistogramEqualizationFilter.h; path = Source/GPUImageHistogramEqualizationFilter.h; sourceTree = SOURCE_ROOT; };
 		A4741D5919A92098005EE1A4 /* GPUImageHistogramEqualizationFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageHistogramEqualizationFilter.m; path = Source/GPUImageHistogramEqualizationFilter.m; sourceTree = SOURCE_ROOT; };
+		A50607151C78BF7C0095D0BB /* GPUImageTextureOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageTextureOutput.h; path = Source/GPUImageTextureOutput.h; sourceTree = SOURCE_ROOT; };
+		A50607161C78BF7C0095D0BB /* GPUImageTextureOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageTextureOutput.m; path = Source/GPUImageTextureOutput.m; sourceTree = SOURCE_ROOT; };
+		A50607191C78BF8E0095D0BB /* GPUImageTextureInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageTextureInput.h; path = Source/GPUImageTextureInput.h; sourceTree = SOURCE_ROOT; };
+		A506071A1C78BF8E0095D0BB /* GPUImageTextureInput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageTextureInput.m; path = Source/GPUImageTextureInput.m; sourceTree = SOURCE_ROOT; };
 		A87E5E10177648F3007FD5B1 /* GPUImageRawDataOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageRawDataOutput.h; path = Source/GPUImageRawDataOutput.h; sourceTree = SOURCE_ROOT; };
 		A87E5E11177648F3007FD5B1 /* GPUImageRawDataOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageRawDataOutput.m; path = Source/GPUImageRawDataOutput.m; sourceTree = SOURCE_ROOT; };
 		A87E5E1417764B16007FD5B1 /* GPUImageRawDataInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageRawDataInput.h; path = Source/GPUImageRawDataInput.h; sourceTree = SOURCE_ROOT; };
@@ -766,6 +774,8 @@
 				BCF8679C1727585D00912E34 /* GPUImageAVCamera.m */,
 				BCF867541725AF9300912E34 /* GPUImagePicture.h */,
 				BCF867551725AF9300912E34 /* GPUImagePicture.m */,
+				A50607191C78BF8E0095D0BB /* GPUImageTextureInput.h */,
+				A506071A1C78BF8E0095D0BB /* GPUImageTextureInput.m */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -808,6 +818,8 @@
 				BCF40F2417248836005AE36A /* GPUImageView.m */,
 				BCF867521725AF9300912E34 /* GPUImageMovieWriter.h */,
 				BCF867531725AF9300912E34 /* GPUImageMovieWriter.m */,
+				A50607151C78BF7C0095D0BB /* GPUImageTextureOutput.h */,
+				A50607161C78BF7C0095D0BB /* GPUImageTextureOutput.m */,
 			);
 			name = Outputs;
 			sourceTree = "<group>";
@@ -1250,6 +1262,7 @@
 				BCA20B611746CFE60097C84A /* GPUImageThresholdSketchFilter.h in Headers */,
 				BCA20B651746D3C30097C84A /* GPUImageSmoothToonFilter.h in Headers */,
 				BCA20B691746D3DD0097C84A /* GPUImageTiltShiftFilter.h in Headers */,
+				A506071B1C78BF8E0095D0BB /* GPUImageTextureInput.h in Headers */,
 				BCA20B6D1746D44B0097C84A /* GPUImageCGAColorspaceFilter.h in Headers */,
 				BCA20B711746D4AC0097C84A /* GPUImagePosterizeFilter.h in Headers */,
 				BCA20B751746DE850097C84A /* GPUImageKuwaharaRadius3Filter.h in Headers */,
@@ -1280,6 +1293,7 @@
 				BCA20BC917471C4B0097C84A /* GPUImageVoronoiConsumerFilter.h in Headers */,
 				574B5D861BE9346800F4EC5A /* GPUImageMovie.h in Headers */,
 				BCD8EB8E18D6AFC5005ED83C /* GPUImageFramebufferCache.h in Headers */,
+				A50607171C78BF7C0095D0BB /* GPUImageTextureOutput.h in Headers */,
 				BC96A4F1176563C300F215A2 /* GPUImageNonMaximumSuppressionFilter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1380,6 +1394,7 @@
 				BCF867F91728494C00912E34 /* GPUImageGaussianBlurFilter.m in Sources */,
 				BCF867FD1728496E00912E34 /* GPUImageTwoPassTextureSamplingFilter.m in Sources */,
 				BCF8680117284C4000912E34 /* GPUImageFilterGroup.m in Sources */,
+				A506071C1C78BF8E0095D0BB /* GPUImageTextureInput.m in Sources */,
 				BCF8680517284CFC00912E34 /* GPUImageTransformFilter.m in Sources */,
 				BCF8680917284D0B00912E34 /* GPUImageCropFilter.m in Sources */,
 				BCF86811172853AA00912E34 /* GPUImageGaussianBlurPositionFilter.m in Sources */,
@@ -1503,6 +1518,7 @@
 				A87E5E13177648F3007FD5B1 /* GPUImageRawDataOutput.m in Sources */,
 				A87E5E1717764B16007FD5B1 /* GPUImageRawDataInput.m in Sources */,
 				BC8A583318124ABD00E6B507 /* GPUImageSingleComponentGaussianBlurFilter.m in Sources */,
+				A50607181C78BF7C0095D0BB /* GPUImageTextureOutput.m in Sources */,
 				BCD8EB8D18D6AFC5005ED83C /* GPUImageFramebuffer.m in Sources */,
 				BCD8EB8F18D6AFC5005ED83C /* GPUImageFramebufferCache.m in Sources */,
 			);

diff --git a/framework/Source/Mac/GPUImage.h b/framework/Source/Mac/GPUImage.h
@@ -12,6 +12,7 @@
 #import <GPUImage/GPUImagePicture.h>
 #import <GPUImage/GPUImageRawDataInput.h>
 #import <GPUImage/GPUImageRawDataOutput.h>
+#import <GPUImage/GPUImageTextureInput.h>
 
 // Filters
 #import <GPUImage/GPUImageFilter.h>
@@ -163,3 +164,4 @@
 // Outputs
 #import <GPUImage/GPUImageView.h>
 #import <GPUImage/GPUImageMovieWriter.h>
+#import <GPUImage/GPUImageTextureOutput.h>