Merge pull request #3633 from Starbuck5/return-of-the-camera

Fix segfault and stub problem with camera module

Author: Starbuck5

buildconfig/stubs/pygame/camera.pyi

@@ -7,7 +7,7 @@ from pygame.typing import IntPoint
 def get_backends() -> list[str]: ...
 def init(backend: str | None = None) -> None: ...
 def quit() -> None: ...
-def list_cameras() -> list[str]: ...
+def list_cameras() -> list[str] | list[int]: ...
 def colorspace(
  surface: Surface, color: Literal["YUV", "HSV"], dest_surface: Surface = ..., /
 ) -> Surface: ...
@@ -34,7 +34,7 @@ class AbstractCamera(ABC):
 class Camera(AbstractCamera):
  def __init__(
  self,
- device: str | int = 0,
+ device: str | int,
  size: IntPoint = (640, 480),
  format: str = "RGB",
  ) -> None: ...

src_c/_camera.c

@@ -1886,6 +1886,9 @@ camera_init(pgCameraObject *self, PyObject *arg, PyObject *kwargs)
 
  /* needs to be freed with PyMem_Free later */
  dev_name = PyUnicode_AsWideCharString(name_obj, NULL);
+ if (dev_name == NULL) {
+ return -1;
+ }
 
  p = windows_device_from_name(dev_name);
 

src_py/_camera_opencv.py

@@ -33,6 +33,8 @@ def list_cameras_darwin():
 
 
 class Camera:
+ # device should not have a default argument!!
+ # leaving here for compatibility, but I fixed the stubs.
  def __init__(self, device=0, size=(640, 480), mode="RGB"):
  self._device_index = device
  self._size = size