- } else if (otherToX >= (int)image_->getWidth()) {\r
- scale = (float) (image_->getWidth() - 1 - fromX) / (float) (otherToX - fromX);\r
- otherToX = image_->getWidth() - 1;\r
+ } else if (otherToX > (int)image_->getWidth()) {\r
+ scale = (float) (image_->getWidth() - fromX) / (float) (otherToX - fromX);\r
+ otherToX = image_->getWidth();\r
- } else if (otherToY >= (int)image_->getHeight()) {\r
- scale = (float) (image_->getHeight() - 1 - fromY) / (float) (otherToY - fromY);\r
- otherToY = image_->getHeight() - 1;\r
+ } else if (otherToY > (int)image_->getHeight()) {\r
+ scale = (float) (image_->getHeight() - fromY) / (float) (otherToY - fromY);\r
+ otherToY = image_->getHeight();\r
}\r
otherToX = (int) (fromX + (otherToX - fromX) * scale);\r
\r
result += sizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY);\r
}\r
otherToX = (int) (fromX + (otherToX - fromX) * scale);\r
\r
result += sizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY);\r
}\r
\r
float Detector::sizeOfBlackWhiteBlackRun(int fromX, int fromY, int toX, int toY) {\r
}\r
\r
float Detector::sizeOfBlackWhiteBlackRun(int fromX, int fromY, int toX, int toY) {\r
if (state == 3) { // Found black, white, black, and stumbled back onto white; done\r
int diffX = x - fromX;\r
int diffY = y - fromY;\r
if (state == 3) { // Found black, white, black, and stumbled back onto white; done\r
int diffX = x - fromX;\r
int diffY = y - fromY;\r
int alignmentAreaBottomY = min((int)(image_->getHeight() - 1), estAlignmentY + allowance);\r
\r
AlignmentPatternFinder alignmentFinder(image_, alignmentAreaLeftX, alignmentAreaTopY, alignmentAreaRightX\r
int alignmentAreaBottomY = min((int)(image_->getHeight() - 1), estAlignmentY + allowance);\r
\r
AlignmentPatternFinder alignmentFinder(image_, alignmentAreaLeftX, alignmentAreaTopY, alignmentAreaRightX\r
- - alignmentAreaLeftX, alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize);\r
+ - alignmentAreaLeftX, alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize, callback_);\r