| Message ID | 20220728120530.4381-1-naush@raspberrypi.com |
|---|---|
| State | Accepted |
| Commit | c19150ea94ac095de63fe878282caf3b23dd461f |
| Headers | show |
| Series |
|
| Related | show |
Quoting Naushir Patuck via libcamera-devel (2022-07-28 13:05:30) > The Controller(char const *jsonFilename) is not valid anymore since > Controller::read() can now return an error on a failure. Additionally, this > constructor is not actually used, so remove it. > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> > --- > src/ipa/raspberrypi/controller/controller.cpp | 7 ------- > src/ipa/raspberrypi/controller/controller.h | 1 - > 2 files changed, 8 deletions(-) > > diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp > index bbd382bce3ab..f489278668ef 100644 > --- a/src/ipa/raspberrypi/controller/controller.cpp > +++ b/src/ipa/raspberrypi/controller/controller.cpp > @@ -25,13 +25,6 @@ Controller::Controller() > { > } > > -Controller::Controller(char const *jsonFilename) > - : switchModeCalled_(false) > -{ > - read(jsonFilename); > - initialise(); > -} > - > Controller::~Controller() {} > > int Controller::read(char const *filename) > diff --git a/src/ipa/raspberrypi/controller/controller.h b/src/ipa/raspberrypi/controller/controller.h > index 6be1e3cfa156..3e1e051703b3 100644 > --- a/src/ipa/raspberrypi/controller/controller.h > +++ b/src/ipa/raspberrypi/controller/controller.h > @@ -40,7 +40,6 @@ class Controller > { > public: > Controller(); > - Controller(char const *jsonFilename); > ~Controller(); > int read(char const *filename); > void initialise(); > -- > 2.25.1 >
On Thu, Jul 28, 2022 at 01:41:08PM +0100, Kieran Bingham via libcamera-devel wrote: > Quoting Naushir Patuck via libcamera-devel (2022-07-28 13:05:30) > > The Controller(char const *jsonFilename) is not valid anymore since > > Controller::read() can now return an error on a failure. Additionally, this > > constructor is not actually used, so remove it. > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> > > --- > > src/ipa/raspberrypi/controller/controller.cpp | 7 ------- > > src/ipa/raspberrypi/controller/controller.h | 1 - > > 2 files changed, 8 deletions(-) > > > > diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp > > index bbd382bce3ab..f489278668ef 100644 > > --- a/src/ipa/raspberrypi/controller/controller.cpp > > +++ b/src/ipa/raspberrypi/controller/controller.cpp > > @@ -25,13 +25,6 @@ Controller::Controller() > > { > > } > > > > -Controller::Controller(char const *jsonFilename) > > - : switchModeCalled_(false) > > -{ > > - read(jsonFilename); > > - initialise(); > > -} > > - > > Controller::~Controller() {} > > > > int Controller::read(char const *filename) > > diff --git a/src/ipa/raspberrypi/controller/controller.h b/src/ipa/raspberrypi/controller/controller.h > > index 6be1e3cfa156..3e1e051703b3 100644 > > --- a/src/ipa/raspberrypi/controller/controller.h > > +++ b/src/ipa/raspberrypi/controller/controller.h > > @@ -40,7 +40,6 @@ class Controller > > { > > public: > > Controller(); > > - Controller(char const *jsonFilename); > > ~Controller(); > > int read(char const *filename); > > void initialise();
diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp index bbd382bce3ab..f489278668ef 100644 --- a/src/ipa/raspberrypi/controller/controller.cpp +++ b/src/ipa/raspberrypi/controller/controller.cpp @@ -25,13 +25,6 @@ Controller::Controller() { } -Controller::Controller(char const *jsonFilename) - : switchModeCalled_(false) -{ - read(jsonFilename); - initialise(); -} - Controller::~Controller() {} int Controller::read(char const *filename) diff --git a/src/ipa/raspberrypi/controller/controller.h b/src/ipa/raspberrypi/controller/controller.h index 6be1e3cfa156..3e1e051703b3 100644 --- a/src/ipa/raspberrypi/controller/controller.h +++ b/src/ipa/raspberrypi/controller/controller.h @@ -40,7 +40,6 @@ class Controller { public: Controller(); - Controller(char const *jsonFilename); ~Controller(); int read(char const *filename); void initialise();
The Controller(char const *jsonFilename) is not valid anymore since Controller::read() can now return an error on a failure. Additionally, this constructor is not actually used, so remove it. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- src/ipa/raspberrypi/controller/controller.cpp | 7 ------- src/ipa/raspberrypi/controller/controller.h | 1 - 2 files changed, 8 deletions(-)