diff --git a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h b/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h index 8464d625ae5..33b6359849f 100644 --- a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h +++ b/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h @@ -12,16 +12,16 @@ // wrapper only // These models have no precomputed data -typedef struct {} mrcal_LENSMODEL_PINHOLE__precomputed_t; -typedef struct {} mrcal_LENSMODEL_STEREOGRAPHIC__precomputed_t; -typedef struct {} mrcal_LENSMODEL_LONLAT__precomputed_t; -typedef struct {} mrcal_LENSMODEL_LATLON__precomputed_t; -typedef struct {} mrcal_LENSMODEL_OPENCV4__precomputed_t; -typedef struct {} mrcal_LENSMODEL_OPENCV5__precomputed_t; -typedef struct {} mrcal_LENSMODEL_OPENCV8__precomputed_t; -typedef struct {} mrcal_LENSMODEL_OPENCV12__precomputed_t; -typedef struct {} mrcal_LENSMODEL_CAHVOR__precomputed_t; -typedef struct {} mrcal_LENSMODEL_CAHVORE__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_PINHOLE__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_STEREOGRAPHIC__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_LONLAT__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_LATLON__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV4__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV5__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV8__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV12__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_CAHVOR__precomputed_t; +// typedef struct {} mrcal_LENSMODEL_CAHVORE__precomputed_t; // The splined stereographic models configuration parameters can be used to // compute the segment size. I cache this computation diff --git a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h b/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h index e272afe4d0c..8e6d1d0293a 100644 --- a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h +++ b/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h @@ -39,21 +39,20 @@ #define MRCAL_LENSMODEL_WITHCONFIG_DYNAMIC_NPARAMS_LIST(_) \ _(LENSMODEL_SPLINED_STEREOGRAPHIC, -1) #define MRCAL_LENSMODEL_LIST(_) \ - MRCAL_LENSMODEL_NOCONFIG_LIST(_) \ MRCAL_LENSMODEL_WITHCONFIG_STATIC_NPARAMS_LIST(_) \ MRCAL_LENSMODEL_WITHCONFIG_DYNAMIC_NPARAMS_LIST(_) // parametric models have no extra configuration -typedef struct {} mrcal_LENSMODEL_PINHOLE__config_t; -typedef struct {} mrcal_LENSMODEL_STEREOGRAPHIC__config_t; -typedef struct {} mrcal_LENSMODEL_LONLAT__config_t; -typedef struct {} mrcal_LENSMODEL_LATLON__config_t; -typedef struct {} mrcal_LENSMODEL_OPENCV4__config_t; -typedef struct {} mrcal_LENSMODEL_OPENCV5__config_t; -typedef struct {} mrcal_LENSMODEL_OPENCV8__config_t; -typedef struct {} mrcal_LENSMODEL_OPENCV12__config_t; -typedef struct {} mrcal_LENSMODEL_CAHVOR__config_t; +// typedef struct {} mrcal_LENSMODEL_PINHOLE__config_t; +// typedef struct {} mrcal_LENSMODEL_STEREOGRAPHIC__config_t; +// typedef struct {} mrcal_LENSMODEL_LONLAT__config_t; +// typedef struct {} mrcal_LENSMODEL_LATLON__config_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV4__config_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV5__config_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV8__config_t; +// typedef struct {} mrcal_LENSMODEL_OPENCV12__config_t; +// typedef struct {} mrcal_LENSMODEL_CAHVOR__config_t; #define _MRCAL_ITEM_DEFINE_ELEMENT(name, type, pybuildvaluecode, PRIcode,SCNcode, bitfield, cookie) type name bitfield;