Skip to content

Commit

Permalink
Fix missing handling of some modules in custom builds
Browse files Browse the repository at this point in the history 
Mostly PNG files were affected, but also when excluding thumbnails.
  • Loading branch information
@mattiasw
mattiasw committed Oct 28, 2024
1 parent cebeecf commit 7311b31
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/exif-reader.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/exif-reader.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/png-text-tags.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function read(dataView, pngTextChunks, async, includeUnknown) {
return {
__iptc: IptcTags.read(decodeRawData(value), 0, includeUnknown)
};
} else if (name) {
} else if (name && !isExifGroupTag(name, value) && !isIptcGroupTag(name, value)) {
return {
[name]: {
value,
Expand Down
7 changes: 6 additions & 1 deletion test/build/custom-builds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,12 @@
"include": {
"png": true,
"png_file": true,
"xmp": true
"exif": true,
"iptc": true,
"icc": true,
"xmp": true,
"maker_notes": true,
"thumbnail": true
}
}
},
Expand Down
7 changes: 7 additions & 0 deletions test/build/test-custom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,12 @@ describe('custom configuration image outputs', () => {
));

expect(result).to.deep.equal(storedResult);
// try {
// expect(result).to.deep.equal(storedResult);
// } catch (error) {
// console.log('STORED:', storedResult);
// console.log('RESULT:', result);
// throw error;
// }
}
});
2 changes: 1 addition & 1 deletion test/fixtures/outputs/test.png_small-png.out
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"combined":{"about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"},"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"},"FileType":{"value":"png","description":"PNG"},"ImageWidth":{"id":256,"value":14,"description":14},"ImageLength":{"id":257,"value":12,"description":12},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"XResolution":{"id":282,"value":[567,20],"description":"28"},"YResolution":{"id":283,"value":[567,20],"description":"28"},"ResolutionUnit":{"id":296,"value":3,"description":"centimeters"},"Software":{"id":305,"value":["GIMP 2.10.8"],"description":"GIMP 2.10.8"},"DateTime":{"id":306,"value":["2020:04:09 20:48:36"],"description":"2020:04:09 20:48:36"},"Thumbnail":{"ImageWidth":{"id":256,"value":256,"description":256},"ImageLength":{"id":257,"value":219,"description":219},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"Compression":{"id":259,"value":6,"description":6},"PhotometricInterpretation":{"id":262,"value":6,"description":6},"SamplesPerPixel":{"id":277,"value":3,"description":3},"JPEGInterchangeFormat":{"id":513,"value":272,"description":272},"JPEGInterchangeFormatLength":{"id":514,"value":1888,"description":1888}}},"expanded":{"xmp":{"_raw":"<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>\n<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 11.65'>\n<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n\n <rdf:Description rdf:about=''\n xmlns:dc='http://purl.org/dc/elements/1.1/'>\n <dc:format>image/png</dc:format>\n </rdf:Description>\n</rdf:RDF>\n</x:xmpmeta>\n<?xpacket end='r'?>","about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"}},"png":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"pngText":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"file":{"FileType":{"value":"png","description":"PNG"}},"exif":{"ImageWidth":{"id":256,"value":14,"description":14},"ImageLength":{"id":257,"value":12,"description":12},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"XResolution":{"id":282,"value":[567,20],"description":"28"},"YResolution":{"id":283,"value":[567,20],"description":"28"},"ResolutionUnit":{"id":296,"value":3,"description":"centimeters"},"Software":{"id":305,"value":["GIMP 2.10.8"],"description":"GIMP 2.10.8"},"DateTime":{"id":306,"value":["2020:04:09 20:48:36"],"description":"2020:04:09 20:48:36"},"Thumbnail":{"ImageWidth":{"id":256,"value":256,"description":256},"ImageLength":{"id":257,"value":219,"description":219},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"Compression":{"id":259,"value":6,"description":6},"PhotometricInterpretation":{"id":262,"value":6,"description":6},"SamplesPerPixel":{"id":277,"value":3,"description":3},"JPEGInterchangeFormat":{"id":513,"value":272,"description":272},"JPEGInterchangeFormatLength":{"id":514,"value":1888,"description":1888}}}}}
{"combined":{"about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"},"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"},"FileType":{"value":"png","description":"PNG"}},"expanded":{"xmp":{"_raw":"<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>\n<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 11.65'>\n<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n\n <rdf:Description rdf:about=''\n xmlns:dc='http://purl.org/dc/elements/1.1/'>\n <dc:format>image/png</dc:format>\n </rdf:Description>\n</rdf:RDF>\n</x:xmpmeta>\n<?xpacket end='r'?>","about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"}},"png":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"pngText":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"file":{"FileType":{"value":"png","description":"PNG"}}}}
2 changes: 1 addition & 1 deletion test/fixtures/outputs/test.png_tiff-png.out
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"combined":{"about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"},"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"},"FileType":{"value":"png","description":"PNG"},"ImageWidth":{"id":256,"value":14,"description":14},"ImageLength":{"id":257,"value":12,"description":12},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"XResolution":{"id":282,"value":[567,20],"description":"28"},"YResolution":{"id":283,"value":[567,20],"description":"28"},"ResolutionUnit":{"id":296,"value":3,"description":"centimeters"},"Software":{"id":305,"value":["GIMP 2.10.8"],"description":"GIMP 2.10.8"},"DateTime":{"id":306,"value":["2020:04:09 20:48:36"],"description":"2020:04:09 20:48:36"},"Thumbnail":{"ImageWidth":{"id":256,"value":256,"description":256},"ImageLength":{"id":257,"value":219,"description":219},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"Compression":{"id":259,"value":6,"description":6},"PhotometricInterpretation":{"id":262,"value":6,"description":6},"SamplesPerPixel":{"id":277,"value":3,"description":3},"JPEGInterchangeFormat":{"id":513,"value":272,"description":272},"JPEGInterchangeFormatLength":{"id":514,"value":1888,"description":1888}}},"expanded":{"xmp":{"_raw":"<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>\n<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 11.65'>\n<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n\n <rdf:Description rdf:about=''\n xmlns:dc='http://purl.org/dc/elements/1.1/'>\n <dc:format>image/png</dc:format>\n </rdf:Description>\n</rdf:RDF>\n</x:xmpmeta>\n<?xpacket end='r'?>","about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"}},"png":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"pngText":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"file":{"FileType":{"value":"png","description":"PNG"}},"exif":{"ImageWidth":{"id":256,"value":14,"description":14},"ImageLength":{"id":257,"value":12,"description":12},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"XResolution":{"id":282,"value":[567,20],"description":"28"},"YResolution":{"id":283,"value":[567,20],"description":"28"},"ResolutionUnit":{"id":296,"value":3,"description":"centimeters"},"Software":{"id":305,"value":["GIMP 2.10.8"],"description":"GIMP 2.10.8"},"DateTime":{"id":306,"value":["2020:04:09 20:48:36"],"description":"2020:04:09 20:48:36"},"Thumbnail":{"ImageWidth":{"id":256,"value":256,"description":256},"ImageLength":{"id":257,"value":219,"description":219},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"Compression":{"id":259,"value":6,"description":6},"PhotometricInterpretation":{"id":262,"value":6,"description":6},"SamplesPerPixel":{"id":277,"value":3,"description":3},"JPEGInterchangeFormat":{"id":513,"value":272,"description":272},"JPEGInterchangeFormatLength":{"id":514,"value":1888,"description":1888}}}}}
{"combined":{"about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"},"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"},"FileType":{"value":"png","description":"PNG"},"ImageWidth":{"id":256,"value":14,"description":14},"ImageLength":{"id":257,"value":12,"description":12},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"XResolution":{"id":282,"value":[567,20],"description":"28"},"YResolution":{"id":283,"value":[567,20],"description":"28"},"ResolutionUnit":{"id":296,"value":3,"description":"centimeters"},"Software":{"id":305,"value":["GIMP 2.10.8"],"description":"GIMP 2.10.8"},"DateTime":{"id":306,"value":["2020:04:09 20:48:36"],"description":"2020:04:09 20:48:36"}},"expanded":{"xmp":{"_raw":"<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>\n<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 11.65'>\n<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n\n <rdf:Description rdf:about=''\n xmlns:dc='http://purl.org/dc/elements/1.1/'>\n <dc:format>image/png</dc:format>\n </rdf:Description>\n</rdf:RDF>\n</x:xmpmeta>\n<?xpacket end='r'?>","about":{"value":"","attributes":{},"description":""},"format":{"value":"image/png","attributes":{},"description":"image/png"}},"png":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"pngText":{"Pixels Per Unit X":{"value":2835,"description":"2835"},"Pixels Per Unit Y":{"value":2835,"description":"2835"},"Pixel Units":{"value":1,"description":"meters"},"Modify Date":{"value":[2020,4,9,18,48,36],"description":"2020-04-09 18:48:36"}},"file":{"FileType":{"value":"png","description":"PNG"}},"exif":{"ImageWidth":{"id":256,"value":14,"description":14},"ImageLength":{"id":257,"value":12,"description":12},"BitsPerSample":{"id":258,"value":[8,8,8],"description":"8, 8, 8"},"XResolution":{"id":282,"value":[567,20],"description":"28"},"YResolution":{"id":283,"value":[567,20],"description":"28"},"ResolutionUnit":{"id":296,"value":3,"description":"centimeters"},"Software":{"id":305,"value":["GIMP 2.10.8"],"description":"GIMP 2.10.8"},"DateTime":{"id":306,"value":["2020:04:09 20:48:36"],"description":"2020:04:09 20:48:36"}}}}
2 changes: 1 addition & 1 deletion webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module.exports = {
}
},
{
test: /[/\\](exif-reader|image-header-?(tiff|jpeg|png|heic|avif|iso-bmff|webp|gif)?|tags|tag-names)\.js$/,
test: /[/\\](exif-reader|image-header-?(tiff|jpeg|png|heic|avif|iso-bmff|webp|gif)?|tags|tag-names|tags-helpers|png-text-tags)\.js$/,
loader: 'string-replace-loader',
options: {
multiple: getConstantReplacements(includedModules)
Expand Down

0 comments on commit 7311b31

Please sign in to comment.