converting to multi-cam (58d01fd2) · Commits · Elphel / imagej-elphel

pom.xml

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -92,13 +92,37 @@
	<artifactId>loci_tools</artifactId>		<artifactId>loci_tools</artifactId>
	<version>6.1.0</version>		<version>6.1.0</version>
	</dependency>		</dependency>
			<!--
	<dependency>		<dependency>
	<groupId>com.drewnoakes</groupId>		<groupId>com.drewnoakes</groupId>
	<artifactId>metadata-extractor</artifactId>		<artifactId>metadata-extractor</artifactId>
	<version>2.11.0</version>		<version>2.11.0</version>
	<type>java-source</type>		<type>java-source</type>
			</dependency> -->
			<!-- https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor -->
			<dependency>
			<groupId>com.drewnoakes</groupId>
			<artifactId>metadata-extractor</artifactId>
			<version>2.11.0</version>
	</dependency>		</dependency>

			<!-- https://mvnrepository.com/artifact/net.sf.ehcache/ehcache-core -->
			<!--
			<dependency>
			<groupId>net.sf.ehcache</groupId>
			<artifactId>ehcache-core</artifactId>
			<version>2.6.2</version>
			</dependency>\
			-->
			<!-- https://mvnrepository.com/artifact/org.slf4j/jcl-over-slf4j -->
			<!--
			<dependency>
			<groupId>org.slf4j</groupId>
			<artifactId>jcl-over-slf4j</artifactId>
			<version>1.7.5</version>
			</dependency>
			-->

	</dependencies>		</dependencies>

	<build>		<build>

src/main/java/com/elphel/imagej/correction/Eyesis_Correction.java

+28 −6

Original line number	Original line	Diff line number	Diff line
	@@ -184,6 +184,9 @@ private Panel panel1,
	public static QuadCLT QUAD_CLT_AUX = null;		public static QuadCLT QUAD_CLT_AUX = null;
	public static TwoQuadCLT TWO_QUAD_CLT = null;		public static TwoQuadCLT TWO_QUAD_CLT = null;
	public static GPUTileProcessor GPU_TILE_PROCESSOR = null;		public static GPUTileProcessor GPU_TILE_PROCESSOR = null;
			// Add macro for GPU_QUAD?
			public static GPUTileProcessor.GpuQuad GPU_QUAD = null;
			public static GPUTileProcessor.GpuQuad GPU_QUAD_AUX = null;
	public static LwirReader LWIR_READER = null;		public static LwirReader LWIR_READER = null;

	public static EyesisCorrectionParameters.DebayerParameters DEBAYER_PARAMETERS = new EyesisCorrectionParameters.DebayerParameters(		public static EyesisCorrectionParameters.DebayerParameters DEBAYER_PARAMETERS = new EyesisCorrectionParameters.DebayerParameters(
	@@ -5803,12 +5806,31 @@ private Panel panel1,
	} //final int debugLevel);		} //final int debugLevel);

	}		}

			if (GPU_QUAD == null) {
			try {
			GPU_QUAD = GPU_TILE_PROCESSOR. new GpuQuad(
			2592,
			1936,
			4,
			3);
			} catch (Exception e) {
			System.out.println("Failed to initialize GpuQuad class");
			// TODO Auto-generated catch block
			e.printStackTrace();
			return false;
			} //final int debugLevel);
			}
			// For now keep GPU_QUAD_AUX==null

	if (COLOR_PROC_PARAMETERS_AUX == null) {		if (COLOR_PROC_PARAMETERS_AUX == null) {
	COLOR_PROC_PARAMETERS_AUX = COLOR_PROC_PARAMETERS.clone();		COLOR_PROC_PARAMETERS_AUX = COLOR_PROC_PARAMETERS.clone();
	}		}
	try {		try {
	TWO_QUAD_CLT.processCLTQuadCorrPairsGpu(		TWO_QUAD_CLT.processCLTQuadCorrPairsGpu(
	GPU_TILE_PROCESSOR,		// GPU_TILE_PROCESSOR,
			GPU_QUAD, // GPUTileProcessor.GpuQuad gpuQuad_main,
			GPU_QUAD_AUX, // GPUTileProcessor.GpuQuad gpuQuad_aux,
	QUAD_CLT, // QuadCLT quadCLT_main,		QUAD_CLT, // QuadCLT quadCLT_main,
	QUAD_CLT_AUX, // QuadCLT quadCLT_aux,		QUAD_CLT_AUX, // QuadCLT quadCLT_aux,
	CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,		CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,

Admin message