Skip to content
Browse files

Merge pull request #1329 from rivera-ernesto/clean_demo_projects

Clean demo projects
  • Loading branch information...
2 parents 41bd711 + 62d2a9f commit 8e4a338f5dffcffe4cc155fa5cb3045d16642224 @BradLarson committed Dec 11, 2013
Showing with 366 additions and 85 deletions.
  1. +1 −3 examples/Mac/FilterShowcase/FilterShowcase.xcodeproj/project.pbxproj
  2. +1 −3 examples/Mac/MultiViewFilterExample/MultiViewFilterExample.xcodeproj/project.pbxproj
  3. +1 −3 examples/Mac/SimplePhotoFilter/SimplePhotoFilter.xcodeproj/project.pbxproj
  4. +92 −6 examples/Mac/SimplePhotoFilter/SimplePhotoFilter/en.lproj/SLSDocument.xib
  5. +26 −3 examples/iOS/BenchmarkSuite/BenchmarkSuite.xcodeproj/project.pbxproj
  6. BIN examples/iOS/BenchmarkSuite/Default-568h@2x.png
  7. +26 −3 examples/iOS/ColorObjectTracking/ColorObjectTracking.xcodeproj/project.pbxproj
  8. +19 −19 examples/iOS/ColorObjectTracking/ColorObjectTracking/ColorTrackingViewController.m
  9. BIN examples/iOS/ColorObjectTracking/Default-568h@2x.png
  10. +1 −1 examples/iOS/CubeExample/Classes/DisplayViewController.m
  11. +2 −2 examples/iOS/CubeExample/Classes/ES2Renderer.h
  12. +10 −4 examples/iOS/CubeExample/CubeExample.xcodeproj/project.pbxproj
  13. BIN examples/iOS/CubeExample/Default-568h@2x.png
  14. BIN examples/iOS/FeatureExtractionTest/Default-568h@2x.png
  15. +24 −3 examples/iOS/FeatureExtractionTest/FeatureExtractionTest.xcodeproj/project.pbxproj
  16. +4 −3 examples/iOS/FeatureExtractionTest/FeatureExtractionTest/FeatureExtractionAppDelegate.m
  17. BIN examples/iOS/MultiViewFilterExample/Default-568h@2x.png
  18. +26 −11 examples/iOS/MultiViewFilterExample/MultiViewFilterExample.xcodeproj/project.pbxproj
  19. +4 −4 examples/iOS/MultiViewFilterExample/MultiViewFilterExample/MultiViewViewController.m
  20. BIN examples/iOS/RawDataTest/Default-568h@2x.png
  21. +24 −3 examples/iOS/RawDataTest/RawDataTest.xcodeproj/project.pbxproj
  22. +3 −2 examples/iOS/RawDataTest/RawDataTest/RawDataTestAppDelegate.m
  23. BIN examples/iOS/SimpleImageFilter/Default-568h@2x.png
  24. +26 −3 examples/iOS/SimpleImageFilter/SimpleImageFilter.xcodeproj/project.pbxproj
  25. BIN examples/iOS/SimplePhotoFilter/Default-568h@2x.png
  26. +24 −3 examples/iOS/SimplePhotoFilter/SimplePhotoFilter.xcodeproj/project.pbxproj
  27. BIN examples/iOS/SimpleVideoFileFilter/Default-568h@2x.png
  28. +26 −3 examples/iOS/SimpleVideoFileFilter/SimpleVideoFileFilter.xcodeproj/project.pbxproj
  29. BIN examples/iOS/SimpleVideoFilter/Default-568h@2x.png
  30. +26 −3 examples/iOS/SimpleVideoFilter/SimpleVideoFilter.xcodeproj/project.pbxproj
