From 8786404b1e71ccaec5e5b0a25868ae823dfab5bf Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Mon, 2 May 2022 11:06:12 -0400
Subject: [PATCH] Update for latest pybind11

---
 python/kwiver/vital/types/descriptor.cxx       | 5 +++--
 python/kwiver/vital/types/descriptor_class.cxx | 4 ++--
 python/kwiver/vital/types/descriptor_set.cxx   | 3 ++-
 python/kwiver/vital/types/image.cxx            | 5 +++--
 python/kwiver/vital/types/track.cxx            | 3 ++-
 python/kwiver/vital/util/pybind11.h            | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/python/kwiver/vital/types/descriptor.cxx b/python/kwiver/vital/types/descriptor.cxx
index 96de33c151..d21b519cc8 100644
--- a/python/kwiver/vital/types/descriptor.cxx
+++ b/python/kwiver/vital/types/descriptor.cxx
@@ -2,6 +2,7 @@
 // OSI-approved BSD 3-Clause License. See top-level LICENSE file or
 // https://github.com/Kitware/kwiver/blob/master/LICENSE for details.
 
+#include <pybind11/cast.h>
 #include <pybind11/stl.h>
 
 #include <vital/types/descriptor.h>
@@ -17,12 +18,12 @@ new_descriptor(size_t len, char ctype)
   if(ctype == 'd')
   {
     auto obj = std::shared_ptr<kwiver::vital::descriptor_dynamic<double>>(new kwiver::vital::descriptor_dynamic<double>(len));
-    retVal = py::cast<std::shared_ptr<kwiver::vital::descriptor_dynamic<double>>>(obj);
+    retVal = py::cast(obj);
   }
   else if(ctype == 'f')
   {
     auto obj = std::shared_ptr<kwiver::vital::descriptor_dynamic<float>>(new kwiver::vital::descriptor_dynamic<float>(len));
-    retVal = py::cast<std::shared_ptr<kwiver::vital::descriptor_dynamic<float>>>(obj);
+    retVal = py::cast(obj);
   }
   return retVal;
 }
diff --git a/python/kwiver/vital/types/descriptor_class.cxx b/python/kwiver/vital/types/descriptor_class.cxx
index 1a595aa3c3..46a28b3a2c 100644
--- a/python/kwiver/vital/types/descriptor_class.cxx
+++ b/python/kwiver/vital/types/descriptor_class.cxx
@@ -98,7 +98,7 @@ class PyDescriptorD
       {
         ret_vec.push_back(data[idx]);
       }
-      return py::cast<std::vector<double>> (ret_vec);
+      return py::cast(ret_vec);
     }
 
 };
@@ -169,7 +169,7 @@ class PyDescriptorF
       {
         ret_vec.push_back(data[idx]);
       }
-      return py::cast<std::vector<float>> (ret_vec);
+      return py::cast(ret_vec);
     }
 };
 
diff --git a/python/kwiver/vital/types/descriptor_set.cxx b/python/kwiver/vital/types/descriptor_set.cxx
index ac9922507c..53cd63e5de 100644
--- a/python/kwiver/vital/types/descriptor_set.cxx
+++ b/python/kwiver/vital/types/descriptor_set.cxx
@@ -3,6 +3,7 @@
 // https://github.com/Kitware/kwiver/blob/master/LICENSE for details.
 
 #include <pybind11/pybind11.h>
+#include <pybind11/cast.h>
 #include <pybind11/stl.h>
 
 #include <vital/types/descriptor_set.h>
@@ -29,7 +30,7 @@ new_desc_set1(py::list py_list)
   std::vector<std::shared_ptr<kwiver::vital::descriptor>> desc_list;
   for(auto py_desc : py_list)
   {
-    desc_list.push_back(py::cast<std::shared_ptr<kwiver::vital::descriptor>>(py_desc));
+    desc_list.push_back(py_desc.cast<std::shared_ptr<kwiver::vital::descriptor>>());
   }
   return std::make_shared<s_desc_set>(desc_list);
 }
diff --git a/python/kwiver/vital/types/image.cxx b/python/kwiver/vital/types/image.cxx
index 3ec9d68091..24be5d88f2 100644
--- a/python/kwiver/vital/types/image.cxx
+++ b/python/kwiver/vital/types/image.cxx
@@ -5,6 +5,7 @@
 #include <vital/types/image.h>
 #include <python/kwiver/vital/types/image.h>
 #include <pybind11/pybind11.h>
+#include <pybind11/cast.h>
 #include <pybind11/stl.h>
 #include <pybind11/numpy.h>
 
@@ -65,7 +66,7 @@ kwiver::vital::python::image::get_pixel2(std::shared_ptr<image_t> &img,
   #define QUOTE(X) #X
   #define GET_PIXEL(TYPE, NAME) \
   if(type == QUOTE(NAME)) \
-  return py::cast<TYPE>(img->at<TYPE>(i,j));
+  return py::cast(img->at<TYPE>(i,j));
 
   GET_PIXEL(uint8_t, uint8)
   GET_PIXEL(int8_t, int8)
@@ -96,7 +97,7 @@ kwiver::vital::python::image::get_pixel3(std::shared_ptr<image_t> &img,
   #define QUOTE(X) #X
   #define GET_PIXEL(TYPE, NAME) \
   if(type == QUOTE(NAME)) \
-  return py::cast<TYPE>(img->at<TYPE>(i,j,k));
+  return py::cast(img->at<TYPE>(i,j,k));
 
   GET_PIXEL(uint8_t, uint8)
   GET_PIXEL(int8_t, int8)
diff --git a/python/kwiver/vital/types/track.cxx b/python/kwiver/vital/types/track.cxx
index 1576593238..62ceff4381 100644
--- a/python/kwiver/vital/types/track.cxx
+++ b/python/kwiver/vital/types/track.cxx
@@ -7,6 +7,7 @@
 #include <pybind11/operators.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <pybind11/cast.h>
 
 namespace py=pybind11;
 namespace kwiver {
@@ -21,7 +22,7 @@ track_find_state(kwiver::vital::track &self, int64_t frame_id)
   {
     throw py::index_error();
   }
-  return py::cast<std::shared_ptr<kwiver::vital::track_state>>(*frame_itr);
+  return py::cast(*frame_itr);
 }
 }
 }
diff --git a/python/kwiver/vital/util/pybind11.h b/python/kwiver/vital/util/pybind11.h
index 5cf3d015ab..96b55652ab 100644
--- a/python/kwiver/vital/util/pybind11.h
+++ b/python/kwiver/vital/util/pybind11.h
@@ -95,7 +95,7 @@ class gil_scoped_release
       if( pybind11::detail::cast_is_temporary_value_reference< ret_type >:: \
           value ) \
       { \
-        static pybind11::detail::overload_caster_t< ret_type > caster; \
+        static pybind11::detail::override_caster_t< ret_type > caster; \
         return pybind11::detail::cast_ref< ret_type >( std::move( o ), \
                                                        caster ); \
       } \