dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-06 07:16:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed API bugs caused by missing RegionOfInterest values

Browse Source
This commit is contained in:
Matt Hill
2015-01-06 07:54:06 -05:00
parent 9389c6aa98
commit 30ee061e21
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openalpr/alpr.cpp
View File

@@ -51,8 +51,7 @@ namespace alpr
AlprResults Alpr::recognize(std::vector<char> imageBytes) AlprResults Alpr::recognize(std::vector<char> imageBytes)
{ {
std::vector<AlprRegionOfInterest> regionsOfInterest; return impl->recognize(imageBytes);
return impl->recognize(imageBytes, regionsOfInterest);
} }
AlprResults Alpr::recognize(unsigned char* pixelData, int bytesPerPixel, int imgWidth, int imgHeight, std::vector<AlprRegionOfInterest> regionsOfInterest) AlprResults Alpr::recognize(unsigned char* pixelData, int bytesPerPixel, int imgWidth, int imgHeight, std::vector<AlprRegionOfInterest> regionsOfInterest)

20
src/openalpr/alpr_impl.cpp
View File

@@ -68,13 +68,6 @@ namespace alpr
return config->loaded; return config->loaded;
} }
AlprFullDetails AlprImpl::recognizeFullDetails(cv::Mat img)
{
std::vector<cv::Rect> regionsOfInterest;
regionsOfInterest.push_back(cv::Rect(0, 0, img.cols, img.rows));
return this->recognizeFullDetails(img, regionsOfInterest);
}
AlprFullDetails AlprImpl::recognizeFullDetails(cv::Mat img, std::vector<cv::Rect> regionsOfInterest) AlprFullDetails AlprImpl::recognizeFullDetails(cv::Mat img, std::vector<cv::Rect> regionsOfInterest)
{ {
@@ -274,11 +267,11 @@ namespace alpr
AlprResults AlprImpl::recognize( std::vector<char> imageBytes, std::vector<AlprRegionOfInterest> regionsOfInterest ) AlprResults AlprImpl::recognize( std::vector<char> imageBytes)
{ {
cv::Mat img = cv::imdecode(cv::Mat(imageBytes), 1); cv::Mat img = cv::imdecode(cv::Mat(imageBytes), 1);
return this->recognize(img, this->convertRects(regionsOfInterest)); return this->recognize(img);
} }
AlprResults AlprImpl::recognize( unsigned char* pixelData, int bytesPerPixel, int imgWidth, int imgHeight, std::vector<AlprRegionOfInterest> regionsOfInterest) AlprResults AlprImpl::recognize( unsigned char* pixelData, int bytesPerPixel, int imgWidth, int imgHeight, std::vector<AlprRegionOfInterest> regionsOfInterest)
@@ -298,9 +291,16 @@ namespace alpr
return this->recognize(img, this->convertRects(regionsOfInterest)); return this->recognize(img, this->convertRects(regionsOfInterest));
} }
AlprResults AlprImpl::recognize(cv::Mat img)
{
std::vector<cv::Rect> regionsOfInterest;
regionsOfInterest.push_back(cv::Rect(0, 0, img.cols, img.rows));
return this->recognize(img, regionsOfInterest);
}
AlprResults AlprImpl::recognize(cv::Mat img, std::vector<cv::Rect> regionsOfInterest) AlprResults AlprImpl::recognize(cv::Mat img, std::vector<cv::Rect> regionsOfInterest)
{ {
AlprFullDetails fullDetails = recognizeFullDetails(img, regionsOfInterest); AlprFullDetails fullDetails = recognizeFullDetails(img, regionsOfInterest);
return fullDetails.results; return fullDetails.results;
} }

4
src/openalpr/alpr_impl.h
View File

@@ -68,11 +68,11 @@ namespace alpr
AlprImpl(const std::string country, const std::string configFile = "", const std::string runtimeDir = ""); AlprImpl(const std::string country, const std::string configFile = "", const std::string runtimeDir = "");
virtual ~AlprImpl(); virtual ~AlprImpl();
AlprFullDetails recognizeFullDetails(cv::Mat img);
AlprFullDetails recognizeFullDetails(cv::Mat img, std::vector<cv::Rect> regionsOfInterest); AlprFullDetails recognizeFullDetails(cv::Mat img, std::vector<cv::Rect> regionsOfInterest);
AlprResults recognize( std::vector<char> imageBytes, std::vector<AlprRegionOfInterest> regionsOfInterest ); AlprResults recognize( std::vector<char> imageBytes );
AlprResults recognize( unsigned char* pixelData, int bytesPerPixel, int imgWidth, int imgHeight, std::vector<AlprRegionOfInterest> regionsOfInterest ); AlprResults recognize( unsigned char* pixelData, int bytesPerPixel, int imgWidth, int imgHeight, std::vector<AlprRegionOfInterest> regionsOfInterest );
AlprResults recognize( cv::Mat img );
AlprResults recognize( cv::Mat img, std::vector<cv::Rect> regionsOfInterest ); AlprResults recognize( cv::Mat img, std::vector<cv::Rect> regionsOfInterest );
void applyRegionTemplate(AlprPlateResult* result, std::string region); void applyRegionTemplate(AlprPlateResult* result, std::string region);