View
4 examples/Mac/FilterShowcase/FilterShowcase.xcodeproj/project.pbxproj
@@ -214,7 +214,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = SLS;
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Sunset Lake Software LLC";
};
buildConfigurationList = BCF8676517263EAC00912E34 /* Build configuration list for PBXProject "FilterShowcase" */;
@@ -325,7 +325,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -358,7 +357,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
View
4 examples/Mac/MultiViewFilterExample/MultiViewFilterExample.xcodeproj/project.pbxproj
@@ -192,7 +192,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = SLS;
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Sunset Lake Software LLC";
};
buildConfigurationList = BCB00A0C172B0CC500DB804C /* Build configuration list for PBXProject "MultiViewFilterExample" */;
@@ -297,7 +297,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -330,7 +329,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
View
4 examples/Mac/SimplePhotoFilter/SimplePhotoFilter.xcodeproj/project.pbxproj
@@ -176,7 +176,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = SLS;
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Sunset Lake Software LLC";
};
buildConfigurationList = BCA3F3381723A2E800E28AEC /* Build configuration list for PBXProject "SimplePhotoFilter" */;
@@ -285,7 +285,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -318,7 +317,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
View
98 examples/Mac/SimplePhotoFilter/SimplePhotoFilter/en.lproj/SLSDocument.xib
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">13A598</string>
- <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+ <string key="IBDocument.InterfaceBuilderVersion">4514</string>
<string key="IBDocument.AppKitVersion">1265</string>
<string key="IBDocument.HIToolboxVersion">695.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">4510</string>
+ <string key="NS.object.0">4514</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
@@ -37,21 +37,22 @@
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{133, 235}, {507, 413}}</string>
- <int key="NSWTFlags">1886912512</int>
+ <int key="NSWTFlags">1618477056</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
<string key="NSViewClass">View</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{94, 86}</string>
<object class="NSView" key="NSWindowView" id="568628114">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSOpenGLView" id="43375716">
<reference key="NSNextResponder" ref="568628114"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 54}, {507, 359}}</string>
<reference key="NSSuperview" ref="568628114"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="411225605"/>
<string key="NSReuseIdentifierKey">_NS:24</string>
<object class="NSOpenGLPixelFormat" key="NSPixelFormat">
@@ -63,8 +64,10 @@
<object class="NSSlider" id="411225605">
<reference key="NSNextResponder" ref="568628114"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 18}, {471, 20}}</string>
+ <string key="NSFrame">{{18, 18}, {471, 21}}</string>
<reference key="NSSuperview" ref="568628114"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="171769506">
@@ -86,9 +89,11 @@
</object>
</array>
<string key="NSFrameSize">{507, 413}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="43375716"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMinSize">{94, 108}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
@@ -405,6 +410,87 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSDocument</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="browseDocumentVersions:">id</string>
+ <string key="duplicateDocument:">id</string>
+ <string key="lockDocument:">id</string>
+ <string key="moveDocument:">id</string>
+ <string key="moveDocumentToUbiquityContainer:">id</string>
+ <string key="printDocument:">id</string>
+ <string key="renameDocument:">id</string>
+ <string key="revertDocumentToSaved:">id</string>
+ <string key="runPageLayout:">id</string>
+ <string key="saveDocument:">id</string>
+ <string key="saveDocumentAs:">id</string>
+ <string key="saveDocumentTo:">id</string>
+ <string key="saveDocumentToPDF:">id</string>
+ <string key="unlockDocument:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="browseDocumentVersions:">
+ <string key="name">browseDocumentVersions:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="duplicateDocument:">
+ <string key="name">duplicateDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="lockDocument:">
+ <string key="name">lockDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="moveDocument:">
+ <string key="name">moveDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="moveDocumentToUbiquityContainer:">
+ <string key="name">moveDocumentToUbiquityContainer:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="printDocument:">
+ <string key="name">printDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="renameDocument:">
+ <string key="name">renameDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="revertDocumentToSaved:">
+ <string key="name">revertDocumentToSaved:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="runPageLayout:">
+ <string key="name">runPageLayout:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="saveDocument:">
+ <string key="name">saveDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="saveDocumentAs:">
+ <string key="name">saveDocumentAs:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="saveDocumentTo:">
+ <string key="name">saveDocumentTo:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="saveDocumentToPDF:">
+ <string key="name">saveDocumentToPDF:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="unlockDocument:">
+ <string key="name">unlockDocument:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSDocument.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
View
29 examples/iOS/BenchmarkSuite/BenchmarkSuite.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
BCF9D1E314EC4F7C00986461 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF9D1E214EC4F7C00986461 /* AVFoundation.framework */; };
BCF9D1EA14EC569700986461 /* Lambeau.jpg in Resources */ = {isa = PBXBuildFile; fileRef = BCF9D1E914EC569700986461 /* Lambeau.jpg */; };
BCF9D20C14EC7EB100986461 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF9D20B14EC7EB100986461 /* CoreImage.framework */; };
+ E5066F251855A55B008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F241855A55B008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -106,6 +107,7 @@
BCF9D1E214EC4F7C00986461 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
BCF9D1E914EC569700986461 /* Lambeau.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = Lambeau.jpg; path = ../../SimpleImageFilter/SimpleImageFilter/Lambeau.jpg; sourceTree = "<group>"; };
BCF9D20B14EC7EB100986461 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
+ E5066F241855A55B008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -142,6 +144,7 @@
BCF9D14B14EAD24200986461 = {
isa = PBXGroup;
children = (
+ E5066F241855A55B008C7682 /* Default-568h@2x.png */,
BCF9D16014EAD24200986461 /* BenchmarkSuite */,
BCF9D15914EAD24200986461 /* Frameworks */,
BCF9D15714EAD24200986461 /* Products */,
@@ -244,7 +247,7 @@
BCF9D14D14EAD24200986461 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BCF9D15014EAD24200986461 /* Build configuration list for PBXProject "BenchmarkSuite" */;
@@ -305,6 +308,7 @@
BCB3C3D216BCA4AD003D26B0 /* Icon-72.png in Resources */,
BCB3C3D316BCA4AD003D26B0 /* Icon-72@2x.png in Resources */,
BCB3C3D416BCA4AD003D26B0 /* Icon.png in Resources */,
+ E5066F251855A55B008C7682 /* Default-568h@2x.png in Resources */,
BCB3C3D516BCA4AD003D26B0 /* Icon@2x.png in Resources */,
BCB3C3D616BCA4AD003D26B0 /* iTunesArtwork.png in Resources */,
);
@@ -352,8 +356,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -366,11 +375,16 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -381,15 +395,24 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
View
BIN examples/iOS/BenchmarkSuite/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
29 examples/iOS/ColorObjectTracking/ColorObjectTracking.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
BCB5E7AA14E3472100701302 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5E7A914E3472100701302 /* CoreMedia.framework */; };
BCB5E7B214E460D300701302 /* Threshold.fsh in Resources */ = {isa = PBXBuildFile; fileRef = BCB5E7B114E460D300701302 /* Threshold.fsh */; };
BCF866E91725A39D00912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF866E41725A38C00912E34 /* libGPUImage.a */; };
+ E5066F2A1855A595008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F291855A595008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -79,6 +80,7 @@
BCB5E7A714E3471100701302 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
BCB5E7A914E3472100701302 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
BCB5E7B114E460D300701302 /* Threshold.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = Threshold.fsh; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.glsl; };
+ E5066F291855A595008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -104,6 +106,7 @@
BC245DCF14DDC959009FE7EB = {
isa = PBXGroup;
children = (
+ E5066F291855A595008C7682 /* Default-568h@2x.png */,
BC245DE414DDC959009FE7EB /* ColorObjectTracking */,
BC245DDD14DDC959009FE7EB /* Frameworks */,
BC245DDB14DDC959009FE7EB /* Products */,
@@ -208,7 +211,7 @@
BC245DD114DDC959009FE7EB /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BC245DD414DDC959009FE7EB /* Build configuration list for PBXProject "ColorObjectTracking" */;
@@ -258,6 +261,7 @@
files = (
BC245DE914DDC959009FE7EB /* InfoPlist.strings in Resources */,
BCB5E7B214E460D300701302 /* Threshold.fsh in Resources */,
+ E5066F2A1855A595008C7682 /* Default-568h@2x.png in Resources */,
BCB5DD8314E85CB0000AF3C2 /* PositionColor.fsh in Resources */,
BCB3C3DF16BCA51E003D26B0 /* Icon-72.png in Resources */,
BCB3C3E016BCA51E003D26B0 /* Icon-72@2x.png in Resources */,
@@ -306,8 +310,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -319,11 +328,16 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -333,14 +347,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
View
38 examples/iOS/ColorObjectTracking/ColorObjectTracking/ColorTrackingViewController.m
@@ -69,12 +69,12 @@ - (void)configureVideoFiltering;
positionRawData = [[GPUImageRawDataOutput alloc] initWithImageSize:videoPixelSize resultsInBGRAFormat:YES];
__unsafe_unretained ColorTrackingViewController *weakSelf = self;
[positionRawData setNewFrameAvailableBlock:^{
- GLubyte *bytesForPositionData = positionRawData.rawBytesForImage;
- CGPoint currentTrackingLocation = [weakSelf centroidFromTexture:bytesForPositionData ofSize:[positionRawData maximumOutputSize]];
+ GLubyte *bytesForPositionData = weakSelf->positionRawData.rawBytesForImage;
+ CGPoint currentTrackingLocation = [weakSelf centroidFromTexture:bytesForPositionData ofSize:[weakSelf->positionRawData maximumOutputSize]];
// NSLog(@"Centroid from CPU: %f, %f", currentTrackingLocation.x, currentTrackingLocation.y);
CGSize currentViewSize = weakSelf.view.bounds.size;
dispatch_async(dispatch_get_main_queue(), ^{
- trackingDot.position = CGPointMake(currentTrackingLocation.x * currentViewSize.width, currentTrackingLocation.y * currentViewSize.height);
+ weakSelf->trackingDot.position = CGPointMake(currentTrackingLocation.x * currentViewSize.width, currentTrackingLocation.y * currentViewSize.height);
});
}];
@@ -86,38 +86,38 @@ - (void)configureVideoFiltering;
// NSLog(@"Average color: %f, %f, %f, %f", redComponent, greenComponent, blueComponent, alphaComponent);
CGSize currentViewSize = weakSelf.view.bounds.size;
dispatch_async(dispatch_get_main_queue(), ^{
- trackingDot.position = CGPointMake(currentTrackingLocation.x * currentViewSize.width, currentTrackingLocation.y * currentViewSize.height);
+ weakSelf->trackingDot.position = CGPointMake(currentTrackingLocation.x * currentViewSize.width, currentTrackingLocation.y * currentViewSize.height);
});
}];
videoRawData = [[GPUImageRawDataOutput alloc] initWithImageSize:videoPixelSize resultsInBGRAFormat:YES];
[videoRawData setNewFrameAvailableBlock:^{
- if (shouldReplaceThresholdColor)
+ if (weakSelf->shouldReplaceThresholdColor)
{
- CGSize currentViewSize = self.view.bounds.size;
- CGSize rawPixelsSize = [videoRawData maximumOutputSize];
+ CGSize currentViewSize = weakSelf.view.bounds.size;
+ CGSize rawPixelsSize = [weakSelf->videoRawData maximumOutputSize];
CGPoint scaledTouchPoint;
- scaledTouchPoint.x = (currentTouchPoint.x / currentViewSize.width) * rawPixelsSize.width;
- scaledTouchPoint.y = (currentTouchPoint.y / currentViewSize.height) * rawPixelsSize.height;
+ scaledTouchPoint.x = (weakSelf->currentTouchPoint.x / currentViewSize.width) * rawPixelsSize.width;
+ scaledTouchPoint.y = (weakSelf->currentTouchPoint.y / currentViewSize.height) * rawPixelsSize.height;
- GPUByteColorVector colorAtTouchPoint = [videoRawData colorAtLocation:scaledTouchPoint];
+ GPUByteColorVector colorAtTouchPoint = [weakSelf->videoRawData colorAtLocation:scaledTouchPoint];
- thresholdColor.one = (float)colorAtTouchPoint.red / 255.0;
- thresholdColor.two = (float)colorAtTouchPoint.green / 255.0;
- thresholdColor.three = (float)colorAtTouchPoint.blue / 255.0;
+ weakSelf->thresholdColor.one = (float)colorAtTouchPoint.red / 255.0;
+ weakSelf->thresholdColor.two = (float)colorAtTouchPoint.green / 255.0;
+ weakSelf->thresholdColor.three = (float)colorAtTouchPoint.blue / 255.0;
// NSLog(@"Color at touch point: %d, %d, %d, %d", colorAtTouchPoint.red, colorAtTouchPoint.green, colorAtTouchPoint.blue, colorAtTouchPoint.alpha);
- [[NSUserDefaults standardUserDefaults] setFloat:thresholdColor.one forKey:@"thresholdColorR"];
- [[NSUserDefaults standardUserDefaults] setFloat:thresholdColor.two forKey:@"thresholdColorG"];
- [[NSUserDefaults standardUserDefaults] setFloat:thresholdColor.three forKey:@"thresholdColorB"];
+ [[NSUserDefaults standardUserDefaults] setFloat:weakSelf->thresholdColor.one forKey:@"thresholdColorR"];
+ [[NSUserDefaults standardUserDefaults] setFloat:weakSelf->thresholdColor.two forKey:@"thresholdColorG"];
+ [[NSUserDefaults standardUserDefaults] setFloat:weakSelf->thresholdColor.three forKey:@"thresholdColorB"];
- [thresholdFilter setFloatVec3:thresholdColor forUniformName:@"inputColor"];
- [positionFilter setFloatVec3:thresholdColor forUniformName:@"inputColor"];
+ [weakSelf->thresholdFilter setFloatVec3:weakSelf->thresholdColor forUniformName:@"inputColor"];
+ [weakSelf->positionFilter setFloatVec3:weakSelf->thresholdColor forUniformName:@"inputColor"];
- shouldReplaceThresholdColor = NO;
+ weakSelf->shouldReplaceThresholdColor = NO;
}
}];
View
BIN examples/iOS/ColorObjectTracking/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2 examples/iOS/CubeExample/Classes/DisplayViewController.m
@@ -27,7 +27,7 @@ - (void)dealloc
- (void)loadView
{
CGRect mainScreenFrame = [[UIScreen mainScreen] applicationFrame];
- GPUImageView *primaryView = [[GPUImageView alloc] initWithFrame:mainScreenFrame];
+ GPUImageView *primaryView = [[[GPUImageView alloc] initWithFrame:mainScreenFrame] autorelease];
self.view = primaryView;
renderer = [[ES2Renderer alloc] initWithSize:[primaryView sizeInPixels]];
View
4 examples/iOS/CubeExample/Classes/ES2Renderer.h
@@ -19,14 +19,14 @@
GLint backingHeight;
// The OpenGL ES names for the framebuffer and renderbuffer used to render to this view
- GLuint defaultFramebuffer, colorRenderbuffer, depthBuffer;
+ GLuint defaultFramebuffer, colorRenderbuffer;
CATransform3D currentCalculatedMatrix;
GLuint program;
GPUImageVideoCamera *videoCamera;
- GPUImageFilter *inputFilter, *outputFilter;
+ GPUImageFilter *inputFilter;
GPUImageTextureOutput *textureOutput;
}
View
14 examples/iOS/CubeExample/CubeExample.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -27,6 +27,7 @@
BCB6B8C41505C2780041703B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB6B8C31505C2780041703B /* CoreGraphics.framework */; };
BCF3D690153CC5E6009A1FE5 /* DisplayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF3D68F153CC5E6009A1FE5 /* DisplayViewController.m */; };
BCF866F61725A44300912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF866F11725A41E00912E34 /* libGPUImage.a */; };
+ E5066F311855A66A008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F301855A66A008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -81,6 +82,7 @@
BCB6B8C31505C2780041703B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
BCF3D68E153CC5E5009A1FE5 /* DisplayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayViewController.h; sourceTree = "<group>"; };
BCF3D68F153CC5E6009A1FE5 /* DisplayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DisplayViewController.m; sourceTree = "<group>"; };
+ E5066F301855A66A008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -137,6 +139,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
+ E5066F301855A66A008C7682 /* Default-568h@2x.png */,
080E96DDFE201D6D7F000001 /* Classes */,
2514C27610084DB600A42282 /* Shaders */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -220,8 +223,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0500;
+ };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CubeExample" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -272,6 +278,7 @@
BCB3C3EC16BCA5AC003D26B0 /* Icon-72.png in Resources */,
BCB3C3ED16BCA5AC003D26B0 /* Icon-72@2x.png in Resources */,
BCB3C3EE16BCA5AC003D26B0 /* Icon.png in Resources */,
+ E5066F311855A66A008C7682 /* Default-568h@2x.png in Resources */,
BCB3C3EF16BCA5AC003D26B0 /* Icon@2x.png in Resources */,
BCB3C3F016BCA5AC003D26B0 /* iTunesArtwork.png in Resources */,
);
@@ -334,7 +341,6 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
@@ -343,6 +349,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-fobjc-arc";
PREBINDING = NO;
SDKROOT = iphoneos;
@@ -353,7 +360,6 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
View
BIN examples/iOS/CubeExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN examples/iOS/FeatureExtractionTest/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
27 examples/iOS/FeatureExtractionTest/FeatureExtractionTest.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
BCD9A356157EC35E00C41504 /* 8pixeltest.png in Resources */ = {isa = PBXBuildFile; fileRef = BCD9A355157EC35E00C41504 /* 8pixeltest.png */; };
BCF2860F1628A5140051E9C5 /* LineTest2.png in Resources */ = {isa = PBXBuildFile; fileRef = BCF2860E1628A5140051E9C5 /* LineTest2.png */; };
BCF867031725A53400912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF866FE1725A4E600912E34 /* libGPUImage.a */; };
+ E5066F3F1855A75D008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F3E1855A75D008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -88,6 +89,7 @@
BCB79DC615E9754000965D92 /* ChairTest.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ChairTest.png; sourceTree = "<group>"; };
BCD9A355157EC35E00C41504 /* 8pixeltest.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 8pixeltest.png; sourceTree = "<group>"; };
BCF2860E1628A5140051E9C5 /* LineTest2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LineTest2.png; sourceTree = "<group>"; };
+ E5066F3E1855A75D008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -114,6 +116,7 @@
BC18E08B156C822E00AB8026 = {
isa = PBXGroup;
children = (
+ E5066F3E1855A75D008C7682 /* Default-568h@2x.png */,
BC18E0A0156C822E00AB8026 /* FeatureExtractionTest */,
BC18E099156C822E00AB8026 /* Frameworks */,
BC18E097156C822E00AB8026 /* Products */,
@@ -215,7 +218,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = FeatureExtraction;
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BC18E090156C822E00AB8026 /* Build configuration list for PBXProject "FeatureExtractionTest" */;
@@ -268,6 +271,7 @@
BCD9A356157EC35E00C41504 /* 8pixeltest.png in Resources */,
BC46D52415D03D9C00CC63CA /* LBPTest.png in Resources */,
BCB79DC715E9754000965D92 /* ChairTest.png in Resources */,
+ E5066F3F1855A75D008C7682 /* Default-568h@2x.png in Resources */,
BCA464C9162785EA00C0F68E /* LineTest.png in Resources */,
BC8A581C1810782200E6B507 /* GaussianTest.png in Resources */,
BCF2860F1628A5140051E9C5 /* LineTest2.png in Resources */,
@@ -317,8 +321,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -330,11 +339,15 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -344,14 +357,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
View
7 examples/iOS/FeatureExtractionTest/FeatureExtractionTest/FeatureExtractionAppDelegate.m
@@ -170,6 +170,7 @@ - (void)testHoughTransform:(GPUImageHoughTransformLineDetector *)lineDetector of
[pictureInput removeAllTargets];
[pictureInput addTarget:lineDetector];
+ __unsafe_unretained GPUImageHoughTransformLineDetector * weakDetector = lineDetector;
[lineDetector setLinesDetectedBlock:^(GLfloat* lineArray, NSUInteger linesDetected, CMTime frameTime){
NSLog(@"Number of lines: %d", linesDetected);
@@ -191,7 +192,7 @@ - (void)testHoughTransform:(GPUImageHoughTransformLineDetector *)lineDetector of
dispatch_async(dispatch_get_main_queue(), ^{
NSUInteger currentImageIndex = 0;
- for (UIImage *currentImage in lineDetector.intermediateImages)
+ for (UIImage *currentImage in weakDetector.intermediateImages)
{
[self saveImage:currentImage fileName:[NSString stringWithFormat:@"%@-%@-%d.png", detectorName, pictureName, currentImageIndex]];
@@ -216,7 +217,7 @@ - (void)testCornerDetector:(GPUImageHarrisCornerDetectionFilter *)cornerDetector
[pictureInput addTarget:cornerDetector];
-
+ __unsafe_unretained GPUImageHarrisCornerDetectionFilter * weakDetector = cornerDetector;
[cornerDetector setCornersDetectedBlock:^(GLfloat* cornerArray, NSUInteger cornersDetected, CMTime frameTime) {
GPUImageCrosshairGenerator *crosshairGenerator = [[GPUImageCrosshairGenerator alloc] init];
crosshairGenerator.crosshairWidth = 10.0;
@@ -237,7 +238,7 @@ - (void)testCornerDetector:(GPUImageHarrisCornerDetectionFilter *)cornerDetector
dispatch_async(dispatch_get_main_queue(), ^{
NSUInteger currentImageIndex = 0;
- for (UIImage *currentImage in cornerDetector.intermediateImages)
+ for (UIImage *currentImage in weakDetector.intermediateImages)
{
[self saveImage:currentImage fileName:[NSString stringWithFormat:@"%@-%@-%d.png", detectorName, pictureName, currentImageIndex]];
View
BIN examples/iOS/MultiViewFilterExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
37 examples/iOS/MultiViewFilterExample/MultiViewFilterExample.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
BCB3C40A16BCA69F003D26B0 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = BCB3C40516BCA69F003D26B0 /* iTunesArtwork.png */; };
BCB5DD6614E76CD2000AF3C2 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DD6514E76CD2000AF3C2 /* AVFoundation.framework */; };
BCF867101725A58F00912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF8670B1725A56D00912E34 /* libGPUImage.a */; };
+ E5066F471855A86D008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F461855A86D008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -79,6 +80,7 @@
BCB3C40416BCA69F003D26B0 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "../../SharedIcons/Icon@2x.png"; sourceTree = "<group>"; };
BCB3C40516BCA69F003D26B0 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = ../../SharedIcons/iTunesArtwork.png; sourceTree = "<group>"; };
BCB5DD6514E76CD2000AF3C2 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+ E5066F461855A86D008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -104,6 +106,7 @@
BC01CA7614E7620600967264 = {
isa = PBXGroup;
children = (
+ E5066F461855A86D008C7682 /* Default-568h@2x.png */,
BC01CA8B14E7620600967264 /* MultiViewFilterExample */,
BC01CA8414E7620600967264 /* Frameworks */,
BC01CA8214E7620600967264 /* Products */,
@@ -200,7 +203,7 @@
BC01CA7814E7620600967264 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BC01CA7B14E7620600967264 /* Build configuration list for PBXProject "MultiViewFilterExample" */;
@@ -250,6 +253,7 @@
files = (
BC01CA9014E7620600967264 /* InfoPlist.strings in Resources */,
BC3145C814E76BA700824EA0 /* Shader1.fsh in Resources */,
+ E5066F471855A86D008C7682 /* Default-568h@2x.png in Resources */,
BC3145C914E76BA700824EA0 /* Shader2.fsh in Resources */,
BCB3C40616BCA69F003D26B0 /* Icon-72.png in Resources */,
BCB3C40716BCA69F003D26B0 /* Icon-72@2x.png in Resources */,
@@ -298,7 +302,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
@@ -312,11 +321,16 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-fobjc-arc";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@@ -328,15 +342,24 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
@@ -356,10 +379,6 @@
GCC_PREFIX_HEADER = "MultiViewFilterExample/MultiViewFilterExample-Prefix.pch";
INFOPLIST_FILE = "MultiViewFilterExample/MultiViewFilterExample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib/arc\"",
- );
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -372,10 +391,6 @@
GCC_PREFIX_HEADER = "MultiViewFilterExample/MultiViewFilterExample-Prefix.pch";
INFOPLIST_FILE = "MultiViewFilterExample/MultiViewFilterExample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib/arc\"",
- );
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
View
8 examples/iOS/MultiViewFilterExample/MultiViewFilterExample/MultiViewViewController.m
@@ -20,7 +20,7 @@ - (void)didReceiveMemoryWarning
- (void)loadView
{
CGRect mainScreenFrame = [[UIScreen mainScreen] applicationFrame];
- UIView *primaryView = [[UIView alloc] initWithFrame:mainScreenFrame];
+ UIView *primaryView = [[[UIView alloc] initWithFrame:mainScreenFrame] autorelease];
primaryView.backgroundColor = [UIColor blueColor];
self.view = primaryView;
@@ -38,9 +38,9 @@ - (void)loadView
[self.view addSubview:view3];
[self.view addSubview:view4];
- GPUImageFilter *filter1 = [[GPUImageFilter alloc] initWithFragmentShaderFromFile:@"Shader1"];
- GPUImageFilter *filter2 = [[GPUImageFilter alloc] initWithFragmentShaderFromFile:@"Shader2"];
- GPUImageSepiaFilter *filter3 = [[GPUImageSepiaFilter alloc] init];
+ GPUImageFilter *filter1 = [[[GPUImageFilter alloc] initWithFragmentShaderFromFile:@"Shader1"] autorelease];
+ GPUImageFilter *filter2 = [[[GPUImageFilter alloc] initWithFragmentShaderFromFile:@"Shader2"] autorelease];
+ GPUImageSepiaFilter *filter3 = [[[GPUImageSepiaFilter alloc] init] autorelease];
// GPUImageBrightnessFilter *filter1 = [[GPUImageBrightnessFilter alloc] init];
// GPUImageBrightnessFilter *filter2 = [[GPUImageBrightnessFilter alloc] init];
View
BIN examples/iOS/RawDataTest/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
27 examples/iOS/RawDataTest/RawDataTest.xcodeproj/project.pbxproj
@@ -25,6 +25,7 @@
BCF1E6241569D42A006B155F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF1E6221569D42A006B155F /* QuartzCore.framework */; };
BCF1E63F156AAB4E006B155F /* CalculationShader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = BCF1E63E156AAB4E006B155F /* CalculationShader.fsh */; };
BCF8671D1725A63600912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF867181725A62900912E34 /* libGPUImage.a */; };
+ E5066F4C1855A96B008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F4B1855A96B008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -74,6 +75,7 @@
BCF1E6221569D42A006B155F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
BCF1E6251569D453006B155F /* GPUImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GPUImage.xcodeproj; path = ../../../framework/GPUImage.xcodeproj; sourceTree = "<group>"; };
BCF1E63E156AAB4E006B155F /* CalculationShader.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = CalculationShader.fsh; sourceTree = "<group>"; };
+ E5066F4B1855A96B008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -99,6 +101,7 @@
BCF1E5F71569D372006B155F = {
isa = PBXGroup;
children = (
+ E5066F4B1855A96B008C7682 /* Default-568h@2x.png */,
BCF1E60C1569D372006B155F /* RawDataTest */,
BCF1E6051569D372006B155F /* Frameworks */,
BCF1E6031569D372006B155F /* Products */,
@@ -193,7 +196,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = RawDataTest;
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BCF1E5FC1569D372006B155F /* Build configuration list for PBXProject "RawDataTest" */;
@@ -246,6 +249,7 @@
BCB3C41116BCA74F003D26B0 /* Icon-72.png in Resources */,
BCB3C41216BCA74F003D26B0 /* Icon-72@2x.png in Resources */,
BCB3C41316BCA74F003D26B0 /* Icon@2x.png in Resources */,
+ E5066F4C1855A96B008C7682 /* Default-568h@2x.png in Resources */,
BCB3C41816BCA75A003D26B0 /* Icon.png in Resources */,
BCB3C41916BCA75A003D26B0 /* iTunesArtwork.png in Resources */,
);
@@ -289,8 +293,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -302,11 +311,15 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -316,14 +329,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
View
5 examples/iOS/RawDataTest/RawDataTest/RawDataTestAppDelegate.m
@@ -30,9 +30,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[rawDataInput addTarget:customFilter];
[customFilter addTarget:rawDataOutput];
+ __unsafe_unretained GPUImageRawDataOutput * weakOutput = rawDataOutput;
[rawDataOutput setNewFrameAvailableBlock:^{
- GLubyte *outputBytes = [rawDataOutput rawBytesForImage];
- NSInteger bytesPerRow = [rawDataOutput bytesPerRowInOutput];
+ GLubyte *outputBytes = [weakOutput rawBytesForImage];
+ NSInteger bytesPerRow = [weakOutput bytesPerRowInOutput];
NSLog(@"Bytes per row: %d", bytesPerRow);
for (unsigned int yIndex = 0; yIndex < 10; yIndex++)
{
View
BIN examples/iOS/SimpleImageFilter/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
29 examples/iOS/SimpleImageFilter/SimpleImageFilter.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
BCB5E86314E6F05A00701302 /* WID-small.jpg in Resources */ = {isa = PBXBuildFile; fileRef = BCB5E86214E6F05A00701302 /* WID-small.jpg */; };
BCB5E86514E6F1D700701302 /* Lambeau.jpg in Resources */ = {isa = PBXBuildFile; fileRef = BCB5E86414E6F1D700701302 /* Lambeau.jpg */; };
BCF8672A1725A6B400912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF867251725A69A00912E34 /* libGPUImage.a */; };
+ E5066F511855A9F2008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F501855A9F2008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -79,6 +80,7 @@
BCB5E82214E62A3C00701302 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
BCB5E86214E6F05A00701302 /* WID-small.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "WID-small.jpg"; sourceTree = "<group>"; };
BCB5E86414E6F1D700701302 /* Lambeau.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = Lambeau.jpg; sourceTree = "<group>"; };
+ E5066F501855A9F2008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -104,6 +106,7 @@
BCB5E7DD14E605A900701302 = {
isa = PBXGroup;
children = (
+ E5066F501855A9F2008C7682 /* Default-568h@2x.png */,
BCB5E7F214E605A900701302 /* SimpleImageFilter */,
BCB5E7EB14E605A900701302 /* Frameworks */,
BCB5E7E914E605A900701302 /* Products */,
@@ -200,7 +203,7 @@
BCB5E7DF14E605A900701302 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BCB5E7E214E605A900701302 /* Build configuration list for PBXProject "SimpleImageFilter" */;
@@ -250,6 +253,7 @@
files = (
BCB5E7F714E605A900701302 /* InfoPlist.strings in Resources */,
BCB5E86314E6F05A00701302 /* WID-small.jpg in Resources */,
+ E5066F511855A9F2008C7682 /* Default-568h@2x.png in Resources */,
BCB5E86514E6F1D700701302 /* Lambeau.jpg in Resources */,
BCB3C42016BCA7B7003D26B0 /* Icon-72.png in Resources */,
BCB3C42116BCA7B7003D26B0 /* Icon-72@2x.png in Resources */,
@@ -298,8 +302,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -311,11 +320,16 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -326,14 +340,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
View
BIN examples/iOS/SimplePhotoFilter/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
27 examples/iOS/SimplePhotoFilter/SimplePhotoFilter.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
BCC1E6D01523E4780006EFA5 /* PhotoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC1E6CF1523E4780006EFA5 /* PhotoViewController.m */; };
BCC1E6DA1523E9DC0006EFA5 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC1E6D91523E9DB0006EFA5 /* AVFoundation.framework */; };
BCF867371725A72000912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF867321725A70500912E34 /* libGPUImage.a */; };
+ E5066F561855AA1A008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F551855AA1A008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -77,6 +78,7 @@
BCC1E6CE1523E4780006EFA5 /* PhotoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoViewController.h; sourceTree = "<group>"; };
BCC1E6CF1523E4780006EFA5 /* PhotoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoViewController.m; sourceTree = "<group>"; };
BCC1E6D91523E9DB0006EFA5 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+ E5066F551855AA1A008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -103,6 +105,7 @@
BCC1E6911523E3620006EFA5 = {
isa = PBXGroup;
children = (
+ E5066F551855AA1A008C7682 /* Default-568h@2x.png */,
BCC1E6A61523E3620006EFA5 /* SimplePhotoFilter */,
BCC1E69F1523E3620006EFA5 /* Frameworks */,
BCC1E69D1523E3620006EFA5 /* Products */,
@@ -199,7 +202,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = Showcase;
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BCC1E6961523E3620006EFA5 /* Build configuration list for PBXProject "SimplePhotoFilter" */;
@@ -252,6 +255,7 @@
BCB3C42E16BCA81D003D26B0 /* Icon-72@2x.png in Resources */,
BCB3C42F16BCA81D003D26B0 /* Icon.png in Resources */,
BCB3C43016BCA81D003D26B0 /* Icon@2x.png in Resources */,
+ E5066F561855AA1A008C7682 /* Default-568h@2x.png in Resources */,
BCB3C43116BCA81D003D26B0 /* iTunesArtwork.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -295,8 +299,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -308,11 +317,15 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -322,14 +335,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
View
BIN examples/iOS/SimpleVideoFileFilter/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
29 examples/iOS/SimpleVideoFileFilter/SimpleVideoFileFilter.xcodeproj/project.pbxproj
@@ -28,6 +28,7 @@
BCB5DDFF14E87783000AF3C2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */; };
BCB5DE0114E87789000AF3C2 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */; };
BCF867441725AAA300912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF8673F1725AA7E00912E34 /* libGPUImage.a */; };
+ E5066F5C1855AC55008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F5B1855AC55008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -81,6 +82,7 @@
BCB5DDFB14E876ED000AF3C2 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
+ E5066F5B1855AC55008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -106,6 +108,7 @@
BCB5DDBF14E86899000AF3C2 = {
isa = PBXGroup;
children = (
+ E5066F5B1855AC55008C7682 /* Default-568h@2x.png */,
BCB5DDD414E86899000AF3C2 /* SimpleVideoFileFilter */,
BCB5DDCD14E86899000AF3C2 /* Frameworks */,
BCB5DDCB14E86899000AF3C2 /* Products */,
@@ -203,7 +206,7 @@
BCB5DDC114E86899000AF3C2 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BCB5DDC414E86899000AF3C2 /* Build configuration list for PBXProject "SimpleVideoFileFilter" */;
@@ -254,6 +257,7 @@
BCB5DDD914E86899000AF3C2 /* InfoPlist.strings in Resources */,
BCB5DDE914E868C0000AF3C2 /* SimpleVideoFileFilterViewController.xib in Resources */,
466AE00B14F2A196004FE0E5 /* sample_iPod.m4v in Resources */,
+ E5066F5C1855AC55008C7682 /* Default-568h@2x.png in Resources */,
BC11C28315BCBE2300E5BEC7 /* WID-small.jpg in Resources */,
BCB3C43A16BCA871003D26B0 /* Icon-72.png in Resources */,
BCB3C43B16BCA871003D26B0 /* Icon-72@2x.png in Resources */,
@@ -302,7 +306,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -314,11 +323,16 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
"-fobjc-arc",
@@ -332,13 +346,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
View
BIN examples/iOS/SimpleVideoFilter/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
29 examples/iOS/SimpleVideoFilter/SimpleVideoFilter.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
BCB5DDFF14E87783000AF3C2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */; };
BCB5DE0114E87789000AF3C2 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */; };
BCF867511725AB5300912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF8674C1725AB2100912E34 /* libGPUImage.a */; };
+ E5066F611855AC78008C7682 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5066F601855AC78008C7682 /* Default-568h@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -77,6 +78,7 @@
BCB5DDFB14E876ED000AF3C2 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
+ E5066F601855AC78008C7682 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -102,6 +104,7 @@
BCB5DDBF14E86899000AF3C2 = {
isa = PBXGroup;
children = (
+ E5066F601855AC78008C7682 /* Default-568h@2x.png */,
BCB5DDD414E86899000AF3C2 /* SimpleVideoFilter */,
BCB5DDCD14E86899000AF3C2 /* Frameworks */,
BCB5DDCB14E86899000AF3C2 /* Products */,
@@ -197,7 +200,7 @@
BCB5DDC114E86899000AF3C2 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BCB5DDC414E86899000AF3C2 /* Build configuration list for PBXProject "SimpleVideoFilter" */;
@@ -250,6 +253,7 @@
BCB3C44716BCA8C4003D26B0 /* Icon-72.png in Resources */,
BCB3C44816BCA8C4003D26B0 /* Icon-72@2x.png in Resources */,
BCB3C44916BCA8C4003D26B0 /* Icon.png in Resources */,
+ E5066F611855AC78008C7682 /* Default-568h@2x.png in Resources */,
BCB3C44A16BCA8C4003D26B0 /* Icon@2x.png in Resources */,
BCB3C44B16BCA8C4003D26B0 /* iTunesArtwork.png in Resources */,
);
@@ -294,7 +298,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -306,11 +315,16 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
"-fobjc-arc",
@@ -324,13 +338,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;

0 comments on commit 8e4a338

Please sign in to comment.
Something went wrong with that request. Please try again.