8000 Extend the signature of imdecodemulti() by kochanczyk · Pull Request #24405 · opencv/opencv · GitHub
[go: up one dir, main page]
Skip to content

Extend the signature of imdecodemulti() #24405

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

Merged
merged 8 commits into from
Oct 30, 2023
Merged

Extend the signature of imdecodemulti() #24405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f77035f
Add an overload of imdecodemulti() to API
kochanczyk Oct 14, 2023
7763070
Add an argument to imdecodemulti() to enable optional selection of pa…
kochanczyk Oct 17, 2023
a314930
Simplify test decode_multipage_use_memory_buffer_selected_pages
kochanczyk Oct 19, 2023
18894cf
Pass the optional range of pages by value, not by reference
kochanczyk Oct 19, 2023
10f50f7
Revert "Pass the optional range of pages by value, not by reference"
kochanczyk Oct 21, 2023
fda5892
Use CV_Checks instead of CV_Assert
kochanczyk Oct 21, 2023
39135a1
Expand conversions for cv::Range in ObjC bindings generator
kochanczyk Oct 25, 2023
a0b3fdb
Merge branch 'opencv:4.x' into 4.x
kochanczyk Oct 29, 2023
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
Prev Previous commit
Next Next commit
Pass the optional range of pages by value, not by reference 
This change fixes building OpenCV under iOS Framework.
  • Loading branch information
@kochanczyk
kochanczyk committed Oct 19, 2023
commit 18894cf6be9944ba49b2188029d1a210b1a865fa
2 changes: 1 addition & 1 deletion modules/imgcodecs/include/opencv2/imgcodecs.hpp
View file
Open in desktop
AD7C
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ See cv::imreadmulti for the list of supported formats and flags description.
@param mats A vector of Mat objects holding each page, if more than one.
@param range A continuous selection of pages.
*/
CV_EXPORTS_W bool imdecodemulti(InputArray buf, int flags, CV_OUT std::vector<Mat>& mats, const cv::Range& range = Range::all());
CV_EXPORTS_W bool imdecodemulti(InputArray buf, int flags, CV_OUT std::vector<Mat>& mats, cv::Range range = Range::all());

/** @brief Encodes an image into a memory buffer.

Expand Down
2 changes: 1 addition & 1 deletion modules/imgcodecs/src/loadsave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ imdecodemulti_(const Mat& buf, int flags, std::vector<Mat>& mats, int start, int
return !mats.empty();
}

bool imdecodemulti(InputArray _buf, int flags, CV_OUT std::vector<Mat>& mats, const Range& range)
bool imdecodemulti(InputArray _buf, int flags, CV_OUT std::vector<Mat>& mats, Range range)
{
CV_TRACE_FUNCTION();

Expand Down
0