Skip to content

Change how we access pixels for a block in Hill Orientation #52

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

Open
ghost wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Change how we access pixels for a block in Hill Orientation #52

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7cfcbed
Fixed hill orientation and tests
Nov 6, 2015
4bc6a34
Free more memory in tests
Nov 6, 2015
8041f52
Uncommented commented out tests
Nov 6, 2015
48b6cdc
Merge remote-tracking branch 'refs/remotes/origin/fix-mem-leaks' into…
Nov 9, 2015
a03365d
Added newline
Nov 9, 2015
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
22 changes: 12 additions & 10 deletions Sources/Extraction/Filters/HillOrientation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,27 @@ static PointFArray2D HillOrientation_AccumulateDirections(FloatArray2D input, in
static PointFArray2D HillOrientation_SumBlocks(const PointFArray2D * pixelOrientations, const BinaryMap * blockMask, const BlockMap * blocks)
{
const PointFArray2D blockOrientations = PointFArray2D_Construct(blocks->blockCount.width, blocks->blockCount.height);
const int blockHeight = blocks->maxBlockSize;
const int blockWidth = blocks->maxBlockSize;

for (int blockX = 0; blockX < blocks->blockCount.width; blockX++)
Point block;
for (block.y = RectangleC_GetBottom(&blocks->allBlocks); block.y < RectangleC_GetTop(&blocks->allBlocks); block.y++)
{
for (int blockY = 0; blockY < blocks->blockCount.height; blockY++)
for (block.x = RectangleC_GetLeft(&blocks->allBlocks); block.x < RectangleC_GetRight(&blocks->allBlocks); block.x++)
{
if (!BinaryMap_GetBit(blockMask, blockX, blockY))
if (!BinaryMap_GetBit(blockMask, block.x, block.y))
continue;

int bottomLeftX = blocks->blockAreas.corners.allX.data[blockX];
int bottomLeftY = blocks->blockAreas.corners.allY.data[blockY];
for (int x = bottomLeftX; x < bottomLeftX + blockWidth; ++x) {
for ( int y = bottomLeftY; y < bottomLeftY + blockHeight; ++y ) {
blockOrientations.data[blockX][blockY] = Calc_Add2PointsF(&blockOrientations.data[blockX][blockY], &pixelOrientations->data[x][y]);
RectangleC blockArea = RectangleGrid_GetRectangleCFromPoint(&blocks->blockAreas, &block);

for (int x = RectangleC_GetLeft(&blockArea); x < RectangleC_GetRight(&blockArea); x++)
{
for (int y = RectangleC_GetBottom(&blockArea); y < RectangleC_GetTop(&blockArea); y++)
{
blockOrientations.data[block.x][block.y] = Calc_Add2PointsF(&blockOrientations.data[block.x][block.y], &pixelOrientations->data[x][y]);
}
}
}
}

return blockOrientations;
}

Expand Down