| Message ID | 20240917002318.331010-1-dave@treblig.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ui/cursor: remove cursor_get_mono_image | expand |
On Tue, Sep 17, 2024 at 4:23 AM <dave@treblig.org> wrote: > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > cursor_get_mono_image has been unused since 2018's > 0015ca5cba ("ui: remove support for SDL1.2 in favour of SDL2") > > Remove it. > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > include/ui/console.h | 1 - > ui/cursor.c | 24 ------------------------ > 2 files changed, 25 deletions(-) > > diff --git a/include/ui/console.h b/include/ui/console.h > index fa986ab97e..5832d52a8a 100644 > --- a/include/ui/console.h > +++ b/include/ui/console.h > @@ -175,7 +175,6 @@ int cursor_get_mono_bpl(QEMUCursor *c); > void cursor_set_mono(QEMUCursor *c, > uint32_t foreground, uint32_t background, uint8_t > *image, > int transparent, uint8_t *mask); > -void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask); > void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask); > > typedef void *QEMUGLContext; > diff --git a/ui/cursor.c b/ui/cursor.c > index dd3853320d..6e23244fbe 100644 > --- a/ui/cursor.c > +++ b/ui/cursor.c > @@ -197,30 +197,6 @@ void cursor_set_mono(QEMUCursor *c, > } > } > > -void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *image) > -{ > - uint32_t *data = c->data; > - uint8_t bit; > - int x,y,bpl; > - > - bpl = cursor_get_mono_bpl(c); > - memset(image, 0, bpl * c->height); > - for (y = 0; y < c->height; y++) { > - bit = 0x80; > - for (x = 0; x < c->width; x++, data++) { > - if (((*data & 0xff000000) == 0xff000000) && > - ((*data & 0x00ffffff) == foreground)) { > - image[x/8] |= bit; > - } > - bit >>= 1; > - if (bit == 0) { > - bit = 0x80; > - } > - } > - image += bpl; > - } > -} > - > void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask) > { > uint32_t *data = c->data; > -- > 2.46.0 > > >
On 17/09/2024 02.23, dave@treblig.org wrote: > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > cursor_get_mono_image has been unused since 2018's > 0015ca5cba ("ui: remove support for SDL1.2 in favour of SDL2") > > Remove it. > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > --- > include/ui/console.h | 1 - > ui/cursor.c | 24 ------------------------ > 2 files changed, 25 deletions(-) > > diff --git a/include/ui/console.h b/include/ui/console.h > index fa986ab97e..5832d52a8a 100644 > --- a/include/ui/console.h > +++ b/include/ui/console.h > @@ -175,7 +175,6 @@ int cursor_get_mono_bpl(QEMUCursor *c); > void cursor_set_mono(QEMUCursor *c, > uint32_t foreground, uint32_t background, uint8_t *image, > int transparent, uint8_t *mask); > -void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask); > void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask); > > typedef void *QEMUGLContext; > diff --git a/ui/cursor.c b/ui/cursor.c > index dd3853320d..6e23244fbe 100644 > --- a/ui/cursor.c > +++ b/ui/cursor.c > @@ -197,30 +197,6 @@ void cursor_set_mono(QEMUCursor *c, > } > } > > -void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *image) > -{ > - uint32_t *data = c->data; > - uint8_t bit; > - int x,y,bpl; > - > - bpl = cursor_get_mono_bpl(c); > - memset(image, 0, bpl * c->height); > - for (y = 0; y < c->height; y++) { > - bit = 0x80; > - for (x = 0; x < c->width; x++, data++) { > - if (((*data & 0xff000000) == 0xff000000) && > - ((*data & 0x00ffffff) == foreground)) { > - image[x/8] |= bit; > - } > - bit >>= 1; > - if (bit == 0) { > - bit = 0x80; > - } > - } > - image += bpl; > - } > -} > - > void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask) > { > uint32_t *data = c->data; Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/include/ui/console.h b/include/ui/console.h index fa986ab97e..5832d52a8a 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -175,7 +175,6 @@ int cursor_get_mono_bpl(QEMUCursor *c); void cursor_set_mono(QEMUCursor *c, uint32_t foreground, uint32_t background, uint8_t *image, int transparent, uint8_t *mask); -void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask); void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask); typedef void *QEMUGLContext; diff --git a/ui/cursor.c b/ui/cursor.c index dd3853320d..6e23244fbe 100644 --- a/ui/cursor.c +++ b/ui/cursor.c @@ -197,30 +197,6 @@ void cursor_set_mono(QEMUCursor *c, } } -void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *image) -{ - uint32_t *data = c->data; - uint8_t bit; - int x,y,bpl; - - bpl = cursor_get_mono_bpl(c); - memset(image, 0, bpl * c->height); - for (y = 0; y < c->height; y++) { - bit = 0x80; - for (x = 0; x < c->width; x++, data++) { - if (((*data & 0xff000000) == 0xff000000) && - ((*data & 0x00ffffff) == foreground)) { - image[x/8] |= bit; - } - bit >>= 1; - if (bit == 0) { - bit = 0x80; - } - } - image += bpl; - } -} - void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask) { uint32_t *data = c->data;