Skip to content

Fix/integral image oob #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
axtimwalde merged 3 commits into from
Oct 14, 2025
Merged

Fix/integral image oob #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fed21c
Fix wrong loop bounds in column accumulation
minnerbe Oct 14, 2025
b125096
Fix further occurences of the same bug
minnerbe Oct 14, 2025
bcd9bad
Get rid of temporary array in column accumulation
minnerbe Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions mpicbg/src/main/java/mpicbg/ij/integral/BlockPMCC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,16 @@ static private void sumAndSumOfSquares(
}

/* columns */
final double[] columnSum = new double[width];
final double[] columnSumOfSquares = new double[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < width; ++i) {
final int index = rowOffset + i;
final int indexAbove = prevRowOffset + i;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
columnSumOfSquares[i] += sumOfSquares[index];
sumOfSquares[index] = columnSumOfSquares[i];
sum[index] += sum[indexAbove];
sumOfSquares[index] += sumOfSquares[indexAbove];
}
}
}
Expand Down Expand Up @@ -141,24 +140,18 @@ static private void sumAndSumOfSquares(
}

/* columns */
final double[] columnSum1 = new double[width];
final double[] columnSumOfSquares1 = new double[width];
final double[] columnSum2 = new double[width];
final double[] columnSumOfSquares2 = new double[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum1[i] += sum1[index];
sum1[index] = columnSum1[i];
columnSumOfSquares1[i] += sumOfSquares1[index];
sumOfSquares1[index] = columnSumOfSquares1[i];
for (int i = 0; i < width; ++i) {
final int index = rowOffset + i;
final int indexAbove = prevRowOffset + i;

columnSum2[i] += sum2[index];
sum2[index] = columnSum2[i];
columnSumOfSquares2[i] += sumOfSquares2[index];
sumOfSquares2[index] = columnSumOfSquares2[i];
sum1[index] += sum1[indexAbove];
sumOfSquares1[index] += sumOfSquares1[indexAbove];
sum2[index] += sum2[indexAbove];
sumOfSquares2[index] += sumOfSquares2[indexAbove];
}
}
}
Expand Down
19 changes: 8 additions & 11 deletions mpicbg/src/main/java/mpicbg/ij/integral/BlockStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,18 +163,15 @@ static protected void integrateColumns(
final double[] sumOfSquares )
{
final int width = w - 1;
final int height = h - 1;
final double[] columnSum = new double[width];
final double[] columnSumOfSquares = new double[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
columnSumOfSquares[i] += sumOfSquares[index];
sumOfSquares[index] = columnSumOfSquares[i];
for (int i = 0; i < width; ++i) {
final int index = rowOffset + i;
final int indexAbove = prevRowOffset + i;
sum[index] += sum[indexAbove];
sumOfSquares[index] += sumOfSquares[indexAbove];
}
}
}
Expand Down
28 changes: 12 additions & 16 deletions mpicbg/src/main/java/mpicbg/ij/integral/DoubleIntegralImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,12 @@ final public class DoubleIntegralImage implements IntegralImage
}

/* columns */
final double[] columnSum = new double[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < width; ++i) {
sum[rowOffset + i] += sum[prevRowOffset + i];
}
}
}
Expand Down Expand Up @@ -163,14 +161,12 @@ public DoubleIntegralImage( final ImageProcessor ip )
}

/* columns */
final double[] columnSum = new double[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < width; ++i) {
sum[rowOffset + i] += sum[prevRowOffset + i];
}
}
}
Expand Down
24 changes: 10 additions & 14 deletions mpicbg/src/main/java/mpicbg/ij/integral/IntIntegralImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,12 @@ final public class IntIntegralImage implements IntegralImage
}

/* columns */
final int[] columnSum = new int[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
for (int i = 0; i < width; ++i) {
sum[rowOffset + i] += sum[prevRowOffset + i];
}
}
}
Expand Down Expand Up @@ -136,14 +134,12 @@ public IntIntegralImage( final ImageProcessor ip )
}

/* columns */
final int[] columnSum = new int[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
for (int i = 0; i < width; ++i) {
sum[rowOffset + i] += sum[prevRowOffset + i];
}
}
}
Expand Down
24 changes: 10 additions & 14 deletions mpicbg/src/main/java/mpicbg/ij/integral/LongIntegralImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,12 @@ final public class LongIntegralImage implements IntegralImage
}

/* columns */
final long[] columnSum = new long[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
for (int i = 0; i < width; ++i) {
sum[rowOffset + i] += sum[prevRowOffset + i];
}
}
}
Expand Down Expand Up @@ -144,14 +142,12 @@ public LongIntegralImage( final ImageProcessor ip )
}

/* columns */
final long[] columnSum = new long[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
columnSum[i] += sum[index];
sum[index] = columnSum[i];
for (int i = 0; i < width; ++i) {
sum[rowOffset + i] += sum[prevRowOffset + i];
}
}
}
Expand Down
22 changes: 9 additions & 13 deletions mpicbg/src/main/java/mpicbg/ij/integral/LongRGBIntegralImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,17 @@ final public class LongRGBIntegralImage implements IntegralImage
}

/* columns */
final long[] columnSumR = new long[width];
final long[] columnSumG = new long[width];
final long[] columnSumB = new long[width];
for (int j = 1; j < w; ++j) {
final int offset = j * w + 1;
for (int j = 1; j < h; ++j) {
final int rowOffset = j * w + 1;
final int prevRowOffset = rowOffset - w;

for (int i = 0; i < height; ++i) {
final int index = offset + i;
for (int i = 0; i < width; ++i) {
final int index = rowOffset + i;
final int indexAbove = prevRowOffset + i;

columnSumR[i] += sumR[index];
sumR[index] = columnSumR[i];
columnSumG[i] += sumG[index];
sumG[index] = columnSumG[i];
columnSumB[i] += sumB[index];
sumB[index] = columnSumB[i];
sumR[index] += sumR[indexAbove];
sumG[index] += sumG[indexAbove];
sumB[index] += sumB[indexAbove];
}
}
}
Expand Down