Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit f04ba5e

Browse files
committed
This reverts commit 38f5f55, reversing
changes made to 5a14305.
1 parent 27358c2 commit f04ba5e

File tree

8 files changed

+6
-27
lines changed

8 files changed

+6
-27
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ examples/imgs/*
99
!examples/imgs/photo.JPG
1010
!examples/imgs/orientation/*\d.jpg
1111
!examples/imgs/orientation/*.correct.jpg
12-
!examples/imgs/icon.ico
1312
*.sw*
1413
.idea

examples/imgs/icon.ico

-66.1 KB
Binary file not shown.

index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ function gm (source, height, color) {
7474
var inputFromStdin = this.sourceStream || this.sourceBuffer;
7575
var ret = inputFromStdin ? '-' : this.source;
7676

77-
if (inputFromStdin && this.source && this.source !== 'unknown.jpg') ret = this.source.split('.').pop() + ':-';
7877
if (ret && this.sourceFrames) ret += this.sourceFrames;
7978

8079
src.length = 0;

test/formatInference.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

test/gifFrameStream.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
var assert = require('assert')
23
var fs = require('fs');
34

@@ -6,7 +7,7 @@ module.exports = function (_, dir, finish, gm) {
67

78
var args = m.args();
89
assert.equal('convert', args[0]);
9-
assert.equal('gif:-[0]', args[1]);
10+
assert.equal('-[0]', args[1]);
1011

1112
if (!gm.integration)
1213
return finish();

test/resizeAndAutoOrientFromBuffer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function (_, dir, finish, gm) {
1414

1515
var args = m.args();
1616
assert.equal('convert', args[0]);
17-
assert.equal('jpg:-', args[1]);
17+
assert.equal('-', args[1]);
1818
assert.equal('-resize', args[2]);
1919
if (m._options.imageMagick) {
2020
assert.equal('20%', args[3]);

test/resizeBuffer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = function (_, dir, finish, gm) {
1313

1414
var args = m.args();
1515
assert.equal('convert', args[0]);
16-
assert.equal('jpg:-', args[1]);
16+
assert.equal('-', args[1]);
1717
assert.equal('-resize', args[2]);
1818
if (m._options.imageMagick) {
1919
assert.equal('48%', args[3]);

test/streamerr.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ module.exports = function (_, dir, finish, gm) {
77
// The following invocation should fail, because 'convert'
88
// has no way of interpreting the file.
99
gm(
10-
svg_file
10+
svg_file,
11+
'./test.svg' // fiction
1112
).options({
1213
imageMagick: true
1314
}).setFormat('png').toBuffer(function(err, buffer) {

0 commit comments

Comments
 (0)