Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
95d3dbe6
Commit
95d3dbe6
authored
13 years ago
by
tpylak
Browse files
Options
Downloads
Patches
Plain Diff
fix: allow old serialized ConvertToolImageTransformer to deserialize
SVN: 22823
parent
c59373ad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
+5
-3
5 additions, 3 deletions
...o/api/v1/transformations/ConvertToolImageTransformer.java
with
5 additions
and
3 deletions
screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
+
5
−
3
View file @
95d3dbe6
...
@@ -92,9 +92,10 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
...
@@ -92,9 +92,10 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
private
final
boolean
useGraphicsMagic
;
private
final
boolean
useGraphicsMagic
;
ConvertToolImageTransformer
(
String
arguments
,
ToolChoice
choice
)
ConvertToolImageTransformer
(
String
arguments
,
ToolChoice
choice
OrNull
)
{
{
this
.
convertCliArguments
=
parseCommandArguments
(
arguments
);
this
.
convertCliArguments
=
parseCommandArguments
(
arguments
);
ToolChoice
choice
=
(
choiceOrNull
==
null
?
ToolChoice
.
ENFORCE_IMAGEMAGICK
:
choiceOrNull
);
switch
(
choice
)
switch
(
choice
)
{
{
case
ENFORCE_IMAGEMAGICK:
case
ENFORCE_IMAGEMAGICK:
...
@@ -130,8 +131,9 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
...
@@ -130,8 +131,9 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
{
{
try
try
{
{
// TODO 2011-08-31, Franz-Josef Elmer: Uncomment when new fast method is working correctly for colored images
// TODO 2011-08-31, Franz-Josef Elmer: Uncomment when new fast method is working
// byte[] input = ImageUtil.imageToPngFast(image);
// correctly for colored images
// byte[] input = ImageUtil.imageToPngFast(image);
byte
[]
input
=
toByteArray
(
image
);
byte
[]
input
=
toByteArray
(
image
);
byte
[]
output
=
transform
(
input
);
byte
[]
output
=
transform
(
input
);
return
toBufferedImage
(
output
);
return
toBufferedImage
(
output
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment