potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #25598 from asmorkalov:as/tables_range_check_core

Browse Source 
Check range for type-dependant function tables #25598

Address https://github.com/opencv/opencv/issues/24703

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
Alexander Smorkalov
2024-05-17 10:48:40 +03:00
committed by GitHub
parent 41f08988b4
commit 0044047782
18 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matrix_sparse.cpp
+4 -2
View File
@@ -37,7 +37,7 @@ typedef void (*ConvertScaleData)(const void* from, void* to, int cn, double alph
static ConvertData getConvertElem(int fromType, int toType)
{
static ConvertData tab[][8] =
static ConvertData tab[CV_DEPTH_MAX][CV_DEPTH_MAX] =
{{ convertData_<uchar, uchar>, convertData_<uchar, schar>,
convertData_<uchar, ushort>, convertData_<uchar, short>,
convertData_<uchar, int>, convertData_<uchar, float>,
@@ -82,7 +82,7 @@ static ConvertData getConvertElem(int fromType, int toType)
static ConvertScaleData getConvertScaleElem(int fromType, int toType)
{
static ConvertScaleData tab[][8] =
static ConvertScaleData tab[CV_DEPTH_MAX][CV_DEPTH_MAX] =
{{ convertScaleData_<uchar, uchar>, convertScaleData_<uchar, schar>,
convertScaleData_<uchar, ushort>, convertScaleData_<uchar, short>,
convertScaleData_<uchar, int>, convertScaleData_<uchar, float>,
@@ -389,6 +389,7 @@ void SparseMat::convertTo( SparseMat& m, int rtype, double alpha ) const
if( alpha == 1 )
{
ConvertData cvtfunc = getConvertElem(type(), rtype);
CV_Assert(cvtfunc);
for( size_t i = 0; i < N; i++, ++from )
{
const Node* n = from.node();
@@ -399,6 +400,7 @@ void SparseMat::convertTo( SparseMat& m, int rtype, double alpha ) const
else
{
ConvertScaleData cvtfunc = getConvertScaleElem(type(), rtype);
CV_Assert(cvtfunc);
for( size_t i = 0; i < N; i++, ++from )
{
const Node* n = from.node();