From 099dfb10ff5227d2073da161fe50ea72bd29866a Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Fri, 29 Jan 2010 17:32:10 +0100 Subject: [PATCH] Fixed Float.MIN_VALUE to Float.MAX_VALUE where it remained for the last years... --- ini/trakem2/display/Patch.java | 4 ++-- mpi/fruitfly/registration/ImageFilter.java | 2 +- mpi/fruitfly/registration/PhaseCorrelation2D.java | 2 +- mpicbg/trakem2/align/AbstractAffineTile2D.java | 2 -- mpicbg/trakem2/transform/TransformMesh.java | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ini/trakem2/display/Patch.java b/ini/trakem2/display/Patch.java index 18a74255..8ad53d5b 100644 --- a/ini/trakem2/display/Patch.java +++ b/ini/trakem2/display/Patch.java @@ -1070,8 +1070,8 @@ public final class Patch extends Displayable implements ImageData { final TransformMesh mesh = new TransformMesh(this.ct, 32, o_width, o_height); final Rectangle box = mesh.getBoundingBox(); this.at.translate(box.x, box.y); - this.width = box.width; - this.height = box.height; + width = box.width; + height = box.height; updateInDatabase("transform+dimensions"); // the AffineTransform updateBucket(); diff --git a/mpi/fruitfly/registration/ImageFilter.java b/mpi/fruitfly/registration/ImageFilter.java index a6e071f0..c107becb 100644 --- a/mpi/fruitfly/registration/ImageFilter.java +++ b/mpi/fruitfly/registration/ImageFilter.java @@ -1168,7 +1168,7 @@ public class ImageFilter public static final void enhance( FloatArray2D src, float scale ) { float min = Float.MAX_VALUE; - float max = Float.MIN_VALUE; + float max = -Float.MAX_VALUE; for ( int i = 0; i < src.data.length; ++i ) { if ( src.data[ i ] < min ) min = src.data[ i ]; diff --git a/mpi/fruitfly/registration/PhaseCorrelation2D.java b/mpi/fruitfly/registration/PhaseCorrelation2D.java index 6f1c7ab4..4c75d119 100644 --- a/mpi/fruitfly/registration/PhaseCorrelation2D.java +++ b/mpi/fruitfly/registration/PhaseCorrelation2D.java @@ -648,7 +648,7 @@ public class PhaseCorrelation2D ArrayList< Point2D > peaks = new ArrayList< Point2D >(); for (int j = 0; j < checkImages; j++) - peaks.add(new Point2D(0, 0, Float.MIN_VALUE)); + peaks.add(new Point2D(0, 0, -Float.MAX_VALUE)); for (int y = 0; y < h; y++) for (int x = 0; x < w; x++) diff --git a/mpicbg/trakem2/align/AbstractAffineTile2D.java b/mpicbg/trakem2/align/AbstractAffineTile2D.java index 91396969..3864a0ed 100644 --- a/mpicbg/trakem2/align/AbstractAffineTile2D.java +++ b/mpicbg/trakem2/align/AbstractAffineTile2D.java @@ -20,9 +20,7 @@ package mpicbg.trakem2.align; import ij.process.ByteProcessor; -import ini.trakem2.display.Display; import ini.trakem2.display.Patch; -import ini.trakem2.utils.Utils; import java.awt.geom.AffineTransform; import java.awt.geom.Area; diff --git a/mpicbg/trakem2/transform/TransformMesh.java b/mpicbg/trakem2/transform/TransformMesh.java index 12b08584..edee687e 100644 --- a/mpicbg/trakem2/transform/TransformMesh.java +++ b/mpicbg/trakem2/transform/TransformMesh.java @@ -43,8 +43,8 @@ public class TransformMesh extends mpicbg.models.TransformMesh float xMin = Float.MAX_VALUE; float yMin = Float.MAX_VALUE; - float xMax = Float.MIN_VALUE; - float yMax = Float.MIN_VALUE; + float xMax = -Float.MAX_VALUE; + float yMax = -Float.MAX_VALUE; final Set< PointMatch > vertices = va.keySet(); for ( final PointMatch vertex : vertices ) -- 2.11.4.GIT