Skip to content

Commit 6fb6a27

Browse files
author
Dave Bevan
committed
Fix JS formatting issues thrown by Travis CI
1 parent eef367b commit 6fb6a27

2 files changed

Lines changed: 74 additions & 83 deletions

File tree

‎js/load-image-iptc-map.js‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -34,63 +34,63 @@
3434
// ==========
3535
// Iptc tags:
3636
// ==========
37-
//0x00 : "RecordVersion",
38-
0x03 : "ObjectType",
39-
0x04 : "ObjectAttribute",
40-
0x05 : "ObjectName",
41-
0x07 : "EditStatus",
42-
0x08 : "EditorialUpdate",
43-
0x0a : "Urgency",
44-
0x0c : "SubjectRef",
45-
0x0f : "Category",
46-
0x14 : "SupplCategory",
47-
0x16 : "FixtureID",
48-
0x19 : "Keywords",
49-
0x1a : "ContentLocCode",
50-
0x1b : "ContentLocName",
51-
0x1e : "ReleaseDate",
52-
0x23 : "ReleaseTime",
53-
0x25 : "ExpirationDate",
54-
0x26 : "ExpirationTime",
55-
0x28 : "SpecialInstructions",
56-
0x2a : "ActionAdvised",
57-
0x2d : "RefService",
58-
0x2f : "RefDate",
59-
0x32 : "RefNumber",
60-
0x37 : "DateCreated",
61-
0x3c : "TimeCreated",
62-
0x3e : "DigitalCreationDate",
63-
0x3f : "DigitalCreationTime",
64-
0x41 : "OriginatingProgram",
65-
0x46 : "ProgramVersion",
66-
0x4b : "ObjectCycle",
67-
0x50 : "Byline",
68-
0x55 : "BylineTitle",
69-
0x5a : "City",
70-
0x5c : "Sublocation",
71-
0x5f : "State",
72-
0x64 : "CountryCode",
73-
0x65 : "CountryName",
74-
0x67 : "OrigTransRef",
75-
0x69 : "Headline",
76-
0x6e : "Credit",
77-
0x73 : "Source",
78-
0x74 : "CopyrightNotice",
79-
0x76 : "Contact",
80-
0x78 : "Caption",
81-
0x7a : "WriterEditor",
82-
//0x7d : "RasterizedCaption",
83-
0x82 : "ImageType",
84-
0x83 : "ImageOrientation",
85-
0x87 : "LanguageID",
86-
//0x96 : "AudioType",
87-
//0x97 : "AudioSamplingRate",
88-
//0x98 : "AudioSamplingRes",
89-
//0x99 : "AudioDuration",
90-
//0x9a : "AudioOutcue",
91-
//0xc8 : "PreviewFileFormat",
92-
//0xc9 : "PreviewFileFormatVer",
93-
//0xca : "PreviewData"
37+
// 0x00: "RecordVersion",
38+
0x03: "ObjectType",
39+
0x04: "ObjectAttribute",
40+
0x05: "ObjectName",
41+
0x07: "EditStatus",
42+
0x08: "EditorialUpdate",
43+
0x0a: "Urgency",
44+
0x0c: "SubjectRef",
45+
0x0f: "Category",
46+
0x14: "SupplCategory",
47+
0x16: "FixtureID",
48+
0x19: "Keywords",
49+
0x1a: "ContentLocCode",
50+
0x1b: "ContentLocName",
51+
0x1e: "ReleaseDate",
52+
0x23: "ReleaseTime",
53+
0x25: "ExpirationDate",
54+
0x26: "ExpirationTime",
55+
0x28: "SpecialInstructions",
56+
0x2a: "ActionAdvised",
57+
0x2d: "RefService",
58+
0x2f: "RefDate",
59+
0x32: "RefNumber",
60+
0x37: "DateCreated",
61+
0x3c: "TimeCreated",
62+
0x3e: "DigitalCreationDate",
63+
0x3f: "DigitalCreationTime",
64+
0x41: "OriginatingProgram",
65+
0x46: "ProgramVersion",
66+
0x4b: "ObjectCycle",
67+
0x50: "Byline",
68+
0x55: "BylineTitle",
69+
0x5a: "City",
70+
0x5c: "Sublocation",
71+
0x5f: "State",
72+
0x64: "CountryCode",
73+
0x65: "CountryName",
74+
0x67: "OrigTransRef",
75+
0x69: "Headline",
76+
0x6e: "Credit",
77+
0x73: "Source",
78+
0x74: "CopyrightNotice",
79+
0x76: "Contact",
80+
0x78: "Caption",
81+
0x7a: "WriterEditor",
82+
// 0x7d: "RasterizedCaption",
83+
0x82: "ImageType",
84+
0x83: "ImageOrientation",
85+
0x87: "LanguageID",
86+
// 0x96: "AudioType",
87+
// 0x97: "AudioSamplingRate",
88+
// 0x98: "AudioSamplingRes",
89+
// 0x99: "AudioDuration",
90+
// 0x9a: "AudioOutcue",
91+
// 0xc8: "PreviewFileFormat",
92+
// 0xc9: "PreviewFileFormatVer",
93+
// 0xca: "PreviewData"
9494
}
9595

