From: Svjatoslav Agejenko Date: Tue, 24 Dec 2013 16:53:46 +0000 (+0200) Subject: fixed source vs target X-Git-Tag: meviz-1.0~65 X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=meviz.git;a=commitdiff_plain;h=0461dfe3d44b9579e16d00a328f09cb6f5980c54 fixed source vs target --- diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tif2Png.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tif2Png.java index 9757479..55df413 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tif2Png.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tif2Png.java @@ -24,12 +24,12 @@ public class Tif2Png implements Converter { @Override public String getSourceFileExtension() { - return "png"; + return "tif"; } @Override public String getTargetFileExtension() { - return "tif"; + return "png"; } @Override diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tiff2Png.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tiff2Png.java index fbbaee8..f717ff6 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tiff2Png.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Tiff2Png.java @@ -15,27 +15,26 @@ import eu.svjatoslav.meviz.encoder.EncodingOptions; public class Tiff2Png implements Converter { - - @Override - public String getCommand(final File inputFile, final File targetFile, final EncodingOptions options) { - return "convert \"" + inputFile.getAbsolutePath() + "\" \"" - + targetFile.getAbsolutePath() + "\""; - } - - @Override - public String getSourceFileExtension() { - return "png"; - } - - @Override - public String getTargetFileExtension() { - return "tiff"; - } - - @Override - public boolean isTerminalMandatory() { - return false; - } - + @Override + public String getCommand(final File inputFile, final File targetFile, + final EncodingOptions options) { + return "convert \"" + inputFile.getAbsolutePath() + "\" \"" + + targetFile.getAbsolutePath() + "\""; + } + + @Override + public String getSourceFileExtension() { + return "tiff"; + } + + @Override + public String getTargetFileExtension() { + return "png"; + } + + @Override + public boolean isTerminalMandatory() { + return false; + } }