| Message ID | 20190405020256.22520-5-niklas.soderlund@ragnatech.se |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Niklas, Thank you for the patch, On 05/04/2019 09:02, Niklas Söderlund wrote: > Make the geometry header public so it can be used by the API facing > applications. This sounds like a reasonable move, and looks clean. Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > {src/libcamera/include => include/libcamera}/geometry.h | 0 > src/libcamera/geometry.cpp | 2 +- > src/libcamera/include/formats.h | 2 +- > src/libcamera/include/v4l2_subdevice.h | 3 ++- > src/libcamera/v4l2_subdevice.cpp | 3 ++- > test/v4l2_subdevice/list_formats.cpp | 3 ++- > 6 files changed, 8 insertions(+), 5 deletions(-) > rename {src/libcamera/include => include/libcamera}/geometry.h (100%) > > diff --git a/src/libcamera/include/geometry.h b/include/libcamera/geometry.h > similarity index 100% > rename from src/libcamera/include/geometry.h > rename to include/libcamera/geometry.h > diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp > index d0c63c353ab3fc0b..d63eceaf827b99a4 100644 > --- a/src/libcamera/geometry.cpp > +++ b/src/libcamera/geometry.cpp > @@ -7,7 +7,7 @@ > > #include <sstream> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > > /** > * \file geometry.h > diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h > index 5fcfb11318e749d1..a73772b1eda068b4 100644 > --- a/src/libcamera/include/formats.h > +++ b/src/libcamera/include/formats.h > @@ -11,7 +11,7 @@ > #include <map> > #include <vector> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > > namespace libcamera { > > diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h > index ee7c72468d21b83b..c71dce7d864494e5 100644 > --- a/src/libcamera/include/v4l2_subdevice.h > +++ b/src/libcamera/include/v4l2_subdevice.h > @@ -11,8 +11,9 @@ > #include <string> > #include <vector> > > +#include <libcamera/geometry.h> > + > #include "formats.h" > -#include "geometry.h" > #include "log.h" > #include "media_object.h" > > diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp > index 0abeaa204eda465b..e34cc1693b46b374 100644 > --- a/src/libcamera/v4l2_subdevice.cpp > +++ b/src/libcamera/v4l2_subdevice.cpp > @@ -14,7 +14,8 @@ > > #include <linux/v4l2-subdev.h> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > + > #include "log.h" > #include "media_device.h" > #include "media_object.h" > diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp > index db486554b7b5c6a9..47ae3a1c1a28c350 100644 > --- a/test/v4l2_subdevice/list_formats.cpp > +++ b/test/v4l2_subdevice/list_formats.cpp > @@ -9,7 +9,8 @@ > #include <iostream> > #include <vector> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > + > #include "v4l2_subdevice.h" > #include "v4l2_subdevice_test.h" > >
Hi Niklas, On Fri, Apr 05, 2019 at 04:02:52AM +0200, Niklas Söderlund wrote: > Make the geometry header public so it can be used by the API facing > applications. I welcome this change and the order of inclusion directives seems sane to me. Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > {src/libcamera/include => include/libcamera}/geometry.h | 0 > src/libcamera/geometry.cpp | 2 +- > src/libcamera/include/formats.h | 2 +- > src/libcamera/include/v4l2_subdevice.h | 3 ++- > src/libcamera/v4l2_subdevice.cpp | 3 ++- > test/v4l2_subdevice/list_formats.cpp | 3 ++- > 6 files changed, 8 insertions(+), 5 deletions(-) > rename {src/libcamera/include => include/libcamera}/geometry.h (100%) > > diff --git a/src/libcamera/include/geometry.h b/include/libcamera/geometry.h > similarity index 100% > rename from src/libcamera/include/geometry.h > rename to include/libcamera/geometry.h > diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp > index d0c63c353ab3fc0b..d63eceaf827b99a4 100644 > --- a/src/libcamera/geometry.cpp > +++ b/src/libcamera/geometry.cpp > @@ -7,7 +7,7 @@ > > #include <sstream> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > > /** > * \file geometry.h > diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h > index 5fcfb11318e749d1..a73772b1eda068b4 100644 > --- a/src/libcamera/include/formats.h > +++ b/src/libcamera/include/formats.h > @@ -11,7 +11,7 @@ > #include <map> > #include <vector> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > > namespace libcamera { > > diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h > index ee7c72468d21b83b..c71dce7d864494e5 100644 > --- a/src/libcamera/include/v4l2_subdevice.h > +++ b/src/libcamera/include/v4l2_subdevice.h > @@ -11,8 +11,9 @@ > #include <string> > #include <vector> > > +#include <libcamera/geometry.h> > + > #include "formats.h" > -#include "geometry.h" > #include "log.h" > #include "media_object.h" > > diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp > index 0abeaa204eda465b..e34cc1693b46b374 100644 > --- a/src/libcamera/v4l2_subdevice.cpp > +++ b/src/libcamera/v4l2_subdevice.cpp > @@ -14,7 +14,8 @@ > > #include <linux/v4l2-subdev.h> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > + > #include "log.h" > #include "media_device.h" > #include "media_object.h" > diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp > index db486554b7b5c6a9..47ae3a1c1a28c350 100644 > --- a/test/v4l2_subdevice/list_formats.cpp > +++ b/test/v4l2_subdevice/list_formats.cpp > @@ -9,7 +9,8 @@ > #include <iostream> > #include <vector> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > + > #include "v4l2_subdevice.h" > #include "v4l2_subdevice_test.h" > > -- > 2.21.0 > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
Hi Niklas, Thank you for the patch. On Fri, Apr 05, 2019 at 04:02:52AM +0200, Niklas Söderlund wrote: > Make the geometry header public so it can be used by the API facing > applications. > > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > {src/libcamera/include => include/libcamera}/geometry.h | 0 > src/libcamera/geometry.cpp | 2 +- > src/libcamera/include/formats.h | 2 +- > src/libcamera/include/v4l2_subdevice.h | 3 ++- > src/libcamera/v4l2_subdevice.cpp | 3 ++- > test/v4l2_subdevice/list_formats.cpp | 3 ++- Please add the header to the libcamera_api list in include/libcamera/meson.build. With this fixed, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Feel free to also submit a patch to add missing headers to src/libcamera/meson.build :-) > 6 files changed, 8 insertions(+), 5 deletions(-) > rename {src/libcamera/include => include/libcamera}/geometry.h (100%) > > diff --git a/src/libcamera/include/geometry.h b/include/libcamera/geometry.h > similarity index 100% > rename from src/libcamera/include/geometry.h > rename to include/libcamera/geometry.h > diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp > index d0c63c353ab3fc0b..d63eceaf827b99a4 100644 > --- a/src/libcamera/geometry.cpp > +++ b/src/libcamera/geometry.cpp > @@ -7,7 +7,7 @@ > > #include <sstream> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > > /** > * \file geometry.h > diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h > index 5fcfb11318e749d1..a73772b1eda068b4 100644 > --- a/src/libcamera/include/formats.h > +++ b/src/libcamera/include/formats.h > @@ -11,7 +11,7 @@ > #include <map> > #include <vector> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > > namespace libcamera { > > diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h > index ee7c72468d21b83b..c71dce7d864494e5 100644 > --- a/src/libcamera/include/v4l2_subdevice.h > +++ b/src/libcamera/include/v4l2_subdevice.h > @@ -11,8 +11,9 @@ > #include <string> > #include <vector> > > +#include <libcamera/geometry.h> > + > #include "formats.h" > -#include "geometry.h" > #include "log.h" > #include "media_object.h" > > diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp > index 0abeaa204eda465b..e34cc1693b46b374 100644 > --- a/src/libcamera/v4l2_subdevice.cpp > +++ b/src/libcamera/v4l2_subdevice.cpp > @@ -14,7 +14,8 @@ > > #include <linux/v4l2-subdev.h> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > + > #include "log.h" > #include "media_device.h" > #include "media_object.h" > diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp > index db486554b7b5c6a9..47ae3a1c1a28c350 100644 > --- a/test/v4l2_subdevice/list_formats.cpp > +++ b/test/v4l2_subdevice/list_formats.cpp > @@ -9,7 +9,8 @@ > #include <iostream> > #include <vector> > > -#include "geometry.h" > +#include <libcamera/geometry.h> > + > #include "v4l2_subdevice.h" > #include "v4l2_subdevice_test.h" >
diff --git a/src/libcamera/include/geometry.h b/include/libcamera/geometry.h similarity index 100% rename from src/libcamera/include/geometry.h rename to include/libcamera/geometry.h diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index d0c63c353ab3fc0b..d63eceaf827b99a4 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -7,7 +7,7 @@ #include <sstream> -#include "geometry.h" +#include <libcamera/geometry.h> /** * \file geometry.h diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h index 5fcfb11318e749d1..a73772b1eda068b4 100644 --- a/src/libcamera/include/formats.h +++ b/src/libcamera/include/formats.h @@ -11,7 +11,7 @@ #include <map> #include <vector> -#include "geometry.h" +#include <libcamera/geometry.h> namespace libcamera { diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h index ee7c72468d21b83b..c71dce7d864494e5 100644 --- a/src/libcamera/include/v4l2_subdevice.h +++ b/src/libcamera/include/v4l2_subdevice.h @@ -11,8 +11,9 @@ #include <string> #include <vector> +#include <libcamera/geometry.h> + #include "formats.h" -#include "geometry.h" #include "log.h" #include "media_object.h" diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 0abeaa204eda465b..e34cc1693b46b374 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -14,7 +14,8 @@ #include <linux/v4l2-subdev.h> -#include "geometry.h" +#include <libcamera/geometry.h> + #include "log.h" #include "media_device.h" #include "media_object.h" diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp index db486554b7b5c6a9..47ae3a1c1a28c350 100644 --- a/test/v4l2_subdevice/list_formats.cpp +++ b/test/v4l2_subdevice/list_formats.cpp @@ -9,7 +9,8 @@ #include <iostream> #include <vector> -#include "geometry.h" +#include <libcamera/geometry.h> + #include "v4l2_subdevice.h" #include "v4l2_subdevice_test.h"
Make the geometry header public so it can be used by the API facing applications. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> --- {src/libcamera/include => include/libcamera}/geometry.h | 0 src/libcamera/geometry.cpp | 2 +- src/libcamera/include/formats.h | 2 +- src/libcamera/include/v4l2_subdevice.h | 3 ++- src/libcamera/v4l2_subdevice.cpp | 3 ++- test/v4l2_subdevice/list_formats.cpp | 3 ++- 6 files changed, 8 insertions(+), 5 deletions(-) rename {src/libcamera/include => include/libcamera}/geometry.h (100%)