Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-11714: (windows) added check for encoding in savePhoto() without height/width #242

Merged
merged 4 commits into from
Oct 3, 2018
Merged

CB-11714: (windows) added check for encoding in savePhoto() without height/width #242

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a201722
CB-11714: (windows) added extra check for content-type in savePhoto()…
DisruptiveMind Dec 1, 2016
dca4b9c
simplify picture.copyAsync
DisruptiveMind Sep 16, 2018
eb57b02
CB-11714: reuse picture.name instead of pictureName
DisruptiveMind Sep 16, 2018
c1b9772
replace double quotes with single quotes
janpio Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/windows/CameraProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down