Commit 069dd00f authored by Andrey Filippov's avatar Andrey Filippov

committing w/o breaking - 5

parent 65fd034d
...@@ -768,16 +768,39 @@ public class MatchSimulatedPattern { ...@@ -768,16 +768,39 @@ public class MatchSimulatedPattern {
for (iq=0; iq<9;iq++) { for (iq=0; iq<9;iq++) {
index=quarterIndex[iq]; index=quarterIndex[iq];
qindex=0; qindex=0;
if (is_mono) {
quarter_pixels[iq] = new double [hsize * hsize];
for (i=0;i<hsize;i++) {
for (j=0;j<hsize;j++) { //quarter_pixels[iq][qindex++]=input_pixels[index++];
quarter_pixels[iq][qindex++] = bayer_mono_pixels[0][index++];
}
index+=hsize; // jump to the next line
}
} else {
for (i=0;i<hsize;i++) { for (i=0;i<hsize;i++) {
for (j=0;j<hsize;j++) { //quarter_pixels[iq][qindex++]=input_pixels[index++]; for (j=0;j<hsize;j++) { //quarter_pixels[iq][qindex++]=input_pixels[index++];
green0[qindex]= bayer_mono_pixels[0][index]; green0[qindex]= bayer_mono_pixels[0][index];
green3[qindex++]=bayer_mono_pixels[3][index++]; green3[qindex++]=bayer_mono_pixels[3][index++];
} }
quarter_pixels[iq]=combineDiagonalGreens (green0, green3, hsize, hsize); // quarter_pixels[iq]=combineDiagonalGreens (
// green0,
// green3,
// hsize,
// hsize);
index+=hsize; // jump to the next line index+=hsize; // jump to the next line
} }
// Moved outside of the i-loop, that was wrong!
quarter_pixels[iq]=combineDiagonalGreens (
green0,
green3,
hsize,
hsize);
}
quarter_pixels[iq]= normalizeAndWindow (quarter_pixels[iq], quarterHamming); quarter_pixels[iq]= normalizeAndWindow (quarter_pixels[iq], quarterHamming);
if (this.debugLevel>2) SDFA_INSTANCE.showArrays(quarter_pixels[iq],hsize, hsize, title+"-new"+iq); if (this.debugLevel>2) SDFA_INSTANCE.showArrays(quarter_pixels[iq],hsize, hsize, title+"-new"+iq);
// findPattern - see MSP 3290:
quarter_patterns[iq] = findPattern( quarter_patterns[iq] = findPattern(
null, // DoubleFHT doubleFHT, null, // DoubleFHT doubleFHT,
quarter_pixels[iq], quarter_pixels[iq],
...@@ -787,9 +810,10 @@ public class MatchSimulatedPattern { ...@@ -787,9 +810,10 @@ public class MatchSimulatedPattern {
max_half_period, max_half_period,
greens, greens,
title+"Q_"+iq); title+"Q_"+iq);
if (quarter_patterns[iq]==null) return null; if (quarter_patterns[iq]==null) return null;
} }
if (this.debugLevel>2) { if (this.debugLevel>2) {
for (iq=0; iq<9;iq++) { for (iq=0; iq<9;iq++) {
System.out.println("Quarter="+iq+ System.out.println("Quarter="+iq+
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment