From f04ba5eb2bcc62dce3ccb161b017a9ca000ac49c Mon Sep 17 00:00:00 2001
From: Rowan Wookey <admin@rwky.net>
Date: Wed, 23 Sep 2015 18:29:17 +0100
Subject: [PATCH] This reverts commit 38f5f552ebb7c1c7386839e2388b3e0c4a17b093,
 reversing changes made to 5a14305eebd87e9be4d77b60593b20d0467b7110.

---
 .gitignore                            |   1 -
 examples/imgs/icon.ico                | Bin 67646 -> 0 bytes
 index.js                              |   1 -
 test/formatInference.js               |  21 ---------------------
 test/gifFrameStream.js                |   3 ++-
 test/resizeAndAutoOrientFromBuffer.js |   2 +-
 test/resizeBuffer.js                  |   2 +-
 test/streamerr.js                     |   3 ++-
 8 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 examples/imgs/icon.ico
 delete mode 100644 test/formatInference.js

diff --git a/.gitignore b/.gitignore
index 37f3f96..0d04d00 100644
--- 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
\ No newline at end of file
diff --git a/examples/imgs/icon.ico b/examples/imgs/icon.ico
deleted file mode 100644
index 200367ac84938616f4278951ddb685e1ba7a5669..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67646
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

diff --git a/index.js b/index.js
index fb86a5e..6e622d8 100644
--- 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
deleted file mode 100644
index 111c5df..0000000
--- a/test/formatInference.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var assert = require('assert')
-var fs = require('fs');
-
-module.exports = function (_, dir, finish, gm) {
-  var m = gm(fs.createReadStream(dir + '/icon.ico'), 'icon.ico')
-
-  var args = m.args();
-  assert.equal('convert', args[0]);
-  assert.equal('ico:-', args[1]);
-
-  if (!gm.integration)
-    return finish();
-
-  m
-  .size({bufferStream: true}, function (err, size) { 
-    if (err) return finish(err);
-    assert.equal(128, size.width);
-    assert.equal(128, size.height);
-    finish();
-  });
-}
diff --git a/test/gifFrameStream.js b/test/gifFrameStream.js
index 1d7e447..5e1d912 100644
--- 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
index 9ece772..522bdf9 100755
--- 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
index 0e5c089..208e91a 100755
--- 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
index 099006e..d9f6c23 100644
--- 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) {