Skip to content

Commit 2f34918

Browse files
authored
Merge pull request #6876 from cyberbotics/sync-released-a2675711c
Merge released into master
2 parents f355c4d + 8480abe commit 2f34918

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

docs/css/webots-doc.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,13 @@ body {
917917
.webots-doc g foreignObject div a {
918918
font-family: Tahoma, Arial, sans-serif; /* mermaidjs is quite sensitive to the font used and it's size */
919919
font-size: 100%;
920+
text-decoration: underline;
921+
}
922+
923+
.webots-doc g foreignObject div a:active,
924+
.webots-doc g foreignObject div a:focus,
925+
.webots-doc g foreignObject div a:hover {
926+
text-decoration: underline;
920927
}
921928

922929
.webots-doc .mermaid {

docs/reference/camera.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -791,16 +791,16 @@ namespace webots {
791791
from controller import Camera
792792

793793
class Camera (Device):
794-
def getImage(self):
795-
def getImageArray(self):
794+
def getImage(self) -> bytes:
795+
def getImageArray(self) -> list[list[list[int]]]:
796796
@staticmethod
797-
def imageGetRed(image, width, x, y):
797+
def imageGetRed(image: bytes, width: int, x: int, y: int) -> int:
798798
@staticmethod
799-
def imageGetGreen(image, width, x, y):
799+
def imageGetGreen(image: bytes, width: int, x: int, y: int) -> int:
800800
@staticmethod
801-
def imageGetBlue(image, width, x, y):
801+
def imageGetBlue(image: bytes, width: int, x: int, y: int) -> int:
802802
@staticmethod
803-
def imageGetGray(image, width, x, y):
803+
def imageGetGray(image: bytes, width: int, x: int, y: int) -> int:
804804
# ...
805805
```
806806

@@ -895,8 +895,8 @@ Here is an example:
895895
896896
<!-- -->
897897
898-
> **Note** [Python]: The `getImage` function returns a `string`.
899-
This `string` is closely related to the `const char *` of the C API.
898+
> **Note** [Python]: The `getImage` function returns a byte array (`bytes`).
899+
This `bytes` is closely related to the `const char *` of the C API.
900900
`imageGet*`-like functions can be used to get the channels of the camera Here is an example:
901901
902902
> ```python

0 commit comments

Comments
 (0)