Permalink
Browse files

Replaced everything with a copy from the parent project

Had some corruption I couldn't track down
  • Loading branch information...
1 parent 58ee8ec commit 84061527fd590d35cd3e7d2e6c4d65b7e35fe74a @fattjake fattjake committed May 2, 2012
Showing with 155 additions and 223 deletions.
  1. 0 License.txt
  2. 0 README.md
  3. 0 examples/BenchmarkSuite/BenchmarkSuite.xcodeproj/project.pbxproj
  4. BIN examples/BenchmarkSuite/BenchmarkSuite/41-picture-frame.png
  5. BIN examples/BenchmarkSuite/BenchmarkSuite/41-picture-frame@2x.png
  6. BIN examples/BenchmarkSuite/BenchmarkSuite/46-movie-2.png
  7. BIN examples/BenchmarkSuite/BenchmarkSuite/46-movie-2@2x.png
  8. BIN examples/BenchmarkSuite/BenchmarkSuite/86-camera.png
  9. BIN examples/BenchmarkSuite/BenchmarkSuite/86-camera@2x.png
  10. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkAppDelegate.h
  11. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkAppDelegate.m
  12. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkSuite-Info.plist
  13. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkSuite-Prefix.pch
  14. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkTableViewController.h
  15. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkTableViewController.m
  16. 0 examples/BenchmarkSuite/BenchmarkSuite/BenchmarkTableViewController.xib
  17. 0 examples/BenchmarkSuite/BenchmarkSuite/ImageFilteringBenchmarkController.h
  18. 0 examples/BenchmarkSuite/BenchmarkSuite/ImageFilteringBenchmarkController.m
  19. 0 examples/BenchmarkSuite/BenchmarkSuite/VideoFilteringBenchmarkController.h
  20. 0 examples/BenchmarkSuite/BenchmarkSuite/VideoFilteringBenchmarkController.m
  21. 0 examples/BenchmarkSuite/BenchmarkSuite/VideoFilteringDisplayController.h
  22. 0 examples/BenchmarkSuite/BenchmarkSuite/VideoFilteringDisplayController.m
  23. 0 examples/BenchmarkSuite/BenchmarkSuite/VideoFilteringDisplayController.xib
  24. 0 examples/BenchmarkSuite/BenchmarkSuite/en.lproj/InfoPlist.strings
  25. 0 examples/BenchmarkSuite/BenchmarkSuite/main.m
  26. 0 examples/BenchmarkSuite/GlyphishIconLicense.txt
  27. 0 examples/ColorObjectTracking/ColorObjectTracking.xcodeproj/project.pbxproj
  28. 0 examples/ColorObjectTracking/ColorObjectTracking/ColorObjectTracking-Info.plist
  29. 0 examples/ColorObjectTracking/ColorObjectTracking/ColorObjectTracking-Prefix.pch
  30. 0 examples/ColorObjectTracking/ColorObjectTracking/ColorTrackingAppDelegate.h
  31. 0 examples/ColorObjectTracking/ColorObjectTracking/ColorTrackingAppDelegate.m
  32. 0 examples/ColorObjectTracking/ColorObjectTracking/ColorTrackingViewController.h
  33. 0 examples/ColorObjectTracking/ColorObjectTracking/ColorTrackingViewController.m
  34. 0 examples/ColorObjectTracking/ColorObjectTracking/PositionColor.fsh
  35. 0 examples/ColorObjectTracking/ColorObjectTracking/Threshold.fsh
  36. 0 examples/ColorObjectTracking/ColorObjectTracking/en.lproj/InfoPlist.strings
  37. 0 examples/ColorObjectTracking/ColorObjectTracking/main.m
  38. 0 examples/CubeExample/Classes/CubeExampleAppDelegate.h
  39. 0 examples/CubeExample/Classes/CubeExampleAppDelegate.m
  40. 0 examples/CubeExample/Classes/DisplayViewController.h
  41. 0 examples/CubeExample/Classes/DisplayViewController.m
  42. 0 examples/CubeExample/Classes/ES2Renderer.h
  43. 0 examples/CubeExample/Classes/ES2Renderer.m
  44. 0 examples/CubeExample/Classes/ESRenderer.h
  45. 0 examples/CubeExample/CubeExample-Info.plist
  46. 0 examples/CubeExample/CubeExample_Prefix.pch
  47. 0 examples/CubeExample/Shaders/Shader.fsh
  48. 0 examples/CubeExample/Shaders/Shader.vsh
  49. 0 examples/CubeExample/main.m
  50. 0 examples/FilterShowcase/FilterShowcase.xcodeproj/project.pbxproj
  51. 0 examples/FilterShowcase/FilterShowcase/CustomFilter.fsh
  52. 0 examples/FilterShowcase/FilterShowcase/FilterShowcase-Info.plist
  53. 0 examples/FilterShowcase/FilterShowcase/FilterShowcase-Prefix.pch
  54. 0 examples/FilterShowcase/FilterShowcase/SampleConfiguration.plist
  55. 0 examples/FilterShowcase/FilterShowcase/ShowcaseAppDelegate.h
  56. 0 examples/FilterShowcase/FilterShowcase/ShowcaseAppDelegate.m
  57. 0 examples/FilterShowcase/FilterShowcase/ShowcaseFilterListController.h
  58. 0 examples/FilterShowcase/FilterShowcase/ShowcaseFilterListController.m
  59. 0 examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.h
  60. 0 examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.m
  61. 0 examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.xib
  62. 0 examples/FilterShowcase/FilterShowcase/en.lproj/InfoPlist.strings
  63. 0 examples/FilterShowcase/FilterShowcase/main.m
  64. BIN examples/FilterShowcase/FilterShowcase/mask.png
  65. 0 examples/MultiViewFilterExample/MultiViewFilterExample.xcodeproj/project.pbxproj
  66. 0 examples/MultiViewFilterExample/MultiViewFilterExample/MultiViewAppDelegate.h
  67. 0 examples/MultiViewFilterExample/MultiViewFilterExample/MultiViewAppDelegate.m
  68. 0 examples/MultiViewFilterExample/MultiViewFilterExample/MultiViewFilterExample-Info.plist
  69. 0 examples/MultiViewFilterExample/MultiViewFilterExample/MultiViewFilterExample-Prefix.pch
  70. 0 examples/MultiViewFilterExample/MultiViewFilterExample/MultiViewViewController.h
  71. 0 examples/MultiViewFilterExample/MultiViewFilterExample/MultiViewViewController.m
  72. 0 examples/MultiViewFilterExample/MultiViewFilterExample/Shader1.fsh
  73. 0 examples/MultiViewFilterExample/MultiViewFilterExample/Shader2.fsh
  74. 0 examples/MultiViewFilterExample/MultiViewFilterExample/en.lproj/InfoPlist.strings
  75. 0 examples/MultiViewFilterExample/MultiViewFilterExample/main.m
  76. 0 examples/SimpleImageFilter/SimpleImageFilter.xcodeproj/project.pbxproj
  77. BIN examples/SimpleImageFilter/SimpleImageFilter/Lambeau.jpg
  78. 0 examples/SimpleImageFilter/SimpleImageFilter/SimpleImageAppDelegate.h
  79. 0 examples/SimpleImageFilter/SimpleImageFilter/SimpleImageAppDelegate.m
  80. 0 examples/SimpleImageFilter/SimpleImageFilter/SimpleImageFilter-Info.plist
  81. 0 examples/SimpleImageFilter/SimpleImageFilter/SimpleImageFilter-Prefix.pch
  82. 0 examples/SimpleImageFilter/SimpleImageFilter/SimpleImageViewController.h
  83. 0 examples/SimpleImageFilter/SimpleImageFilter/SimpleImageViewController.m
  84. BIN examples/SimpleImageFilter/SimpleImageFilter/WID-small.jpg
  85. 0 examples/SimpleImageFilter/SimpleImageFilter/en.lproj/InfoPlist.strings
  86. 0 examples/SimpleImageFilter/SimpleImageFilter/main.m
  87. 0 examples/SimplePhotoFilter/SimplePhotoFilter.xcodeproj/project.pbxproj
  88. 0 examples/SimplePhotoFilter/SimplePhotoFilter/PhotoAppDelegate.h
  89. 0 examples/SimplePhotoFilter/SimplePhotoFilter/PhotoAppDelegate.m
  90. 0 examples/SimplePhotoFilter/SimplePhotoFilter/PhotoViewController.h
  91. 0 examples/SimplePhotoFilter/SimplePhotoFilter/PhotoViewController.m
  92. 0 examples/SimplePhotoFilter/SimplePhotoFilter/SimplePhotoFilter-Info.plist
  93. 0 examples/SimplePhotoFilter/SimplePhotoFilter/SimplePhotoFilter-Prefix.pch
  94. 0 examples/SimplePhotoFilter/SimplePhotoFilter/en.lproj/InfoPlist.strings
  95. 0 examples/SimplePhotoFilter/SimplePhotoFilter/main.m
  96. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter.xcodeproj/project.pbxproj
  97. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilter-Info.plist
  98. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilter-Prefix.pch
  99. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilterAppDelegate.h
  100. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilterAppDelegate.m
  101. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilterViewController.h
  102. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilterViewController.m
  103. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/SimpleVideoFileFilterViewController.xib
  104. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/en.lproj/InfoPlist.strings
  105. 0 examples/SimpleVideoFileFilter/SimpleVideoFileFilter/main.m
  106. 0 examples/SimpleVideoFilter/SimpleVideoFilter.xcodeproj/project.pbxproj
  107. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilter-Info.plist
  108. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilter-Prefix.pch
  109. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilterAppDelegate.h
  110. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilterAppDelegate.m
  111. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilterViewController.h
  112. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilterViewController.m
  113. 0 examples/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilterViewController.xib
  114. 0 examples/SimpleVideoFilter/SimpleVideoFilter/en.lproj/InfoPlist.strings
  115. 0 examples/SimpleVideoFilter/SimpleVideoFilter/main.m
  116. +8 −26 framework/GPUImage.xcodeproj/project.pbxproj
  117. 0 framework/GPUImageTests/GPUImageTests-Info.plist
  118. 0 framework/GPUImageTests/GPUImageTests.h
  119. 0 framework/GPUImageTests/GPUImageTests.m
  120. 0 framework/GPUImageTests/en.lproj/InfoPlist.strings
  121. 0 framework/Source/GLProgram.h
  122. 0 framework/Source/GLProgram.m
  123. 0 framework/Source/GPUImage-Prefix.pch
  124. +1 −0 framework/Source/GPUImage.h
  125. 0 framework/Source/GPUImage3x3ConvolutionFilter.h
  126. 0 framework/Source/GPUImage3x3ConvolutionFilter.m
  127. 0 framework/Source/GPUImageAdaptiveThresholdFilter.h
  128. 0 framework/Source/GPUImageAdaptiveThresholdFilter.m
  129. 0 framework/Source/GPUImageAlphaBlendFilter.h
  130. 0 framework/Source/GPUImageAlphaBlendFilter.m
  131. 0 framework/Source/GPUImageBoxBlurFilter.h
  132. 0 framework/Source/GPUImageBoxBlurFilter.m
  133. 0 framework/Source/GPUImageBrightnessFilter.h
  134. 0 framework/Source/GPUImageBrightnessFilter.m
  135. 0 framework/Source/GPUImageBulgeDistortionFilter.h
  136. 0 framework/Source/GPUImageBulgeDistortionFilter.m
  137. 0 framework/Source/GPUImageCGAColorspaceFilter.h
  138. 0 framework/Source/GPUImageCGAColorspaceFilter.m
  139. 0 framework/Source/GPUImageCannyEdgeDetectionFilter.h
  140. 0 framework/Source/GPUImageCannyEdgeDetectionFilter.m
  141. 0 framework/Source/GPUImageChromaKeyBlendFilter.h
  142. 0 framework/Source/GPUImageChromaKeyBlendFilter.m
  143. 0 framework/Source/GPUImageColorBurnBlendFilter.h
  144. 0 framework/Source/GPUImageColorBurnBlendFilter.m
  145. 0 framework/Source/GPUImageColorDodgeBlendFilter.h
  146. 0 framework/Source/GPUImageColorDodgeBlendFilter.m
  147. 0 framework/Source/GPUImageColorInvertFilter.h
  148. 0 framework/Source/GPUImageColorInvertFilter.m
  149. 0 framework/Source/GPUImageColorMatrixFilter.h
  150. 0 framework/Source/GPUImageColorMatrixFilter.m
  151. 0 framework/Source/GPUImageContrastFilter.h
  152. 0 framework/Source/GPUImageContrastFilter.m
  153. 0 framework/Source/GPUImageCropFilter.h
  154. 0 framework/Source/GPUImageCropFilter.m
  155. 0 framework/Source/GPUImageCrosshatchFilter.h
  156. 0 framework/Source/GPUImageCrosshatchFilter.m
  157. 0 framework/Source/GPUImageDarkenBlendFilter.h
  158. 0 framework/Source/GPUImageDarkenBlendFilter.m
  159. 0 framework/Source/GPUImageDifferenceBlendFilter.h
  160. 0 framework/Source/GPUImageDifferenceBlendFilter.m
  161. 0 framework/Source/GPUImageDissolveBlendFilter.h
  162. 0 framework/Source/GPUImageDissolveBlendFilter.m
  163. 0 framework/Source/GPUImageEmbossFilter.h
  164. 0 framework/Source/GPUImageEmbossFilter.m
  165. 0 framework/Source/GPUImageExclusionBlendFilter.h
  166. 0 framework/Source/GPUImageExclusionBlendFilter.m
  167. 0 framework/Source/GPUImageExposureFilter.h
  168. 0 framework/Source/GPUImageExposureFilter.m
  169. +1 −1 framework/Source/GPUImageFastBlurFilter.h
  170. +6 −3 framework/Source/GPUImageFastBlurFilter.m
  171. 0 framework/Source/GPUImageFilter.h
  172. 0 framework/Source/GPUImageFilter.m
  173. 0 framework/Source/GPUImageFilterGroup.h
  174. 0 framework/Source/GPUImageFilterGroup.m
  175. 0 framework/Source/GPUImageFilterPipeline.h
  176. 0 framework/Source/GPUImageFilterPipeline.m
  177. 0 framework/Source/GPUImageGammaFilter.h
  178. 0 framework/Source/GPUImageGammaFilter.m
  179. 0 framework/Source/GPUImageGaussianBlurFilter.h
  180. 0 framework/Source/GPUImageGaussianBlurFilter.m
  181. 0 framework/Source/GPUImageGaussianSelectiveBlurFilter.h
  182. 0 framework/Source/GPUImageGaussianSelectiveBlurFilter.m
  183. 0 framework/Source/GPUImageGrayscaleFilter.h
  184. 0 framework/Source/GPUImageGrayscaleFilter.m
  185. 0 framework/Source/GPUImageHardLightBlendFilter.h
  186. 0 framework/Source/GPUImageHardLightBlendFilter.m
  187. +3 −3 framework/Source/GPUImageHarrisCornerDetectionFilter.h
  188. +25 −17 framework/Source/GPUImageHarrisCornerDetectionFilter.m
  189. 0 framework/Source/GPUImageHazeFilter.h
  190. 0 framework/Source/GPUImageHazeFilter.m
  191. 0 framework/Source/GPUImageHistogramFilter.h
  192. 0 framework/Source/GPUImageHistogramFilter.m
  193. 0 framework/Source/GPUImageHistogramGenerator.h
  194. 0 framework/Source/GPUImageHistogramGenerator.m
  195. 0 framework/Source/GPUImageKuwaharaFilter.h
  196. 0 framework/Source/GPUImageKuwaharaFilter.m
  197. 0 framework/Source/GPUImageLightenBlendFilter.h
  198. 0 framework/Source/GPUImageLightenBlendFilter.m
  199. 0 framework/Source/GPUImageLuminanceThresholdFilter.h
  200. 0 framework/Source/GPUImageLuminanceThresholdFilter.m
  201. 0 framework/Source/GPUImageMaskFilter.h
  202. 0 framework/Source/GPUImageMaskFilter.m
  203. +0 −26 framework/Source/GPUImageMosaicFilter.h
  204. +0 −139 framework/Source/GPUImageMosaicFilter.m
  205. 0 framework/Source/GPUImageMovie.h
  206. 0 framework/Source/GPUImageMovie.m
  207. 0 framework/Source/GPUImageMovieWriter.h
  208. 0 framework/Source/GPUImageMovieWriter.m
  209. 0 framework/Source/GPUImageMultiplyBlendFilter.h
  210. 0 framework/Source/GPUImageMultiplyBlendFilter.m
  211. +8 −0 framework/Source/GPUImageNonMaximumSuppressionFilter.h
  212. +95 −0 framework/Source/GPUImageNonMaximumSuppressionFilter.m
  213. 0 framework/Source/GPUImageOpenGLESContext.h
  214. 0 framework/Source/GPUImageOpenGLESContext.m
  215. 0 framework/Source/GPUImageOutput.h
  216. 0 framework/Source/GPUImageOutput.m
  217. 0 framework/Source/GPUImageOverlayBlendFilter.h
  218. 0 framework/Source/GPUImageOverlayBlendFilter.m
  219. 0 framework/Source/GPUImagePicture.h
  220. 0 framework/Source/GPUImagePicture.m
  221. 0 framework/Source/GPUImagePinchDistortionFilter.h
  222. 0 framework/Source/GPUImagePinchDistortionFilter.m
  223. 0 framework/Source/GPUImagePixellateFilter.h
  224. 0 framework/Source/GPUImagePixellateFilter.m
  225. 0 framework/Source/GPUImagePolarPixellateFilter.h
  226. 0 framework/Source/GPUImagePolarPixellateFilter.m
  227. 0 framework/Source/GPUImagePosterizeFilter.h
  228. 0 framework/Source/GPUImagePosterizeFilter.m
  229. 0 framework/Source/GPUImagePrewittEdgeDetectionFilter.h
  230. 0 framework/Source/GPUImagePrewittEdgeDetectionFilter.m
  231. 0 framework/Source/GPUImageRawData.h
  232. 0 framework/Source/GPUImageRawData.m
  233. 0 framework/Source/GPUImageRotationFilter.h
  234. 0 framework/Source/GPUImageRotationFilter.m
  235. 0 framework/Source/GPUImageSaturationFilter.h
  236. 0 framework/Source/GPUImageSaturationFilter.m
  237. 0 framework/Source/GPUImageScreenBlendFilter.h
  238. 0 framework/Source/GPUImageScreenBlendFilter.m
  239. 0 framework/Source/GPUImageSepiaFilter.h
  240. 0 framework/Source/GPUImageSepiaFilter.m
  241. 0 framework/Source/GPUImageSharpenFilter.h
  242. 0 framework/Source/GPUImageSharpenFilter.m
  243. 0 framework/Source/GPUImageSketchFilter.h
  244. 0 framework/Source/GPUImageSketchFilter.m
  245. 0 framework/Source/GPUImageSmoothToonFilter.h
  246. 0 framework/Source/GPUImageSmoothToonFilter.m
  247. 0 framework/Source/GPUImageSobelEdgeDetectionFilter.h
  248. 0 framework/Source/GPUImageSobelEdgeDetectionFilter.m
  249. 0 framework/Source/GPUImageSoftLightBlendFilter.h
  250. 0 framework/Source/GPUImageSoftLightBlendFilter.m
  251. 0 framework/Source/GPUImageStillCamera.h
  252. 0 framework/Source/GPUImageStillCamera.m
  253. 0 framework/Source/GPUImageStretchDistortionFilter.h
  254. 0 framework/Source/GPUImageStretchDistortionFilter.m
  255. 0 framework/Source/GPUImageSubtractBlendFilter.h
  256. 0 framework/Source/GPUImageSubtractBlendFilter.m
  257. 0 framework/Source/GPUImageSwirlFilter.h
  258. 0 framework/Source/GPUImageSwirlFilter.m
  259. 0 framework/Source/GPUImageTextureInput.h
  260. 0 framework/Source/GPUImageTextureInput.m
  261. 0 framework/Source/GPUImageTextureOutput.h
  262. 0 framework/Source/GPUImageTextureOutput.m
  263. 0 framework/Source/GPUImageThresholdEdgeDetection.h
  264. 0 framework/Source/GPUImageThresholdEdgeDetection.m
  265. 0 framework/Source/GPUImageTiltShiftFilter.h
  266. 0 framework/Source/GPUImageTiltShiftFilter.m
  267. 0 framework/Source/GPUImageToonFilter.h
  268. 0 framework/Source/GPUImageToonFilter.m
  269. 0 framework/Source/GPUImageTransformFilter.h
  270. 0 framework/Source/GPUImageTransformFilter.m
  271. 0 framework/Source/GPUImageTwoPassFilter.h
  272. 0 framework/Source/GPUImageTwoPassFilter.m
  273. 0 framework/Source/GPUImageUnsharpMaskFilter.h
  274. 0 framework/Source/GPUImageUnsharpMaskFilter.m
  275. 0 framework/Source/GPUImageVideoCamera.h
  276. 0 framework/Source/GPUImageVideoCamera.m
  277. 0 framework/Source/GPUImageView.h
  278. 0 framework/Source/GPUImageView.m
  279. 0 framework/Source/GPUImageVignetteFilter.h
  280. 0 framework/Source/GPUImageVignetteFilter.m
  281. 0 framework/Source/GPUImageXYDerivativeFilter.h
  282. +8 −8 framework/Source/GPUImageXYDerivativeFilter.m
  283. BIN framework/Source/tilesets/circles.png
  284. BIN framework/Source/tilesets/photo 4.JPG
  285. BIN framework/Source/tilesets/squares.png
