NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: Fix incorrect toString() to operator<<() conversions

Browse source 
Commit 8a845ab078 ("libcamera: Replace toString with operator<<() for
format classes") incorrectly converted some of the toString() usages,
resulting in pointer values being printed instead of formats. Fix it.

Fixes: 8a845ab078 ("libcamera: Replace toString with operator<<() for format classes")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2022-05-31 00:56:45 +03:00
parent e115a69135
commit 2094ac4f8c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcamera/pipeline/ipu3/cio2.cpp
View file

@ -211,7 +211,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)
if (ret)
return ret;
LOG(IPU3, Debug) << "CIO2 output format " << outputFormat;
LOG(IPU3, Debug) << "CIO2 output format " << *outputFormat;
return 0;
}

4
src/libcamera/pipeline/ipu3/imgu.cpp
View file

@ -479,7 +479,7 @@ int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputF
if (ret)
return ret;
LOG(IPU3, Debug) << "ImgU input format = " << inputFormat;
LOG(IPU3, Debug) << "ImgU input format = " << *inputFormat;
/*
* \todo The IPU3 driver implementation shall be changed to use the
@ -568,7 +568,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,
const char *name = dev == output_.get() ? "output" : "viewfinder";
LOG(IPU3, Debug) << "ImgU " << name << " format = "
<< outputFormat;
<< *outputFormat;
return 0;
}

4
src/libcamera/pipeline/simple/simple.cpp
View file

@ -610,7 +610,7 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,
<< " produces " << sourceFormat
<< ", sink '" << sink->entity()->name()
<< "':" << sink->index()
<< " requires " << format;
<< " requires " << *format;
return -EINVAL;
}
}
@ -620,7 +620,7 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,
<< "':" << source->index()
<< " -> '" << sink->entity()->name()
<< "':" << sink->index()
<< " configured with format " << format;
<< " configured with format " << *format;
}
return 0;