incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: Fixed CB-496 - Camera.getPicture - will always return FILE_URI even though DATA_URL specified
Date Fri, 13 Apr 2012 00:35:58 GMT
Updated Branches:
  refs/heads/master 7b9469341 -> f97fa5f29


Fixed CB-496 - Camera.getPicture - will always return FILE_URI even though DATA_URL specified


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/f97fa5f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/f97fa5f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/f97fa5f2

Branch: refs/heads/master
Commit: f97fa5f29020227fa76f452f3a557d16d5ad8eb8
Parents: 7b94693
Author: Shazron Abdullah <shazron@apache.org>
Authored: Thu Apr 12 17:27:40 2012 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Thu Apr 12 17:35:37 2012 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVCamera.m |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/f97fa5f2/CordovaLib/Classes/CDVCamera.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCamera.m b/CordovaLib/Classes/CDVCamera.m
index 38c6130..924425d 100644
--- a/CordovaLib/Classes/CDVCamera.m
+++ b/CordovaLib/Classes/CDVCamera.m
@@ -93,7 +93,7 @@
         self.pickerController.encodingType = ([arguments objectAtIndex:6]) ? [[arguments
objectAtIndex:6] intValue] : EncodingTypeJPEG;
         
         self.pickerController.quality = ([arguments objectAtIndex:1]) ? [[arguments objectAtIndex:1]
intValue] : 50;
-        self.pickerController.returnType = (CDVDestinationType)[[arguments objectAtIndex:2]
intValue] || DestinationTypeFileUri;
+        self.pickerController.returnType = ([arguments objectAtIndex:2]) ? [[arguments objectAtIndex:2]
intValue] : DestinationTypeFileUri;
        
         if (sourceType == UIImagePickerControllerSourceTypeCamera) {
             // we only allow taking pictures (no video) in this api


Mime
View raw message