feat: port OCR to C++ #389
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JakubGonera
force-pushed
the
@jakubgonera/ocr
branch
from
094f294 to
0a0f456
Compare
NorbertKlockiewicz
force-pushed
the
@jakubgonera/ocr
branch
from
9903e34 to
b13d916
Compare
## Description <!-- Provide a concise and descriptive summary of the changes implemented in this PR. --> ### Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] Documentation update (improves or adds clarity to existing documentation) ### Tested on - [ ] iOS - [ ] Android ### Testing instructions <!-- Provide step-by-step instructions on how to test your changes. Include setup details if necessary. --> ### Screenshots <!-- Add screenshots here, if applicable --> ### Related issues <!-- Link related issues here using #issue-number --> ### Checklist - [ ] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have updated the documentation accordingly - [ ] My changes generate no new warnings ### Additional notes <!-- Include any additional information, assumptions, or context that reviewers might need to understand this PR. --> --------- Co-authored-by: mlodyjesienin <[email protected]>
|
I'll submit my comments for c++ code today/tommorow |
msluszniak
reviewed
Jul 23, 2025
Comment on lines
+126
to
+128
| std::vector<float> inputVector = colorMatToVector(matrix, mean, variance); | ||
| return executorch::extension::make_tensor_ptr(tensorDims, inputVector); | ||
| } |
There was a problem hiding this comment.
Usually, intermediate variables are good in describing the code. Here, I think that inputVector does not adds much value in the sense of self-description and passing r-value ref aka result of function call directly as an argument improves performance and does not diminish the quality of code.
Suggested change
| std::vector<float> inputVector = colorMatToVector(matrix, mean, variance); | |
| return executorch::extension::make_tensor_ptr(tensorDims, inputVector); | |
| } | |
| return executorch::extension::make_tensor_ptr(tensorDims, colorMatToVector(matrix, mean, variance)); | |
| } |
| v.reserve(pixelCount); | ||
|
|
||
| if (mat.isContinuous()) { | ||
| v.assign((float *)mat.data, (float *)mat.data + pixelCount); |
There was a problem hiding this comment.
Avoid C-style casts, if static_cast will not work, use reinterpret_cast
Suggested change
| v.assign((float *)mat.data, (float *)mat.data + pixelCount); | |
| v.assign(static_cast<float*>(mat.data), static_cast<float*>(mat.data + pixelCount)); |
Comment on lines
+162
to
+163
| const float heightRatio = (float)targetSize.height / inputSize.height; | ||
| const float widthRatio = (float)targetSize.width / inputSize.width; |
There was a problem hiding this comment.
Suggested change
| const float heightRatio = (float)targetSize.height / inputSize.height; | |
| const float widthRatio = (float)targetSize.width / inputSize.width; | |
| const float heightRatio = static_cast<float>(targetSize.height) / inputSize.height; | |
| const float widthRatio = static_cast<float>(targetSize.width) / inputSize.width; |
Comment on lines
+171
to
+172
| const int cornerPatchSize = | ||
| std::max(1, std::min(inputSize.height, inputSize.width) / 30); |
There was a problem hiding this comment.
1 and 30 are magic numbers here, move them to named constants
| for (int i = 1; i < corners.size(); i++) { | ||
| backgroundScalar += cv::mean(corners[i]); | ||
| } | ||
| backgroundScalar /= (double)corners.size(); |
There was a problem hiding this comment.
Suggested change
| backgroundScalar /= (double)corners.size(); | |
| backgroundScalar /= static_cast<double>(corners.size()); |
Comment on lines
+88
to
+90
| for (int j = 0; j < 4; j++) { | ||
| points[j] = {.x = vertices[j].x, .y = vertices[j].y}; | ||
| } |
There was a problem hiding this comment.
Suggested change
| for (int j = 0; j < 4; j++) { | |
| points[j] = {.x = vertices[j].x, .y = vertices[j].y}; | |
| } | |
| #pragma unroll | |
| for (int j = 0; j < 4; j++) { | |
| points[j] = {.x = vertices[j].x, .y = vertices[j].y}; | |
| } |
| minRect.points(vertices); | ||
|
|
||
| std::array<Point, 4> points; | ||
| for (int j = 0; j < 4; j++) { |
There was a problem hiding this comment.
Suggested change
| for (int j = 0; j < 4; j++) { | |
| #pragma unroll | |
| for (int j = 0; j < 4; j++) { |
| float minSideLength = std::numeric_limits<float>::max(); | ||
| std::size_t numOfPoints = points.size(); | ||
|
|
||
| for (std::size_t i = 0; i < numOfPoints; i++) { |
There was a problem hiding this comment.
Suggested change
| for (std::size_t i = 0; i < numOfPoints; i++) { | |
| #pragma unroll | |
| for (std::size_t i = 0; i < numOfPoints; i++) { |
| fitLineToShortestSides(std::array<Point, 4> points) { | ||
| std::array<std::pair<float, float>, 4> sides; | ||
| std::array<Point, 4> midpoints; | ||
| for (std::size_t i = 0; i < 4; i++) { |
There was a problem hiding this comment.
Suggested change
| for (std::size_t i = 0; i < 4; i++) { | |
| #pragma unroll | |
| for (std::size_t i = 0; i < 4; i++) { |
|
|
||
| std::array<Point, 4> pointsFromCvPoints(cv::Point2f cvPoints[4]) { | ||
| std::array<Point, 4> points; | ||
| for (std::size_t i = 0; i < 4; ++i) { |
There was a problem hiding this comment.
Suggested change
| for (std::size_t i = 0; i < 4; ++i) { | |
| #pragma unroll | |
| for (std::size_t i = 0; i < 4; ++i) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Port the native implementation to C++
Type of change
Tested on
Related issues
#259
Checklist