exif - npm Package Compare versions

Comparing version 0.3.3 to 0.3.6

lib/exif/ExifImage.js

@@ -248,2 +248,4 @@ var fs = require('fs'),
 			this.extractMakernotes = require('./makernotes/fujifilm').extractMakernotes;
+    } else if (this.exifData.exif[ExifImage.TAGS.exif[0x927C]].getString(0, 5) === "SANYO") {
+      this.extractMakernotes = require('./makernotes/sanyo').extractMakernotes;
 		} else {
@@ -255,7 +257,9 @@ // Makernotes are available but the format is not recognized so
 		}
-		
-		this.exifData.makernote = this.extractMakernotes(data, self.makernoteOffset, tiffOffset);
+
+		if (typeof this.exifData.makernote['error'] == "undefined") {
+ 			this.exifData.makernote = this.extractMakernotes(data, self.makernoteOffset, tiffOffset);
+ 		}
 			
 	}
-	
+
 	return this.exifData;
@@ -268,5 +272,7 @@
 	var self = this;
+	var tagName;
 
 	var entry = { 
 		tag : data.slice(entryOffset, entryOffset + 2),
+		tagId : null,
 		tagName : null,
@@ -279,4 +285,19 @@ format : data.getShort(entryOffset + 2, isBigEndian),
 
-	entry.tagName = (tags && tags[entry.tag.getShort(0, isBigEndian)]) ? tags[entry.tag.getShort(0, isBigEndian)] : null;
+	entry.tagId = entry.tag.getShort(0, isBigEndian);
 
+  // The tagId may correspond to more then one tagName so check which
+  if (tags && tags[entry.tagId] && typeof tags[entry.tagId] == "function") {
+    if (!(entry.tagName = tags[entry.tagId](entry))) {
+    	return false;
+    }
+
+  // The tagId corresponds to exactly one tagName
+  } else if (tags && tags[entry.tagId]) {
+    entry.tagName = tags[entry.tagId];
+
+  // The tagId is not recognized
+  } else {
+    return false;
+  }
+
 	switch (entry.format) {
@@ -283,0 +304,0 @@

package.json

 {
 	"name" : "exif",
-	"version" : "0.3.3",
+	"version" : "0.3.6",
 	"description" : "A node.js library to extract Exif metadata from images.",
 	"author" : "Daniel Leinich <[e-mail]>",
-  "keywords" : ["exif", "image", "jpeg", "jpg", "tiff", "makernotes", "gps"],
+    "keywords" : ["exif", "image", "jpeg", "jpg", "tiff", "makernotes", "gps"],
 	"main" : "./lib/exif",
@@ -8,0 +8,0 @@ "repository" : {

README.md

@@ -1,9 +0,14 @@
-node-exif
-=========
+# node-exif
 
 With _node-exif_ you can extract Exif metadata from images (JPEG). Exif is a format used, for example, by digital cameras and scanners to save additional information about an image in the image file. This information can be the camera model, resolution, where the image was taken (GPS) or when it was taken.
 
-Installation
-------------
+## Table of Contents
 
+ * [Installation](#installation)
+ * [Usage](#usage)
+ * [ToDo / Ideas](#todo--ideas)
+ * [License](#license)
+
+## Installation
+
 Installing using npm (node package manager):
@@ -18,4 +23,3 @@
 
-Usage
------
+## Usage
 
@@ -132,10 +136,8 @@ Easy. Just require _node-exif_ and throw an image at it. If _node-exif_ is able to extract data from the image it does so and returns an object with all the information found, if an error occurs you will receive an error message. To prove that it really is easy please see the following example.
 
-ToDo / Ideas
-------------
+## ToDo / Ideas
 
 There are a lot of things still to be done and to be made better. If you have any special requests please open an issue with a feature request.
    
-License
--------
+## License
 
 _node-exif_ is licensed under the MIT License. (See LICENSE) 

No alert changes

Improved metrics

Total package byte prevSize

55657

increased by4.56%

Number of package files

14

increased by7.69%

Lines of code

1408

increased by5.39%

Number of lines in readme file

141

increased by1.44%

No dependency changes