Skip to content
This repository
Browse code

Merge branch '0062Release' of github.com:openframeworks/openFramework…

…s into 0062Release
  • Loading branch information...
commit 2fe3cb42103375a10fbc6fd5e1607def041230c3 2 parents 68ed177 + 764550d
arturo arturoc authored

Showing 29 changed files with 29 additions and 1 deletion. Show diff stats Hide diff stats

  1. +2 0  addons/ofxOpenCv/src/ofxCvContourFinder.cpp
  2. +3 0  addons/ofxiPhone/src/ofxiPhoneKeyboard.h
  3. +21 0 addons/ofxiPhone/src/ofxiPhoneKeyboard.mm
  4. BIN  apps/devApps/iphone0062CameraCapture/bin/data/Default.png
  5. BIN  apps/devApps/iphone0062MultiTargetTest/bin/data/Default.png
  6. BIN  apps/iPhoneAddonsExamples/dirListExample/bin/data/Default.png
  7. BIN  apps/iPhoneAddonsExamples/xmlSettingsExample/bin/data/Default.png
  8. BIN  apps/iPhoneExamples/advancedEventsExample/bin/data/Default.png
  9. BIN  apps/iPhoneExamples/advancedGraphics/bin/data/Default.png
  10. BIN  apps/iPhoneExamples/audioInputExample/bin/data/Default.png
  11. BIN  apps/iPhoneExamples/audioOutputExample/bin/data/Default.png
  12. BIN  apps/iPhoneExamples/emptyExample/bin/data/Default.png
  13. BIN  apps/iPhoneExamples/eventsExample/bin/data/Default.png
  14. BIN  apps/iPhoneExamples/fontShapesExample/bin/data/Default.png
  15. BIN  apps/iPhoneExamples/fontsExample/bin/data/Default.png
  16. BIN  apps/iPhoneExamples/graphicsExample/bin/data/Default.png
  17. BIN  apps/iPhoneExamples/imageLoaderExample/bin/data/Default.png
  18. BIN  apps/iPhoneExamples/polygonExample/bin/data/Default.png
  19. BIN  apps/iPhoneExamples/textureExample/bin/data/Default.png
  20. BIN  apps/iPhoneSpecificExamples/CoreLocationExample/bin/data/Default.png
  21. BIN  apps/iPhoneSpecificExamples/ImagePickerExample/bin/data/Default.png
  22. BIN  apps/iPhoneSpecificExamples/KeyboardExample/bin/data/Default.png
  23. BIN  apps/iPhoneSpecificExamples/MapKitExample/bin/data/Default.png
  24. BIN  apps/iPhoneSpecificExamples/OpenAlExample/bin/data/Default.png
  25. BIN  apps/iPhoneSpecificExamples/TouchAndAccelExample/bin/data/Default.png
  26. BIN  apps/iPhoneSpecificExamples/VideoGrabberExample/bin/data/Default.png
  27. BIN  apps/iPhoneSpecificExamples/iPadExample/bin/data/Default.png
  28. BIN  apps/iPhoneSpecificExamples/iPhoneGuiExample/bin/data/Default.png
  29. +3 1 libs/openFrameworks/video/ofVideoPlayer.cpp
