pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-07 14:21:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jpeg-encoder: Remove JPEG_IMAGE_TYPE_RGB24

Browse Source 
Never used.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2018-06-05 00:25:47 +01:00
parent a8e88a991e
commit 355c510849
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/jpeg-encoder.c
View File

@ -161,11 +161,6 @@ static void convert_BGRX32_to_RGB24(void *line, int width, uint8_t **out_line)
}
}
static void convert_RGB24_to_RGB24(void *line, int width, uint8_t **out_line)
{
*out_line = line;
}
#define FILL_LINES() { \
if (lines == lines_end) { \
@ -186,9 +181,7 @@ static void do_jpeg_encode(JpegEncoder *jpeg, uint8_t *lines, unsigned int num_l
width = jpeg->cur_image.width;
stride = jpeg->cur_image.stride;
if (jpeg->cur_image.type != JPEG_IMAGE_TYPE_RGB24) {
RGB24_line = g_new(uint8_t, width*3);
}
RGB24_line = g_new(uint8_t, width*3);
lines_end = lines + (stride * num_lines);
@ -199,9 +192,7 @@ static void do_jpeg_encode(JpegEncoder *jpeg, uint8_t *lines, unsigned int num_l
jpeg_write_scanlines(&jpeg->cinfo, row_pointer, 1);
}
if (jpeg->cur_image.type != JPEG_IMAGE_TYPE_RGB24) {
g_free(RGB24_line);
}
g_free(RGB24_line);
}
int jpeg_encode(JpegEncoderContext *enc, int quality, JpegEncoderImageType type,
@ -218,9 +209,6 @@ int jpeg_encode(JpegEncoderContext *enc, int quality, JpegEncoderImageType type,
case JPEG_IMAGE_TYPE_RGB16:
enc->cur_image.convert_line_to_RGB24 = convert_RGB16_to_RGB24;
break;
case JPEG_IMAGE_TYPE_RGB24:
enc->cur_image.convert_line_to_RGB24 = convert_RGB24_to_RGB24;
break;
case JPEG_IMAGE_TYPE_BGR24:
enc->cur_image.convert_line_to_RGB24 = convert_BGR24_to_RGB24;
break;

1
server/jpeg-encoder.h
View File

@ -38,7 +38,6 @@ typedef enum {
JPEG_IMAGE_TYPE_RGB16,
/* in byte per color types, the notation is according to the order of the
colors in the memory */
JPEG_IMAGE_TYPE_RGB24,
JPEG_IMAGE_TYPE_BGR24,
JPEG_IMAGE_TYPE_BGRX32,
} JpegEncoderImageType;