X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2Fconverters%2FConvert.java;h=9de771f6322a896f16d3852662b4de2a216b6f10;hb=567410640f4e0428caf9de9fc83df4c73f0e5067;hp=03639b49fd6c7adb82645b1758cdbaebc3308594;hpb=565d9c726de9b50709027f9455d39499a17f4b25;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java
index 03639b4..9de771f 100644
--- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java
@@ -1,41 +1,45 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2012 -- 2017-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
 
 package eu.svjatoslav.meviz.encoder.converters;
 
+import eu.svjatoslav.meviz.encoder.EncodingOptions;
+
 import java.io.File;
 import java.util.List;
 
-import eu.svjatoslav.meviz.encoder.EncodingOptions;
-
 public class Convert extends AbstractConverter {
 
-	@Override
-	public String getCommand(final File inputFile, final File targetFile,
-			final EncodingOptions options) {
-		return "convert \"" + inputFile.getAbsolutePath() + "\" \""
-				+ targetFile.getAbsolutePath() + "\"";
-	}
-
-	@Override
-	public List<String> getSourceFileExtensions() {
-		return toList("tif", "tiff", "jpg", "jpeg");
-	}
-
-	@Override
-	public List<String> getTargetFileExtensions() {
-		return toList("png", "tiff");
-	}
-
-	@Override
-	public boolean isTerminalMandatory() {
-		return false;
-	}
+    @Override
+    public String getCommand(final File inputFile, final File targetFile,
+                             final EncodingOptions options, String targetFormat) {
+        return "convert \"" + inputFile.getAbsolutePath() + "\" \""
+                + targetFile.getAbsolutePath() + "\"";
+    }
+
+    @Override
+    public List<String> getSourceFileExtensions() {
+        return getSupportedFormats();
+    }
+
+    private List<String> getSupportedFormats() {
+        return toList("tif", "tiff", "png", "jpg", "jpeg", "bmp", "gif");
+    }
+
+    @Override
+    public List<String> getTargetFileExtensions() {
+        return getSupportedFormats();
+    }
+
+    @Override
+    public boolean isTerminalMandatory() {
+        return false;
+    }
 
 }