Commit e5765527 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.52g

parent a91eca7c

IJ_Props.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


# Note that commands must be unique.



# Version 1.51

# Version 1.52



# Commands installed in the right-click popup menu

# Overridden in StartupMacros

aREADME.txt

+1 −6
Original line number Diff line number Diff line 
The ant utility (http://ant.apache.org/) will compile and run ImageJ using 

the build file (build.xml) in this directory. There is a version of ant at   



    http://imagej.nih.gov/ij/download/tools/ant/ant.zip

    

set up to use the JVM distributed with the Windows version of ImageJ.

The README included in the ZIP archive has more information.
 
the build file (build.xml) in this directory.
 
 No newline at end of file

applet.html

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
<!-- Runs ImageJ as an Applet -->



<html>

<head>

<title>ImageJ Applet</title>

</head>

<body>



<applet codebase="." code="ij.ImageJApplet.class" archive="ij.jar" width=0 height=0>

</applet>



</body>

</html>

build.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
    <copy file="images/microscope.gif" tofile="build/microscope.gif" />

    <copy file="images/about.jpg" tofile="build/about.jpg" />

	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 

	<copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" /> 

    <copy todir="build/macros"><fileset dir="macros"/></copy>

    <!-- Build ij.jar. -->

    <jar jarfile="ij.jar" basedir="build"

ij/CompositeImage.java

+1 −25
Original line number Diff line number Diff line
@@ -294,10 +294,7 @@ public class CompositeImage extends ImagePlus { 
			for (int i=1; i<nChannels; i++)

				if (active[i]) cip[i].updateComposite(rgbPixels, 5);

		}

		if (IJ.isJava16())

		createBufferedImage();

		else

			createImage();

		if (img==null && awtImage!=null)

			img = awtImage;

		singleChannel = false;
@@ -339,27 +336,6 @@ public class CompositeImage extends ImagePlus { 
		return sampleModel;

	}



	/*

	void createBlitterImage(int n) {

		ImageProcessor ip = cip[n-1].duplicate();

		if (ip instanceof FloatProcessor){

			FloatBlitter fb = new FloatBlitter((FloatProcessor)ip);

			for (int i=1; i<n; i++)

				fb.copyBits(cip[i], 0, 0, Blitter.COPY_ZERO_TRANSPARENT);

		} else if (ip instanceof ByteProcessor){

			ByteBlitter bb = new ByteBlitter((ByteProcessor)ip);

			for (int i=1; i<n; i++)

				bb.copyBits(cip[i], 0, 0, Blitter.OR);

		} else if (ip instanceof ShortProcessor){

			ShortBlitter sb = new ShortBlitter((ShortProcessor)ip);

			for (int i=n-2; i>=0; i--)

				sb.copyBits(cip[i], 0, 0, Blitter. OR);

		}

		img = ip.createImage();

		singleChannel = false;

	}

	*/



	ImageStack getRGBStack(ImagePlus imp) {

		ImageProcessor ip = imp.getProcessor();

		int w = ip.getWidth();