diff --git a/examples/go.sum b/examples/go.sum index 89883ee..3e2ad04 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,5 +1,5 @@ -github.com/blackjack/webcam v0.5.0 h1:NImYpsAbWxglejopcQGQ3FClxhJZaBBgr5fV7nsGdvk= -github.com/blackjack/webcam v0.5.0/go.mod h1:zs+RkUZzqpFPHPiwBZ6U5B34ZXXe9i+SiHLKnnukJuI= +github.com/blackjack/webcam v0.6.0 h1:ovvUNsIQZVfJZl6V2FcvFLFH62/Xx5zLwybKwEy3ZLw= +github.com/blackjack/webcam v0.6.0/go.mod h1:zs+RkUZzqpFPHPiwBZ6U5B34ZXXe9i+SiHLKnnukJuI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/pkg/driver/camera/camera_windows.cpp b/pkg/driver/camera/camera_windows.cpp index 5d768ce..061f21d 100644 --- a/pkg/driver/camera/camera_windows.cpp +++ b/pkg/driver/camera/camera_windows.cpp @@ -8,6 +8,18 @@ #include "camera_windows.hpp" #include "_cgo_export.h" + +imageProp* getProp(camera* cam, int i) +{ + return &cam->props[i]; +} + +char* getName(cameraList* list, int i) +{ + return list->name[i]; +} + + // printErr shows string representation of HRESULT. // This is for debugging. void printErr(HRESULT hr) diff --git a/pkg/driver/camera/camera_windows.hpp b/pkg/driver/camera/camera_windows.hpp index 51c3d96..55669e6 100644 --- a/pkg/driver/camera/camera_windows.hpp +++ b/pkg/driver/camera/camera_windows.hpp @@ -40,15 +40,9 @@ int listResolution(camera* cam, const char** errstr); int listCamera(cameraList* list, const char** errstr); int freeCameraList(cameraList* list, const char** errstr); -inline imageProp* getProp(camera* cam, int i) -{ - return &cam->props[i]; -} +imageProp* getProp(camera* cam, int i); -inline char* getName(cameraList* list, int i) -{ - return list->name[i]; -} +char* getName(cameraList* list, int i); #ifdef __cplusplus }