Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…s into 0062Release
  • Loading branch information...
commit 2fe3cb42103375a10fbc6fd5e1607def041230c3 2 parents 68ed177 + 764550d
@arturoc arturoc authored
Showing with 29 additions and 1 deletion.
  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
View
2  addons/ofxOpenCv/src/ofxCvContourFinder.cpp
@@ -62,10 +62,12 @@ int ofxCvContourFinder::findContours( ofxCvGrayscaleImage& input,
// one, because you will get penalized less.
if( inputCopy.getWidth() == 0 ) {
+ inputCopy.setUseTexture(false);
inputCopy.allocate( _width, _height );
} else if( inputCopy.getWidth() != _width || inputCopy.getHeight() != _height ) {
// reallocate to new size
inputCopy.clear();
+ inputCopy.setUseTexture(false);
inputCopy.allocate( _width, _height );
}
View
3  addons/ofxiPhone/src/ofxiPhoneKeyboard.h
@@ -35,6 +35,7 @@
- (void) setFrame: (CGRect) rect;
- (void) setPlaceholder: (NSString *)text;
- (void) openKeyboard;
+- (void) closeKeyboard;
- (void) updateOrientation;
- (void) makeSecure;
- (void) setFieldLength: (int)len;
@@ -60,6 +61,8 @@ class ofxiPhoneKeyboard
void setText(string _text);
void setPlaceholder(string _text);
void openKeyboard();
+ void closeKeyboard();
+ void toggleKeyboard();
void updateOrientation();
void makeSecure();
void setMaxChars(int max);
View
21 addons/ofxiPhone/src/ofxiPhoneKeyboard.mm
@@ -128,6 +128,20 @@
[keyboard openKeyboard];
}
+void ofxiPhoneKeyboard::closeKeyboard()
+{
+ [keyboard closeKeyboard];
+}
+
+void ofxiPhoneKeyboard::toggleKeyboard()
+{
+ if (isKeyboardShowing()) {
+ closeKeyboard();
+ } else{
+ openKeyboard();
+ }
+}
+
bool ofxiPhoneKeyboard::isKeyboardShowing()
{
return [keyboard isKeyboardShowing];
@@ -282,6 +296,7 @@ - (void) hideText
- (void) setText: (NSString *)text
{
[_textField setText:text];
+ [self textFieldDidEndEditing:_textField];
}
//--------------------------------------------------------------
@@ -378,5 +393,11 @@ - (void) openKeyboard
{
[_textField becomeFirstResponder];
}
+
+//--------------------------------------------------------------
+- (void) closeKeyboard
+{
+ [_textField resignFirstResponder];
+}
//--------------------------------------------------------------
@end
View
BIN  apps/devApps/iphone0062CameraCapture/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/devApps/iphone0062MultiTargetTest/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneAddonsExamples/dirListExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneAddonsExamples/xmlSettingsExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/advancedEventsExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/advancedGraphics/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/audioInputExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/audioOutputExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/emptyExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/eventsExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/fontShapesExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/fontsExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/graphicsExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/imageLoaderExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/polygonExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneExamples/textureExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/CoreLocationExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/ImagePickerExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/KeyboardExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/MapKitExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/OpenAlExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/TouchAndAccelExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/VideoGrabberExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/iPadExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  apps/iPhoneSpecificExamples/iPhoneGuiExample/bin/data/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 libs/openFrameworks/video/ofVideoPlayer.cpp
@@ -208,7 +208,9 @@ void ofVideoPlayer::idleMovie(){
bHavePixelsChanged = true;
width = gstUtils.getWidth();
height = gstUtils.getHeight();
- tex.loadData(gstUtils.getPixels(), width, height, GL_RGB);
+ if( bUseTexture ){
+ tex.loadData(gstUtils.getPixels(), width, height, GL_RGB);
+ }
}
//--------------------------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.