Skip to content

Commit 0649f2e

Browse files
authored
Merge pull request #330 from ros-drivers/fix-rolling-builds
Update comment in CI from Jammy to Noble
2 parents a8962cb + 053b678 commit 0649f2e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/build_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
sort -u)
4141
4242
# Handle the case if two docker images were declared for one distro
43-
# e.g. rolling moving from one Ubuntu Focal to Ubuntu Jammy
43+
# e.g. rolling moving from one Ubuntu Jammy to Ubuntu Noble
4444
docker_image_arr=($docker_image)
4545
4646
DISTRO_STR+="\"${distro}\", "

include/usb_cam/formats/uyvy.hpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ class UYVY2RGB : public pixel_format_base
8080
///
8181
/// Source: https://www.linuxtv.org/downloads/v4l-dvb-apis-old/V4L2-PIX-FMT-YUYV.html
8282
///
83+
// Use `INDENT-OFF` here to disable uncrustify for this function due to
84+
// differing uncrustify formats for different distros
85+
// *INDENT-OFF*
8386
void convert(const char * & src, char * & dest, const int & bytes_used) override
8487
{
8588
(void)bytes_used; // not used by this conversion method
8689
int i, j;
8790
unsigned char y0, y1, u, v;
8891
unsigned char r, g, b;
89-
9092
for (i = 0, j = 0; i < (static_cast<int>(m_number_of_pixels) << 1); i += 4, j += 6) {
9193
u = (unsigned char)src[i + 0];
9294
y0 = (unsigned char)src[i + 1];
@@ -102,6 +104,7 @@ class UYVY2RGB : public pixel_format_base
102104
dest[j + 5] = b;
103105
}
104106
}
107+
// *INDENT-ON*
105108

106109
private:
107110
size_t m_number_of_pixels;

0 commit comments

Comments
 (0)