From 95d3dbe68efed43402e183ef6bbbf805a04f723f Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 7 Sep 2011 11:45:52 +0000
Subject: [PATCH] fix: allow old serialized ConvertToolImageTransformer to
deserialize
SVN: 22823
---
.../v1/transformations/ConvertToolImageTransformer.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
index 085533f7921..a564de64298 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
@@ -92,9 +92,10 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
private final boolean useGraphicsMagic;
- ConvertToolImageTransformer(String arguments, ToolChoice choice)
+ ConvertToolImageTransformer(String arguments, ToolChoice choiceOrNull)
{
this.convertCliArguments = parseCommandArguments(arguments);
+ ToolChoice choice = (choiceOrNull == null ? ToolChoice.ENFORCE_IMAGEMAGICK : choiceOrNull);
switch (choice)
{
case ENFORCE_IMAGEMAGICK:
@@ -130,8 +131,9 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
{
try
{
- // TODO 2011-08-31, Franz-Josef Elmer: Uncomment when new fast method is working correctly for colored images
-// byte[] input = ImageUtil.imageToPngFast(image);
+ // TODO 2011-08-31, Franz-Josef Elmer: Uncomment when new fast method is working
+ // correctly for colored images
+ // byte[] input = ImageUtil.imageToPngFast(image);
byte[] input = toByteArray(image);
byte[] output = transform(input);
return toBufferedImage(output);
--
GitLab