2  addons/ofxOpenCv/src/ofxCvContourFinder.cpp
@@ -62,10 +62,12 @@ int ofxCvContourFinder::findContours( ofxCvGrayscaleImage& input,
62 62 // one, because you will get penalized less.
63 63
64 64 if( inputCopy.getWidth() == 0 ) {
  65 + inputCopy.setUseTexture(false);
65 66 inputCopy.allocate( _width, _height );
66 67 } else if( inputCopy.getWidth() != _width || inputCopy.getHeight() != _height ) {
67 68 // reallocate to new size
68 69 inputCopy.clear();
  70 + inputCopy.setUseTexture(false);
69 71 inputCopy.allocate( _width, _height );
70 72 }
71 73
3  addons/ofxiPhone/src/ofxiPhoneKeyboard.h
@@ -35,6 +35,7 @@
35 35 - (void) setFrame: (CGRect) rect;
36 36 - (void) setPlaceholder: (NSString *)text;
37 37 - (void) openKeyboard;
  38 +- (void) closeKeyboard;
38 39 - (void) updateOrientation;
39 40 - (void) makeSecure;
40 41 - (void) setFieldLength: (int)len;
@@ -60,6 +61,8 @@ class ofxiPhoneKeyboard
60 61 void setText(string _text);
61 62 void setPlaceholder(string _text);
62 63 void openKeyboard();
  64 + void closeKeyboard();
  65 + void toggleKeyboard();
63 66 void updateOrientation();
64 67 void makeSecure();
65 68 void setMaxChars(int max);
21 addons/ofxiPhone/src/ofxiPhoneKeyboard.mm
@@ -128,6 +128,20 @@
128 128 [keyboard openKeyboard];
129 129 }
130 130
  131 +void ofxiPhoneKeyboard::closeKeyboard()
  132 +{
  133 + [keyboard closeKeyboard];
  134 +}
  135 +
  136 +void ofxiPhoneKeyboard::toggleKeyboard()
  137 +{
  138 + if (isKeyboardShowing()) {
  139 + closeKeyboard();
  140 + } else{
  141 + openKeyboard();
  142 + }
  143 +}
  144 +
131 145 bool ofxiPhoneKeyboard::isKeyboardShowing()
132 146 {
133 147 return [keyboard isKeyboardShowing];
@@ -282,6 +296,7 @@ - (void) hideText
282 296 - (void) setText: (NSString *)text
283 297 {
284 298 [_textField setText:text];
  299 + [self textFieldDidEndEditing:_textField];
285 300 }
286 301
287 302 //--------------------------------------------------------------
@@ -378,5 +393,11 @@ - (void) openKeyboard
378 393 {
379 394 [_textField becomeFirstResponder];
380 395 }
  396 +
  397 +//--------------------------------------------------------------
  398 +- (void) closeKeyboard
  399 +{
  400 + [_textField resignFirstResponder];
  401 +}
381 402 //--------------------------------------------------------------
382 403 @end
BIN  apps/devApps/iphone0062CameraCapture/bin/data/Default.png
BIN  apps/devApps/iphone0062MultiTargetTest/bin/data/Default.png
BIN  apps/iPhoneAddonsExamples/dirListExample/bin/data/Default.png
BIN  apps/iPhoneAddonsExamples/xmlSettingsExample/bin/data/Default.png
BIN  apps/iPhoneExamples/advancedEventsExample/bin/data/Default.png
BIN  apps/iPhoneExamples/advancedGraphics/bin/data/Default.png
BIN  apps/iPhoneExamples/audioInputExample/bin/data/Default.png
BIN  apps/iPhoneExamples/audioOutputExample/bin/data/Default.png
BIN  apps/iPhoneExamples/emptyExample/bin/data/Default.png
BIN  apps/iPhoneExamples/eventsExample/bin/data/Default.png
BIN  apps/iPhoneExamples/fontShapesExample/bin/data/Default.png
BIN  apps/iPhoneExamples/fontsExample/bin/data/Default.png
BIN  apps/iPhoneExamples/graphicsExample/bin/data/Default.png
BIN  apps/iPhoneExamples/imageLoaderExample/bin/data/Default.png
BIN  apps/iPhoneExamples/polygonExample/bin/data/Default.png
BIN  apps/iPhoneExamples/textureExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/CoreLocationExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/ImagePickerExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/KeyboardExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/MapKitExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/OpenAlExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/TouchAndAccelExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/VideoGrabberExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/iPadExample/bin/data/Default.png
BIN  apps/iPhoneSpecificExamples/iPhoneGuiExample/bin/data/Default.png
4 libs/openFrameworks/video/ofVideoPlayer.cpp
@@ -208,7 +208,9 @@ void ofVideoPlayer::idleMovie(){
208 208 bHavePixelsChanged = true;
209 209 width = gstUtils.getWidth();
210 210 height = gstUtils.getHeight();
211   - tex.loadData(gstUtils.getPixels(), width, height, GL_RGB);
  211 + if( bUseTexture ){
  212 + tex.loadData(gstUtils.getPixels(), width, height, GL_RGB);
  213 + }
212 214 }
213 215
214 216 //--------------------------------------------------------------

0 comments on commit 2fe3cb4

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