Skip to content

fix: fix return type of libcamera_parse_point #188

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fix return type of libcamera_parse_point #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions device/libcamera/options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static std::pair<libcamera::Size, const char*> libcamera_parse_size(const char *
}

#if LIBCAMERA_VERSION_MAJOR == 0 && LIBCAMERA_VERSION_MINOR > 3 && LIBCAMERA_VERSION_PATCH >= 2 // Support for older libcamera versions
static libcamera::Point libcamera_parse_point(const char *value)
static std::pair<libcamera::Point, const char*> libcamera_parse_point(const char *value)
{
static const char *POINT_PATTERNS[] =
{
Expand All @@ -403,7 +403,7 @@ static libcamera::Point libcamera_parse_point(const char *value)
}
}

return std::make_pair(libcamera::Point(), NULL);
return std::make_pair(libcamera::Point(), (const char*)NULL);
}
#endif

Expand Down