View
0 License.txt 100644 → 100755
No changes.
View
0 README.md 100644 → 100755
No changes.
No changes.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
View
No changes.
View
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
0 examples/CubeExample/main.m 100644 → 100755
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
View
No changes.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
No changes.
No changes.
No changes.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
No changes.
No changes.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
No changes.
No changes.
No changes.
No changes.
No changes.
View
No changes.
No changes.
View
No changes.
View
@@ -78,6 +78,8 @@
BCAD0982154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCAD0980154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m */; };
BCAD0985154F931C00278521 /* GPUImageAlphaBlendFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAD0983154F931C00278521 /* GPUImageAlphaBlendFilter.h */; };
BCAD0986154F931C00278521 /* GPUImageAlphaBlendFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCAD0984154F931C00278521 /* GPUImageAlphaBlendFilter.m */; };
+ BCAD099F15506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAD099D15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.h */; };
+ BCAD09A015506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCAD099E15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.m */; };
BCB5DE0D14E87F32000AF3C2 /* GPUImagePixellateFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB5DE0B14E87F32000AF3C2 /* GPUImagePixellateFilter.h */; };
BCB5DE0E14E87F32000AF3C2 /* GPUImagePixellateFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB5DE0C14E87F32000AF3C2 /* GPUImagePixellateFilter.m */; };
BCB5E75C14E2086300701302 /* GPUImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB5E75A14E2086300701302 /* GPUImageView.h */; };
@@ -176,11 +178,6 @@
BCF3D723153E0E0C009A1FE5 /* GPUImageThresholdEdgeDetection.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF3D721153E0E0B009A1FE5 /* GPUImageThresholdEdgeDetection.m */; };
BCF3D730153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF3D72E153F0D6E009A1FE5 /* GPUImageSmoothToonFilter.h */; };
BCF3D731153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF3D72F153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.m */; };
- F2C19D6E154FC53A00857A72 /* GPUImageMosaicFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = F2C19D6C154FC53A00857A72 /* GPUImageMosaicFilter.h */; };
- F2C19D6F154FC53A00857A72 /* GPUImageMosaicFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = F2C19D6D154FC53A00857A72 /* GPUImageMosaicFilter.m */; };
- F2C19D74154FC55000857A72 /* squares.png in Resources */ = {isa = PBXBuildFile; fileRef = F2C19D71154FC55000857A72 /* squares.png */; };
- F2C19D75154FC55000857A72 /* circles.png in Resources */ = {isa = PBXBuildFile; fileRef = F2C19D72154FC55000857A72 /* circles.png */; };
- F2C19D76154FC55000857A72 /* photo 4.JPG in Resources */ = {isa = PBXBuildFile; fileRef = F2C19D73154FC55000857A72 /* photo 4.JPG */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -269,6 +266,8 @@
BCAD0980154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageHarrisCornerDetectionFilter.m; path = Source/GPUImageHarrisCornerDetectionFilter.m; sourceTree = SOURCE_ROOT; };
BCAD0983154F931C00278521 /* GPUImageAlphaBlendFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageAlphaBlendFilter.h; path = Source/GPUImageAlphaBlendFilter.h; sourceTree = SOURCE_ROOT; };
BCAD0984154F931C00278521 /* GPUImageAlphaBlendFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageAlphaBlendFilter.m; path = Source/GPUImageAlphaBlendFilter.m; sourceTree = SOURCE_ROOT; };
+ BCAD099D15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageNonMaximumSuppressionFilter.h; path = Source/GPUImageNonMaximumSuppressionFilter.h; sourceTree = SOURCE_ROOT; };
+ BCAD099E15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageNonMaximumSuppressionFilter.m; path = Source/GPUImageNonMaximumSuppressionFilter.m; sourceTree = SOURCE_ROOT; };
BCB5DE0B14E87F32000AF3C2 /* GPUImagePixellateFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImagePixellateFilter.h; path = Source/GPUImagePixellateFilter.h; sourceTree = SOURCE_ROOT; };
BCB5DE0C14E87F32000AF3C2 /* GPUImagePixellateFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImagePixellateFilter.m; path = Source/GPUImagePixellateFilter.m; sourceTree = SOURCE_ROOT; };
BCB5E75A14E2086300701302 /* GPUImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageView.h; path = Source/GPUImageView.h; sourceTree = SOURCE_ROOT; };
@@ -366,11 +365,6 @@
BCF3D721153E0E0B009A1FE5 /* GPUImageThresholdEdgeDetection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageThresholdEdgeDetection.m; path = Source/GPUImageThresholdEdgeDetection.m; sourceTree = SOURCE_ROOT; };
BCF3D72E153F0D6E009A1FE5 /* GPUImageSmoothToonFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageSmoothToonFilter.h; path = Source/GPUImageSmoothToonFilter.h; sourceTree = SOURCE_ROOT; };
BCF3D72F153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageSmoothToonFilter.m; path = Source/GPUImageSmoothToonFilter.m; sourceTree = SOURCE_ROOT; };
- F2C19D6C154FC53A00857A72 /* GPUImageMosaicFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageMosaicFilter.h; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/GPUImageMosaicFilter.h"; sourceTree = "<group>"; };
- F2C19D6D154FC53A00857A72 /* GPUImageMosaicFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageMosaicFilter.m; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/GPUImageMosaicFilter.m"; sourceTree = "<group>"; };
- F2C19D71154FC55000857A72 /* squares.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = squares.png; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/squares.png"; sourceTree = "<group>"; };
- F2C19D72154FC55000857A72 /* circles.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = circles.png; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/circles.png"; sourceTree = "<group>"; };
- F2C19D73154FC55000857A72 /* photo 4.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = "photo 4.JPG"; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/photo 4.JPG"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -607,8 +601,8 @@
BCF3D70E153DF9E6009A1FE5 /* GPUImageEmbossFilter.m */,
83AE9FCB1540E92800F7FC13 /* GPUImageMaskFilter.h */,
83AE9FCC1540E92800F7FC13 /* GPUImageMaskFilter.m */,
- F2C19D6C154FC53A00857A72 /* GPUImageMosaicFilter.h */,
- F2C19D6D154FC53A00857A72 /* GPUImageMosaicFilter.m */,
+ BCAD099D15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.h */,
+ BCAD099E15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.m */,
);
name = "Image processing";
sourceTree = "<group>";
@@ -650,9 +644,6 @@
BCF1A33914DDB1EC00852800 /* GPUImage */ = {
isa = PBXGroup;
children = (
- F2C19D71154FC55000857A72 /* squares.png */,
- F2C19D72154FC55000857A72 /* circles.png */,
- F2C19D73154FC55000857A72 /* photo 4.JPG */,
BC245DBF14DDBCF5009FE7EB /* GPUImage.h */,
BCB5E79214E3275100701302 /* GLProgram.h */,
BCB5E79314E3275200701302 /* GLProgram.m */,
@@ -780,12 +771,9 @@
BCC11D72154B44DC0044F5A0 /* GPUImageHistogramGenerator.h in Headers */,
BCAD0978154F39CA00278521 /* GPUImagePrewittEdgeDetectionFilter.h in Headers */,
BCAD097D154F3CB000278521 /* GPUImageXYDerivativeFilter.h in Headers */,
-<<<<<<< HEAD
- F2C19D6E154FC53A00857A72 /* GPUImageMosaicFilter.h in Headers */,
-=======
BCAD0981154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.h in Headers */,
BCAD0985154F931C00278521 /* GPUImageAlphaBlendFilter.h in Headers */,
->>>>>>> upstream/master
+ BCAD099F15506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -861,9 +849,6 @@
buildActionMask = 2147483647;
files = (
BCF1A35214DDB1EC00852800 /* InfoPlist.strings in Resources */,
- F2C19D74154FC55000857A72 /* squares.png in Resources */,
- F2C19D75154FC55000857A72 /* circles.png in Resources */,
- F2C19D76154FC55000857A72 /* photo 4.JPG in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -966,12 +951,9 @@
BCC11D73154B44DC0044F5A0 /* GPUImageHistogramGenerator.m in Sources */,
BCAD0979154F39CA00278521 /* GPUImagePrewittEdgeDetectionFilter.m in Sources */,
BCAD097E154F3CB000278521 /* GPUImageXYDerivativeFilter.m in Sources */,
-<<<<<<< HEAD
- F2C19D6F154FC53A00857A72 /* GPUImageMosaicFilter.m in Sources */,
-=======
BCAD0982154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m in Sources */,
BCAD0986154F931C00278521 /* GPUImageAlphaBlendFilter.m in Sources */,
->>>>>>> upstream/master
+ BCAD09A015506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
0 framework/Source/GLProgram.h 100644 → 100755
No changes.
View
0 framework/Source/GLProgram.m 100644 → 100755
No changes.
View
No changes.
View
1 framework/Source/GPUImage.h 100644 → 100755
@@ -78,3 +78,4 @@
#import "GPUImageXYDerivativeFilter.h"
#import "GPUImageHarrisCornerDetectionFilter.h"
#import "GPUImageAlphaBlendFilter.h"
+#import "GPUImageNonMaximumSuppressionFilter.h"
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
@@ -2,7 +2,7 @@
@interface GPUImageFastBlurFilter : GPUImageTwoPassFilter
{
- GLint verticalPassTexelWidthOffsetUniform, verticalPassTexelHeightOffsetUniform, horizontalPassTexelWidthOffsetUniform, horizontalPassTexelHeightOffsetUniform, blurSizeUniform;
+ GLint verticalPassTexelWidthOffsetUniform, verticalPassTexelHeightOffsetUniform, horizontalPassTexelWidthOffsetUniform, horizontalPassTexelHeightOffsetUniform, firstBlurSizeUniform, secondBlurSizeUniform;
}
// The number of times to sequentially blur the incoming image. The more passes, the slower the filter.
View
@@ -78,12 +78,12 @@ - (id)init;
verticalPassTexelWidthOffsetUniform = [filterProgram uniformIndex:@"texelWidthOffset"];
verticalPassTexelHeightOffsetUniform = [filterProgram uniformIndex:@"texelHeightOffset"];
+ firstBlurSizeUniform = [filterProgram uniformIndex:@"blurSize"];
horizontalPassTexelWidthOffsetUniform = [secondFilterProgram uniformIndex:@"texelWidthOffset"];
horizontalPassTexelHeightOffsetUniform = [secondFilterProgram uniformIndex:@"texelHeightOffset"];
-
+ secondBlurSizeUniform = [secondFilterProgram uniformIndex:@"blurSize"];
- blurSizeUniform = [filterProgram uniformIndex:@"blurSize"];
self.blurSize = 1.0;
return self;
@@ -123,7 +123,10 @@ - (void)setBlurSize:(CGFloat)newValue;
[GPUImageOpenGLESContext useImageProcessingContext];
[filterProgram use];
- glUniform1f(blurSizeUniform, _blurSize);
+ glUniform1f(firstBlurSizeUniform, _blurSize);
+
+ [secondFilterProgram use];
+ glUniform1f(secondBlurSizeUniform, _blurSize);
}
@end
View
0 framework/Source/GPUImageFilter.h 100644 → 100755
No changes.
View
0 framework/Source/GPUImageFilter.m 100644 → 100755
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
No changes.
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
@@ -4,15 +4,15 @@
@class GPUImageXYDerivativeFilter;
@class GPUImageGrayscaleFilter;
@class GPUImageFastBlurFilter;
+@class GPUImageNonMaximumSuppressionFilter;
@interface GPUImageHarrisCornerDetectionFilter : GPUImageFilterGroup
{
- GPUImageGrayscaleFilter *luminanceFilter;
GPUImageXYDerivativeFilter *derivativeFilter;
// GPUImageGaussianBlurFilter *blurFilter;
- GPUImageFastBlurFilter *blurFilter;
+ GPUImageFastBlurFilter *preblurFilter, *blurFilter;
GPUImageFilter *harrisCornerDetectionFilter;
- // Non maximum suppression filter
+ GPUImageNonMaximumSuppressionFilter *nonMaximumSuppressionFilter;
GPUImageFilter *simpleThresholdFilter;
}
// A multiplier for the underlying blur size, ranging from 0.0 on up, with a default of 1.0
@@ -4,6 +4,7 @@
#import "GPUImageXYDerivativeFilter.h"
#import "GPUImageGrayscaleFilter.h"
#import "GPUImageFastBlurFilter.h"
+#import "GPUImageNonMaximumSuppressionFilter.h"
// This is the Harris corner detector, as described in
// C. Harris and M. Stephens. A Combined Corner and Edge Detector. Proc. Alvey Vision Conf., Univ. Manchester, pp. 147-151, 1988.
@@ -16,7 +17,7 @@ @implementation GPUImageHarrisCornerDetectionFilter
uniform sampler2D inputImageTexture;
- const mediump float harrisConstant = 0.01;
+ const mediump float harrisConstant = 0.04;
void main()
{
@@ -31,7 +32,8 @@ void main()
// Original Harris detector
// highp float harrisIntensity = derivativeElements.x * derivativeElements.y - (derivativeElements.z * derivativeElements.z) - harrisConstant * derivativeSum * derivativeSum;
- gl_FragColor = vec4(vec3(harrisIntensity * 8.0), 1.0);
+ gl_FragColor = vec4(vec3(harrisIntensity * 10.0), 1.0);
+// gl_FragColor = vec4(derivativeElements, 1.0);
}
);
@@ -41,7 +43,7 @@ void main()
uniform sampler2D inputImageTexture;
- const lowp float threshold = 0.2;
+ const lowp float threshold = 0.10;
void main()
{
@@ -50,6 +52,8 @@ void main()
lowp float thresholdValue = step(threshold, intensity);
gl_FragColor = vec4(thresholdValue, 0.0, 0.0, thresholdValue);
+// gl_FragColor = vec4(intensity, intensity, intensity, 1.0);
+// gl_FragColor = vec4(intensity, 0.0, 0.0, intensity);
}
);
@@ -62,43 +66,47 @@ - (id)init;
{
return nil;
}
-
- // First pass: reduce to luminance
- luminanceFilter = [[GPUImageGrayscaleFilter alloc] init];
- [self addFilter:luminanceFilter];
-
- // Second pass: take the derivative of the luminance texture
+
+// preblurFilter = [[GPUImageFastBlurFilter alloc] init];
+// [self addFilter:preblurFilter];
+
+ // First pass: reduce to luminance and take the derivative of the luminance texture
derivativeFilter = [[GPUImageXYDerivativeFilter alloc] init];
- derivativeFilter.imageWidthFactor = 256.0;
- derivativeFilter.imageHeightFactor = 256.0;
+// derivativeFilter.imageWidthFactor = 256.0;
+// derivativeFilter.imageHeightFactor = 256.0;
[self addFilter:derivativeFilter];
- // Third pass: blur the derivative
+ // Second pass: blur the derivative
// blurFilter = [[GPUImageGaussianBlurFilter alloc] init];
blurFilter = [[GPUImageFastBlurFilter alloc] init];
[self addFilter:blurFilter];
- // Fourth pass: apply the Harris corner detection calculation
+ // Third pass: apply the Harris corner detection calculation
harrisCornerDetectionFilter = [[GPUImageFilter alloc] initWithFragmentShaderFromString:kGPUImageHarrisCornerDetectionFragmentShaderString];
[self addFilter:harrisCornerDetectionFilter];
- // TODO: Non-maximum suppression filter here
+ // Fourth pass: apply non-maximum suppression to find the local maxima
+// nonMaximumSuppressionFilter = [[GPUImageNonMaximumSuppressionFilter alloc] init];
+// [self addFilter:nonMaximumSuppressionFilter];
// Fifth pass: threshold the result
simpleThresholdFilter = [[GPUImageFilter alloc] initWithFragmentShaderFromString:kGPUImageSimpleThresholdFragmentShaderString];
[self addFilter:simpleThresholdFilter];
- [luminanceFilter addTarget:derivativeFilter];
+// [preblurFilter addTarget:luminanceFilter];
[derivativeFilter addTarget:blurFilter];
[blurFilter addTarget:harrisCornerDetectionFilter];
+// [harrisCornerDetectionFilter addTarget:nonMaximumSuppressionFilter];
+// [nonMaximumSuppressionFilter addTarget:simpleThresholdFilter];
[harrisCornerDetectionFilter addTarget:simpleThresholdFilter];
- self.initialFilters = [NSArray arrayWithObjects:luminanceFilter, nil];
+// self.initialFilters = [NSArray arrayWithObjects:preblurFilter, nil];
+ self.initialFilters = [NSArray arrayWithObjects:derivativeFilter, nil];
// self.terminalFilter = harrisCornerDetectionFilter;
self.terminalFilter = simpleThresholdFilter;
// self.intensity = 1.0;
- self.blurSize = 1.5;
+ self.blurSize = 1.0;
return self;
}
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
@@ -1,26 +0,0 @@
-//
-// GPUImageMosaicFilter.h
-//
-// Created by Jacob Gundersen on 3/29/12.
-//
-// This filter takes an input tileset, the tiles must ascend in luminance
-// It looks at the input image and replaces each display tile with an input tile
-// according to the luminance of that tile. The idea was to replicate the ASCII
-// video filters seen in other apps, but the tileset can be anything.
-
-#import "GPUImageFilter.h"
-
-@interface GPUImageMosaicFilter : GPUImageFilter {
- GLint inputTileSizeUniform, numTilesUniform, displayTileSizeUniform;
-}
-
-@property(readwrite, nonatomic) CGSize inputTileSize;
-@property(readwrite, nonatomic) float numTiles;
-@property(readwrite, nonatomic) CGSize displayTileSize;
-
--(void)setNumTiles:(float)numTiles;
--(void)setDisplayTileSize:(CGSize)displayTileSize;
--(void)setInputTileSize:(CGSize)inputTileSize;
--(void)addTileSet:(NSString *)tileSet;
-
-@end
Oops, something went wrong.

0 comments on commit 8406152

Please sign in to comment.