Skip to content

if content type isn't provided in the headers, determine the image type from the data #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

if content type isn't provided in the headers, determine the image type from the data #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion node-pixels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var fs = require('fs')
var request = require('request')
var mime = require('mime-types')
var parseDataURI = require('parse-data-uri')
var imageType = require('image-type');

function handlePNG(data, cb) {
var png = new PNG();
Expand Down Expand Up @@ -123,7 +124,33 @@ function doParse(mimeType, data, cb) {
break

default:
cb(new Error("Unsupported file type: " + mimeType))
var type = imageType(data);
if (type && type.mime) {
switch(type.mime) {
case 'image/png':
handlePNG(data, cb)
break

case 'image/jpg':
case 'image/jpeg':
handleJPEG(data, cb)
break

case 'image/gif':
handleGIF(data, cb)
break

case 'image/bmp':
handleBMP(data, cb)
break

default:
cb(new Error("Unsupported file type: " + mimeType))
break;
}
} else {
cb(new Error("Unsupported file type: " + mimeType))
}
}
}

Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"dependencies": {
"data-uri-to-buffer": "0.0.3",
"image-type": "^4.1.0",
"jpeg-js": "^0.4.1",
"mime-types": "^2.0.1",
"ndarray": "^1.0.13",
Expand Down