Merge pull request #762 from antoligy/756-merge-conflict

lsmith77 · web-flow · commit cc881beb2dae · 2016-07-22T16:52:30.000+02:00
Input is added twice in the OptiPngProcessor.
diff --git a/Imagine/Filter/PostProcessor/OptiPngPostProcessor.php b/Imagine/Filter/PostProcessor/OptiPngPostProcessor.php
@@ -73,7 +73,6 @@ public function process(BinaryInterface $binary)
             $pb->add('--strip=all');
         }
 
-        $pb->add($input = tempnam(sys_get_temp_dir(), 'imagine_optipng'));
         $pb->add($input);
 
         if ($binary instanceof FileBinaryInterface) {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ public function process(BinaryInterface $binary)`
`73`	`73`	`$pb->add('--strip=all');`
`74`	`74`	`}`
`75`	`75`
`76`		`- $pb->add($input = tempnam(sys_get_temp_dir(), 'imagine_optipng'));`
`77`	`76`	`$pb->add($input);`
`78`	`77`
`79`	`78`	`if ($binary instanceof FileBinaryInterface) {`