9696
loadImage.IptcMap.prototype.getText = function (id) {

‎js/load-image-iptc.js‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* https://opensource.org/licenses/MIT
1111
*/
1212

13-
/* global define, Blob */
13+
/* global define */
1414

1515
;(function (factory) {
1616
'use strict'
@@ -31,7 +31,7 @@
3131
}
3232

3333
loadImage.IptcMap.prototype.map = {
34-
"ObjectName": 0x5
34+
'ObjectName': 0x5
3535
}
3636

3737
loadImage.IptcMap.prototype.get = function (id) {
@@ -44,30 +44,28 @@
4444
sectionLength,
4545
data
4646
) {
47-
4847
function getStringFromDB(buffer, start, length) {
49-
var outstr = "";
50-
for (var n = start; n < start+length; n++) {
51-
outstr += String.fromCharCode(buffer.getUint8(n));
48+
var outstr = ""
49+
for (var n = start; n < start + length; n++) {
50+
outstr += String.fromCharCode(buffer.getUint8(n))
5251
}
53-
return outstr;
52+
return outstr
5453
}
5554

56-
var fieldValue, fieldName, dataSize, segmentType, segmentSize
55+
var fieldValue, fieldName, dataSize, segmentType,
5756
var segmentStartPos = startOffset
58-
while (segmentStartPos < startOffset+sectionLength) {
57+
while (segmentStartPos < startOffset + sectionLength) {
5958
// we currently handle the 2: class of iptc tag
60-
if (dataView.getUint8(segmentStartPos) === 0x1C && dataView.getUint8(segmentStartPos+1) === 0x02) {
59+
if (dataView.getUint8(segmentStartPos) === 0x1C && dataView.getUint8(segmentStartPos + 1) === 0x02) {
6160

62-
segmentType = dataView.getUint8(segmentStartPos+2)
61+
segmentType = dataView.getUint8(segmentStartPos + 2)
6362

6463
// only store data for known tags
6564
if (segmentType in data.iptc.tags) {
6665

67-
dataSize = dataView.getInt16(segmentStartPos+3)
68-
segmentSize = dataSize + 5
66+
dataSize = dataView.getInt16(segmentStartPos + 3)
6967
fieldName = data.iptc.tags[segmentType]
70-
fieldValue = getStringFromDB(dataView, segmentStartPos+5, dataSize)
68+
fieldValue = getStringFromDB(dataView, segmentStartPos + 5, dataSize)
7169

7270
// integer field IDs (same as the exif module)
7371
fieldName=segmentType
@@ -83,11 +81,11 @@
8381
}
8482
}
8583
else {
86-
data.iptc[fieldName] = fieldValue;
84+
data.iptc[fieldName] = fieldValue
8785
}
8886
}
8987
}
90-
segmentStartPos++;
88+
segmentStartPos++
9189
}
9290
}
9391

@@ -97,21 +95,19 @@
9795
}
9896

9997
// Found "8BIM<EOT><EOT>" ?
100-
var isFieldSegmentStart = function(dataView, offset){
98+
var isFieldSegmentStart = function (dataView, offset) {
10199
return (
102100
dataView.getUint32(offset) === 0x3842494d &&
103-
dataView.getUint16(offset+4) === 0x0404
101+
dataView.getUint16(offset + 4) === 0x0404
104102
)
105103
}
106104

107105
// Hunt forward, looking for the correct Iptc block signature:
108106
// Reference: https://metacpan.org/pod/distribution/Image-MetaData-JPEG/lib/Image/MetaData/JPEG/Structures.pod#Structure-of-a-Photoshop-style-APP13-segment
109107

110108
// From https://github.com/exif-js/exif-js/blob/master/exif.js ~ line 474 on
111-
while (offset < offset+length) {
112-
109+
while (offset < offset + length) {
113110
if (isFieldSegmentStart(dataView, offset)) {
114-
115111
var nameHeaderLength = dataView.getUint8(offset + 7)
116112
if (nameHeaderLength % 2 !== 0) nameHeaderLength += 1
117113
// Check for pre photoshop 6 format
@@ -133,13 +129,8 @@
133129
sectionLength,
134130
data
135131
)
136-
137-
break;
138-
139132
}
140-
141133
offset++
142-
143134
}
144135

145136
console.log('No Iptc data at this offset - could be XMP')

0 commit comments

Comments
 (0)