Commit a966d54

authored

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

Fix segfault and stub problem with camera module

2 parents 807688e + 0a27537 commit a966d54Copy full SHA for a966d54

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ from pygame.typing import IntPoint`
`7`	`7`	`def get_backends() -> list[str]: ...`
`8`	`8`	`def init(backend: str \| None = None) -> None: ...`
`9`	`9`	`def quit() -> None: ...`
`10`		`-def list_cameras() -> list[str]: ...`
	`10`	`+def list_cameras() -> list[str]\|list[int]: ...`
`11`	`11`	`def colorspace(`
`12`	`12`	`surface: Surface, color: Literal["YUV", "HSV"], dest_surface: Surface = ..., /`
`13`	`13`	`) -> Surface: ...`
`@@ -34,7 +34,7 @@ class AbstractCamera(ABC):`
`34`	`34`	`class Camera(AbstractCamera):`
`35`	`35`	`def __init__(`
`36`	`36`	`self,`
`37`		`- device: str \| int=0,`
	`37`	`+ device: str \| int,`
`38`	`38`	`size: IntPoint = (640, 480),`
`39`	`39`	`format: str = "RGB",`
`40`	`40`	`) -> None: ...`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1886,6 +1886,9 @@ camera_init(pgCameraObject self, PyObject arg, PyObject *kwargs)`
`1886`	`1886`
`1887`	`1887`	`/* needs to be freed with PyMem_Free later */`
`1888`	`1888`	`dev_name = PyUnicode_AsWideCharString(name_obj, NULL);`
	`1889`	`+ if (dev_name == NULL) {`
	`1890`	`+ return -1;`
	`1891`	`+ }`
`1889`	`1892`
`1890`	`1893`	`p = windows_device_from_name(dev_name);`
`1891`	`1894`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ def list_cameras_darwin():`
`33`	`33`
`34`	`34`
`35`	`35`	`class Camera:`
	`36`	`+ # device should not have a default argument!!`
	`37`	`+ # leaving here for compatibility, but I fixed the stubs.`
`36`	`38`	`def __init__(self, device=0, size=(640, 480), mode="RGB"):`
`37`	`39`	`self._device_index = device`
`38`	`40`	`self._size = size`

Comments

(0)