Commit 00d0fae7 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

upgraded imagej and added explicit .convertToColorProcessor() before 

casting float pixels to int[]
parent 7180569b

pom.xml

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ 
                <groupId>net.imagej</groupId>

                <artifactId>ij</artifactId>

<!--                <version>1.52e</version> -->

                <version>1.53j</version>

<!--                <version>1.53j</version> -->

                <version>1.54f</version>

            </dependency>

            <dependency>

                <groupId>org.jcuda</groupId>

src/main/java/com/elphel/imagej/tileprocessor/QuadCLT.java

+1 −1
Original line number Diff line number Diff line
@@ -3630,7 +3630,7 @@ public class QuadCLT extends QuadCLTCPU { 
		float [][] texture_rgba = isMonochrome() ? (new float [][] {texture_img[0],texture_img[1]}) : (new float [][] {texture_img[0],texture_img[1],texture_img[2],texture_img[3]});



		boolean toRGB = !isLwir() || colorProcParameters.lwir_pseudocolor;	

		ImagePlus imp_texture_bgnd = linearStackToColor(

		ImagePlus imp_texture_bgnd = linearStackToColor( // floatProcessor

				clt_parameters,

				colorProcParameters,

				rgbParameters,

src/main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java

+1 −1
Original line number Diff line number Diff line
@@ -13170,7 +13170,7 @@ public class QuadCLTCPU { 
//		  int v_margin = (int) Math.round((backdropPixels - height)/2);

//		  int width2 =  width +  2 * h_margin;

//		  int height2 = height + 2 * v_margin;

		  int [] src_pixels = (int []) imp.getProcessor().getPixels();

		  int [] src_pixels = (int []) imp.getProcessor().convertToColorProcessor().getPixels();

		  int [] pixels = new int [out_width * out_height];

		  int black = noalpha ? 0 :        0xff000000;

		  int mask =  noalpha ? 0xffffff : 0xffffffff;