Merge pull request #1366 from guardian/em-graphicsmagick

graphicsmagick
guardian · Oct 14, 2015 · d239c96 · d239c96
2 parents d9dc961 + 7f7db4f
commit d239c96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -32,9 +32,8 @@ You will need to install:
 * sbt
 * JDK 8
 * Nginx
-* [GraphicsMagick](http://www.graphicsmagick.org/) or [ImageMagick](http://www.imagemagick.org/) (we use
-GraphicsMagick on the servers).
-`sudo apt-get install graphics` or `brew install imagemagick`.
+* [GraphicsMagick](http://www.graphicsmagick.org/)
+`sudo apt-get install graphicsmagick` or `brew install graphicsmagick`.
 
 ### Nginx
 

diff --git a/common-lib/src/main/scala/com/gu/mediaservice/lib/imaging/im4jwrapper/ImageMagick.scala b/common-lib/src/main/scala/com/gu/mediaservice/lib/imaging/im4jwrapper/ImageMagick.scala
@@ -28,10 +28,11 @@ object ImageMagick {
   def thumbnail(op: IMOperation)(width: Int): IMOperation = op <| (_.thumbnail(width))
   def scale(op: IMOperation)(dimensions: Dimensions): IMOperation = op <| (_.scale(dimensions.width, dimensions.height))
   def format(op: IMOperation)(definition: String): IMOperation = op <| (_.format(definition))
+  val useGraphicsMagick = true
 
-  def runConvertCmd(op: IMOperation): Future[Unit] = Future((new ConvertCmd).run(op))
+  def runConvertCmd(op: IMOperation): Future[Unit] = Future((new ConvertCmd(useGraphicsMagick)).run(op))
   def runIdentifyCmd(op: IMOperation): Future[List[String]] = Future {
-    val cmd = new IdentifyCmd()
+    val cmd = new IdentifyCmd(useGraphicsMagick)
     val output = new ArrayListOutputConsumer()
     cmd.setOutputConsumer(output)
     cmd.run(op)