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

Unified Diff: chrome/browser/resources/file_manager/js/byte_reader.js

Issue 7465084: Minor bugs in Exif parser. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/exif_parser.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/js/byte_reader.js
diff --git a/chrome/browser/resources/file_manager/js/byte_reader.js b/chrome/browser/resources/file_manager/js/byte_reader.js
index d9f394fa6db41fba3e5670b118abb7322a2ce41e..772973ac0949680d566cb43edaed28932dd93bac 100644
--- a/chrome/browser/resources/file_manager/js/byte_reader.js
+++ b/chrome/browser/resources/file_manager/js/byte_reader.js
@@ -124,15 +124,14 @@ ByteReader.readBase64 = function(dataView, pos, size, opt_end) {
* This is a static utility function. There is a member function with the
* same name which side-effects the current read position.
*/
-ByteReader.readImage = function(dataView, pos, size,
- opt_littleEndian, opt_end) {
+ByteReader.readImage = function(dataView, pos, size, opt_end) {
opt_end = opt_end || dataView.byteLength;
ByteReader.validateRead(pos, size, opt_end);
var format;
if (ByteReader.readString(dataView, pos, 4, opt_end) == '\x89PNG') {
format = 'png';
- } else if (dataView.getUint16(pos, opt_littleEndian) == 0xFFD8) {
+ } else if (dataView.getUint16(pos, false) == 0xFFD8) { // Always big endian.
format = 'jpeg';
} else {
format = 'unknown';
@@ -290,8 +289,7 @@ ByteReader.prototype.readBase64 = function(size, opt_end) {
* read would go past the end of the buffer.
*/
ByteReader.prototype.readImage = function(size, opt_end) {
- var rv = ByteReader.readImage(
- this.view_, this.pos_, size, this.littleEndian_, opt_end);
+ var rv = ByteReader.readImage(this.view_, this.pos_, size, opt_end);
this.pos_ += size;
return rv;
};
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/exif_parser.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698