[Spice-commits] 3 commits - server/spice-bitmap-utils.c
Frediano Ziglio
fziglio at kemper.freedesktop.org
Fri Jan 15 04:31:45 PST 2016
server/spice-bitmap-utils.c | 116 ++++++++++++++++++++++++++------------------
1 file changed, 70 insertions(+), 46 deletions(-)
New commits:
commit f103f667bfc595e682e3d5378aadc214803dda47
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Thu Jan 14 17:29:06 2016 +0000
utils: handle errors writing to bitmap file
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/server/spice-bitmap-utils.c b/server/spice-bitmap-utils.c
index ca80a86..8350e7f 100644
--- a/server/spice-bitmap-utils.c
+++ b/server/spice-bitmap-utils.c
@@ -153,23 +153,36 @@ static void put_32le(uint8_t **ptr, uint32_t val)
put_16le(ptr, val & 0xffffu);
}
-static void dump_palette(FILE *f, SpicePalette* plt)
+#define WRITE(buf, size, f) do { \
+ if (fwrite(buf, 1, (size), f) != (size)) \
+ goto write_err; \
+} while(0)
+
+static bool dump_palette(FILE *f, SpicePalette* plt)
{
int i;
for (i = 0; i < plt->num_ents; i++) {
- fwrite(plt->ents + i, sizeof(uint32_t), 1, f);
+ WRITE(plt->ents + i, sizeof(uint32_t), f);
}
+ return true;
+
+write_err:
+ return false;
}
-static void dump_line(FILE *f, uint8_t* line, uint16_t n_pixel_bits, int width, int row_size)
+static bool dump_line(FILE *f, uint8_t* line, uint16_t n_pixel_bits, int width, int row_size)
{
static char zeroes[4] = { 0 };
int copy_bytes_size = SPICE_ALIGN(n_pixel_bits * width, 8) / 8;
- fwrite(line, 1, copy_bytes_size, f);
+ WRITE(line, copy_bytes_size, f);
// each line should be 4 bytes aligned
- g_return_if_fail(row_size - copy_bytes_size >= 0 && row_size - copy_bytes_size <= 4);
- fwrite(zeroes, 1, row_size - copy_bytes_size, f);
+ g_return_val_if_fail(row_size - copy_bytes_size >= 0 && row_size - copy_bytes_size <= 4, false);
+ WRITE(zeroes, row_size - copy_bytes_size, f);
+ return true;
+
+write_err:
+ return false;
}
void dump_bitmap(SpiceBitmap *bitmap)
@@ -268,18 +281,25 @@ void dump_bitmap(SpiceBitmap *bitmap)
put_32le(&ptr, !plt ? 0 : plt->num_ents); // plt entries
put_32le(&ptr, 0);
- fwrite(header, 1, ptr - header, f);
+ WRITE(header, ptr - header, f);
if (plt) {
- dump_palette(f, plt);
+ if (!dump_palette(f, plt))
+ goto write_err;
}
/* writing the data */
for (i = 0; i < bitmap->data->num_chunks; i++) {
SpiceChunk *chunk = &bitmap->data->chunk[i];
int num_lines = chunk->len / bitmap->stride;
for (j = 0; j < num_lines; j++) {
- dump_line(f, chunk->data + (j * bitmap->stride), n_pixel_bits, bitmap->x, row_size);
+ if (!dump_line(f, chunk->data + (j * bitmap->stride), n_pixel_bits, bitmap->x, row_size))
+ goto write_err;
}
}
fclose(f);
+ return;
+
+write_err:
+ fclose(f);
+ remove(file_str);
}
commit 42ce16b7f48081770f430c0ff91c2ede1ffa8f67
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Thu Jan 14 17:28:45 2016 +0000
utils: fix endianess issues writing bitmap file
Do not print directly binary data but serialize in a portable way
and then use write functions.
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/server/spice-bitmap-utils.c b/server/spice-bitmap-utils.c
index f72af65..ca80a86 100644
--- a/server/spice-bitmap-utils.c
+++ b/server/spice-bitmap-utils.c
@@ -137,6 +137,22 @@ int spice_bitmap_from_surface_type(uint32_t surface_format)
#define RAM_PATH "/tmp/tmpfs"
+static void put_16le(uint8_t **ptr, uint16_t val)
+{
+ **ptr = val & 0xffu;
+ (*ptr)++;
+ val >>= 8;
+ **ptr = val & 0xffu;
+ (*ptr)++;
+}
+
+static void put_32le(uint8_t **ptr, uint32_t val)
+{
+ put_16le(ptr, val & 0xffffu);
+ val >>= 16;
+ put_16le(ptr, val & 0xffffu);
+}
+
static void dump_palette(FILE *f, SpicePalette* plt)
{
int i;
@@ -170,11 +186,9 @@ void dump_bitmap(SpiceBitmap *bitmap)
int alpha = 0;
uint32_t header_size = 14 + 40;
uint32_t bitmap_data_offset;
- uint32_t tmp_u32;
- int32_t tmp_32;
- uint16_t tmp_u16;
FILE *f;
int i, j;
+ uint8_t header[128], *ptr;
switch (bitmap->format) {
case SPICE_BITMAP_FMT_1BIT_BE:
@@ -233,36 +247,28 @@ void dump_bitmap(SpiceBitmap *bitmap)
}
/* writing the bmp v3 header */
- fprintf(f, "BM");
- fwrite(&file_size, sizeof(file_size), 1, f);
- tmp_u16 = alpha ? 1 : 0;
- fwrite(&tmp_u16, sizeof(tmp_u16), 1, f); // reserved for application
- tmp_u16 = 0;
- fwrite(&tmp_u16, sizeof(tmp_u16), 1, f);
- fwrite(&bitmap_data_offset, sizeof(bitmap_data_offset), 1, f);
- tmp_u32 = header_size - 14;
- fwrite(&tmp_u32, sizeof(tmp_u32), 1, f); // sub header size
- tmp_32 = bitmap->x;
- fwrite(&tmp_32, sizeof(tmp_32), 1, f);
- tmp_32 = bitmap->y;
- fwrite(&tmp_32, sizeof(tmp_32), 1, f);
-
- tmp_u16 = 1;
- fwrite(&tmp_u16, sizeof(tmp_u16), 1, f); // color plane
- fwrite(&n_pixel_bits, sizeof(n_pixel_bits), 1, f); // pixel depth
-
- tmp_u32 = 0;
- fwrite(&tmp_u32, sizeof(tmp_u32), 1, f); // compression method
-
- tmp_u32 = 0; //file_size - bitmap_data_offset;
- fwrite(&tmp_u32, sizeof(tmp_u32), 1, f); // image size
- tmp_32 = 0;
- fwrite(&tmp_32, sizeof(tmp_32), 1, f);
- fwrite(&tmp_32, sizeof(tmp_32), 1, f);
- tmp_u32 = (!plt) ? 0 : plt->num_ents; // plt entries
- fwrite(&tmp_u32, sizeof(tmp_u32), 1, f);
- tmp_u32 = 0;
- fwrite(&tmp_u32, sizeof(tmp_u32), 1, f);
+ ptr = header;
+ put_16le(&ptr, 0x4D42); // "BM"
+ put_32le(&ptr, file_size);
+ put_16le(&ptr, alpha);
+ put_16le(&ptr, 0);
+ put_32le(&ptr, bitmap_data_offset);
+ put_32le(&ptr, header_size - 14);
+ put_32le(&ptr, bitmap->x);
+ put_32le(&ptr, bitmap->y);
+
+ put_16le(&ptr, 1); // plane
+ put_16le(&ptr, n_pixel_bits);
+
+ put_32le(&ptr, 0); // compression
+
+ put_32le(&ptr, 0); //file_size - bitmap_data_offset;
+ put_32le(&ptr, 0);
+ put_32le(&ptr, 0);
+ put_32le(&ptr, !plt ? 0 : plt->num_ents); // plt entries
+ put_32le(&ptr, 0);
+
+ fwrite(header, 1, ptr - header, f);
if (plt) {
dump_palette(f, plt);
commit cb5184af58cc28b1620d03b64537841882870938
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Thu Jan 14 12:20:09 2016 +0000
utils: use always fwrite to write bitmap
Make easier to check error on next patch
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/server/spice-bitmap-utils.c b/server/spice-bitmap-utils.c
index 8d6e7c6..f72af65 100644
--- a/server/spice-bitmap-utils.c
+++ b/server/spice-bitmap-utils.c
@@ -147,17 +147,15 @@ static void dump_palette(FILE *f, SpicePalette* plt)
static void dump_line(FILE *f, uint8_t* line, uint16_t n_pixel_bits, int width, int row_size)
{
- int i;
+ static char zeroes[4] = { 0 };
int copy_bytes_size = SPICE_ALIGN(n_pixel_bits * width, 8) / 8;
fwrite(line, 1, copy_bytes_size, f);
- if (row_size > copy_bytes_size) {
- // each line should be 4 bytes aligned
- for (i = copy_bytes_size; i < row_size; i++) {
- fprintf(f, "%c", 0);
- }
- }
+ // each line should be 4 bytes aligned
+ g_return_if_fail(row_size - copy_bytes_size >= 0 && row_size - copy_bytes_size <= 4);
+ fwrite(zeroes, 1, row_size - copy_bytes_size, f);
}
+
void dump_bitmap(SpiceBitmap *bitmap)
{
static uint32_t file_id = 0;
More information about the Spice-commits
mailing list