You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/09/06 07:11:53 UTC
[1/4] git commit: [CB-4432] copyright notice change
Updated Branches:
refs/heads/master fa52e35c4 -> 763e6f0e9
[CB-4432] copyright notice change
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/df3141fe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/df3141fe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/df3141fe
Branch: refs/heads/master
Commit: df3141fef47dd21ed9c9d1ae805b9ea765809c1b
Parents: e5b70d9
Author: lorinbeer <lo...@adobe.com>
Authored: Tue Aug 20 13:55:43 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Tue Aug 20 13:55:43 2013 -0700
----------------------------------------------------------------------
src/blackberry10/index.js | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/df3141fe/src/blackberry10/index.js
----------------------------------------------------------------------
diff --git a/src/blackberry10/index.js b/src/blackberry10/index.js
index 922f049..9a5ebf3 100644
--- a/src/blackberry10/index.js
+++ b/src/blackberry10/index.js
@@ -1,18 +1,23 @@
/*
- * Copyright 2010-2011 Research In Motion Limited.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
var PictureSourceType = {
PHOTOLIBRARY : 0, // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
CAMERA : 1, // Take picture from camera
[4/4] git commit: Merge branch 'master' into dev
Posted by ag...@apache.org.
Merge branch 'master' into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/763e6f0e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/763e6f0e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/763e6f0e
Branch: refs/heads/master
Commit: 763e6f0e9a0f996e57b1979d1127a12a8dc14aa3
Parents: 1f22a17 fa52e35
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 6 00:15:45 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 6 00:15:45 2013 -0400
----------------------------------------------------------------------
src/android/CameraLauncher.java | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/763e6f0e/src/android/CameraLauncher.java
----------------------------------------------------------------------
[3/4] git commit: [CB-4752] Updated version and changelog
Posted by ag...@apache.org.
[CB-4752] Updated version and changelog
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/1f22a17f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/1f22a17f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/1f22a17f
Branch: refs/heads/master
Commit: 1f22a17f27e6eb11723e6aec09711dd28abbe63f
Parents: 382e942
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Sep 5 23:55:26 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Sep 5 23:59:46 2013 -0400
----------------------------------------------------------------------
CHANGELOG.md | 25 +++++++++++++++++++++++++
plugin.xml | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/1f22a17f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..bae12ec
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+# Release Notes
+
+### 0.2.1 (Sept 5, 2013)
+* [CB-4656] Don't add line-breaks to base64-encoded images (Fixes type=DataURI)
+* [CB-4432] copyright notice change
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/1f22a17f/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 671fa19..18d08e9 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.camera"
- version="0.2.0">
+ version="0.2.1">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
[2/4] git commit: [CB-4656] Don't add line-breaks to base64-encoded
images.
Posted by ag...@apache.org.
[CB-4656] Don't add line-breaks to base64-encoded images.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/382e9421
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/382e9421
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/382e9421
Branch: refs/heads/master
Commit: 382e9421e7f6ba9e21c1fe3e7c49d01eef2ecc7d
Parents: df3141f
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Aug 29 14:08:49 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Aug 29 14:09:33 2013 -0400
----------------------------------------------------------------------
src/android/CameraLauncher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/382e9421/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index bd50a63..ba432cb 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -763,7 +763,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
try {
if (bitmap.compress(CompressFormat.JPEG, mQuality, jpeg_data)) {
byte[] code = jpeg_data.toByteArray();
- byte[] output = Base64.encode(code, Base64.DEFAULT);
+ byte[] output = Base64.encode(code, Base64.NO_WRAP);
String js_out = new String(output);
this.callbackContext.success(js_out);
js_out = null;