janpio closed pull request #242: CB-11714: (windows) added check for encoding
in savePhoto() without height/width
URL: https://github.com/apache/cordova-plugin-camera/pull/242
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/windows/CameraProxy.js b/src/windows/CameraProxy.js
index eb10cd2a..9362be5a 100644
--- a/src/windows/CameraProxy.js
+++ b/src/windows/CameraProxy.js
@@ -800,9 +800,14 @@ function savePhoto(picture, options, successCallback,
errorCallback) {
if (options.targetHeight > 0 && options.targetWidth > 0) {
resizeImage(successCallback, errorCallback, picture,
options.targetWidth, options.targetHeight, options.encodingType);
} else {
+ // CB-11714: check if target content-type is PNG to just
rename as *.jpg since camera is captured as JPEG
+ if (options.encodingType === Camera.EncodingType.PNG) {
+ picture.name = picture.name.replace(/\.png$/, ".jpg");
+ }
+
picture.copyAsync(getAppData().localFolder, picture.name,
OptUnique).done(function (copiedFile) {
- successCallback("ms-appdata:///local/" + copiedFile.name);
- },errorCallback);
+ successCallback('ms-appdata:///local/' + copiedFile.name);
+ }, errorCallback);
}
} else {
if (options.targetHeight > 0 && options.targetWidth > 0) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
