This reverts commit 38f5f55, reversing

changes made to 5a14305.
aheckmann · Sep 23, 2015 · f04ba5e · f04ba5e
1 parent 27358c2
commit f04ba5e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,5 @@ examples/imgs/*
 !examples/imgs/photo.JPG
 !examples/imgs/orientation/*\d.jpg
 !examples/imgs/orientation/*.correct.jpg
-!examples/imgs/icon.ico
 *.sw*
 .idea
diff --git a/examples/imgs/icon.ico b/examples/imgs/icon.ico
diff --git a/index.js b/index.js
@@ -74,7 +74,6 @@ function gm (source, height, color) {
     var inputFromStdin = this.sourceStream || this.sourceBuffer;
     var ret = inputFromStdin ? '-' : this.source;
 
-    if (inputFromStdin && this.source && this.source !== 'unknown.jpg') ret = this.source.split('.').pop() + ':-';
     if (ret && this.sourceFrames) ret += this.sourceFrames;
 
     src.length = 0;

diff --git a/test/formatInference.js b/test/formatInference.js
diff --git a/test/gifFrameStream.js b/test/gifFrameStream.js
@@ -1,3 +1,4 @@
+
 var assert = require('assert')
 var fs = require('fs');
 
@@ -6,7 +7,7 @@ module.exports = function (_, dir, finish, gm) {
 
   var args = m.args();
   assert.equal('convert', args[0]);
-  assert.equal('gif:-[0]', args[1]);
+  assert.equal('-[0]', args[1]);
 
   if (!gm.integration)
     return finish();

diff --git a/test/resizeAndAutoOrientFromBuffer.js b/test/resizeAndAutoOrientFromBuffer.js
@@ -14,7 +14,7 @@ module.exports = function (_, dir, finish, gm) {
 
   var args = m.args();
   assert.equal('convert', args[0]);
-  assert.equal('jpg:-', args[1]);
+  assert.equal('-', args[1]);
   assert.equal('-resize', args[2]);
   if (m._options.imageMagick) {
     assert.equal('20%', args[3]);

diff --git a/test/resizeBuffer.js b/test/resizeBuffer.js
@@ -13,7 +13,7 @@ module.exports = function (_, dir, finish, gm) {
 
   var args = m.args();
   assert.equal('convert', args[0]);
-  assert.equal('jpg:-', args[1]);
+  assert.equal('-', args[1]);
   assert.equal('-resize', args[2]);
   if (m._options.imageMagick) {
     assert.equal('48%', args[3]);

diff --git a/test/streamerr.js b/test/streamerr.js
@@ -7,7 +7,8 @@ module.exports = function (_, dir, finish, gm) {
   // The following invocation should fail, because 'convert' 
   // has no way of interpreting the file.
   gm(
-    svg_file
+    svg_file, 
+    './test.svg' // fiction
     ).options({
       imageMagick: true
   }).setFormat('png').toBuffer(function(err, buffer) {