Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(804)

Unified Diff: ui/file_manager/gallery/js/image_editor/image_encoder.js

Issue 297323003: Gallery.app: Fix image rotation in the image editor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/file_manager/gallery/js/image_editor/image_encoder.js
diff --git a/ui/file_manager/gallery/js/image_editor/image_encoder.js b/ui/file_manager/gallery/js/image_editor/image_encoder.js
index fb8442c13e6c98b34cf2abb365fcfb33410932ed..f1817b93e811a0609b301edefc21137d616631c8 100644
--- a/ui/file_manager/gallery/js/image_editor/image_encoder.js
+++ b/ui/file_manager/gallery/js/image_editor/image_encoder.js
@@ -32,7 +32,8 @@ ImageEncoder.registerMetadataEncoder = function(constructor, mimeType) {
* @return {ImageEncoder.MetadataEncoder} Created metadata encoder.
*/
ImageEncoder.createMetadataEncoder = function(metadata) {
- var constructor = ImageEncoder.metadataEncoders[metadata.mimeType] ||
+ var constructor =
+ (metadata && ImageEncoder.metadataEncoders[metadata.mimeType]) ||
ImageEncoder.MetadataEncoder;
return new constructor(metadata);
};
@@ -208,6 +209,7 @@ ImageEncoder.MetadataEncoder.prototype.setThumbnailData =
function(canvas, quality) {
this.metadata_.thumbnailURL =
canvas.toDataURL(this.metadata_.mimeType, quality);
+ delete this.metadata_.thumbnailTransform;
};
/**
@@ -216,7 +218,7 @@ ImageEncoder.MetadataEncoder.prototype.setThumbnailData =
* @return {Object} An object with from and to properties.
*/
ImageEncoder.MetadataEncoder.prototype.
- findInsertionRange = function(encodedImage) { return {from: 0, to: 0} };
+ findInsertionRange = function(encodedImage) { return {from: 0, to: 0}; };
/**
* Return serialized metadata ready to write to an image file.
« no previous file with comments | « ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js ('k') | ui/file_manager/gallery/js/mosaic_mode.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698