On Fri, 2015-12-04 at 06:32 -0500, Frediano Ziglio wrote:
> >
> > This commit introduces a compile failure:
> >
> > included from ../../server/spice-bitmap-utils.c:21:0:
> > ../../server/spice-bitmap-utils.h:38:17: error: expected declaration
> > specifiers
> > or '...' before 'sizeof'
> > G_STATIC_ASSERT(sizeof(rgb32_pixel_t) == 4);
> >
>
> That's really weird. It works for me.
> Can you try with and without this patch?
see comment below
>
> Frediano
>
>
> >
> > On Thu, 2015-12-03 at 16:26 +0000, Frediano Ziglio wrote:
> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
> > > Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
> > > ---
> > > server/Makefile.am | 2 -
> > > server/display-channel.h | 2 +-
> > > server/spice-bitmap-utils.c | 162 ++++++++++++++++++++++++++++++++++++++
> > > server/spice-bitmap-utils.h | 15 ++--
> > > server/spice_bitmap_utils.c | 188
> > > -------------------------------------------
> > > -
> > > server/spice_bitmap_utils.h | 8 --
> > > 6 files changed, 171 insertions(+), 206 deletions(-)
> > > delete mode 100644 server/spice_bitmap_utils.c
> > > delete mode 100644 server/spice_bitmap_utils.h
> > >
> > > diff --git a/server/Makefile.am b/server/Makefile.am
> > > index 1e7e8fa..2bb4fec 100644
> > > --- a/server/Makefile.am
> > > +++ b/server/Makefile.am
> > > @@ -124,8 +124,6 @@ libspice_server_la_SOURCES = \
> > > spice_timer_queue.h \
> > > zlib-encoder.c \
> > > zlib-encoder.h \
> > > - spice_bitmap_utils.h \
> > > - spice_bitmap_utils.c \
> > > image-cache.h \
> > > image-cache.c \
> > > pixmap-cache.h \
> > > diff --git a/server/display-channel.h b/server/display-channel.h
> > > index 7cbc58d..8adff0a 100644
> > > --- a/server/display-channel.h
> > > +++ b/server/display-channel.h
> > > @@ -39,7 +39,7 @@
> > > #include "main-channel.h"
> > > #include "migration-protocol.h"
> > > #include "main-dispatcher.h"
> > > -#include "spice_bitmap_utils.h"
> > > +#include "spice-bitmap-utils.h"
> > > #include "image-cache.h"
> > > #include "utils.h"
> > > #include "tree.h"
> > > diff --git a/server/spice-bitmap-utils.c b/server/spice-bitmap-utils.c
> > > index 03d7694..8d6e7c6 100644
> > > --- a/server/spice-bitmap-utils.c
> > > +++ b/server/spice-bitmap-utils.c
> > > @@ -117,3 +117,165 @@ int bitmap_has_extra_stride(SpiceBitmap *bitmap)
> > > }
> > > return 0;
> > > }
> > > +
> > > +int spice_bitmap_from_surface_type(uint32_t surface_format)
> > > +{
> > > + switch (surface_format) {
> > > + case SPICE_SURFACE_FMT_16_555:
> > > + return SPICE_BITMAP_FMT_16BIT;
> > > + case SPICE_SURFACE_FMT_32_xRGB:
> > > + return SPICE_BITMAP_FMT_32BIT;
> > > + case SPICE_SURFACE_FMT_32_ARGB:
> > > + return SPICE_BITMAP_FMT_RGBA;
> > > + case SPICE_SURFACE_FMT_8_A:
> > > + return SPICE_BITMAP_FMT_8BIT_A;
> > > + default:
> > > + spice_critical("Unsupported surface format");
> > > + }
> > > + return 0;
> > > +}
> > > +
> > > +#define RAM_PATH "/tmp/tmpfs"
> > > +
> > > +static void 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);
> > > + }
> > > +}
> > > +
> > > +static void dump_line(FILE *f, uint8_t* line, uint16_t n_pixel_bits, int
> > > width, int row_size)
> > > +{
> > > + int i;
> > > + 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);
> > > + }
> > > + }
> > > +}
> > > +void dump_bitmap(SpiceBitmap *bitmap)
> > > +{
> > > + static uint32_t file_id = 0;
> > > +
> > > + char file_str[200];
> > > + int rgb = TRUE;
> > > + uint16_t n_pixel_bits;
> > > + SpicePalette *plt = NULL;
> > > + uint32_t id;
> > > + int row_size;
> > > + uint32_t file_size;
> > > + 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;
> > > +
> > > + switch (bitmap->format) {
> > > + case SPICE_BITMAP_FMT_1BIT_BE:
> > > + case SPICE_BITMAP_FMT_1BIT_LE:
> > > + rgb = FALSE;
> > > + n_pixel_bits = 1;
> > > + break;
> > > + case SPICE_BITMAP_FMT_4BIT_BE:
> > > + case SPICE_BITMAP_FMT_4BIT_LE:
> > > + rgb = FALSE;
> > > + n_pixel_bits = 4;
> > > + break;
> > > + case SPICE_BITMAP_FMT_8BIT:
> > > + rgb = FALSE;
> > > + n_pixel_bits = 8;
> > > + break;
> > > + case SPICE_BITMAP_FMT_16BIT:
> > > + n_pixel_bits = 16;
> > > + break;
> > > + case SPICE_BITMAP_FMT_24BIT:
> > > + n_pixel_bits = 24;
> > > + break;
> > > + case SPICE_BITMAP_FMT_32BIT:
> > > + n_pixel_bits = 32;
> > > + break;
> > > + case SPICE_BITMAP_FMT_RGBA:
> > > + n_pixel_bits = 32;
> > > + alpha = 1;
> > > + break;
> > > + default:
> > > + spice_error("invalid bitmap format %u", bitmap->format);
> > > + return;
> > > + }
> > > +
> > > + if (!rgb) {
> > > + if (!bitmap->palette) {
> > > + return; // dont dump masks.
> > > + }
> > > + plt = bitmap->palette;
> > > + }
> > > + row_size = (((bitmap->x * n_pixel_bits) + 31) / 32) * 4;
> > > + bitmap_data_offset = header_size;
> > > +
> > > + if (plt) {
> > > + bitmap_data_offset += plt->num_ents * 4;
> > > + }
> > > + file_size = bitmap_data_offset + (bitmap->y * row_size);
> > > +
> > > + id = ++file_id;
> > > + sprintf(file_str, "%s/%u.bmp", RAM_PATH, id);
> > > +
> > > + f = fopen(file_str, "wb");
> > > + if (!f) {
> > > + spice_error("Error creating bmp");
> > > + return;
> > > + }
> > > +
> > > + /* 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);
> > > +
> > > + if (plt) {
> > > + dump_palette(f, plt);
> > > + }
> > > + /* 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);
> > > + }
> > > + }
> > > + fclose(f);
> > > +}
> > > diff --git a/server/spice-bitmap-utils.h b/server/spice-bitmap-utils.h
> > > index 38cb88a..ffb6c74 100644
> > > --- a/server/spice-bitmap-utils.h
> > > +++ b/server/spice-bitmap-utils.h
> > > @@ -15,13 +15,10 @@
> > > You should have received a copy of the GNU Lesser General Public
> > > License along with this library; if not, see
> > > <http://www.gnu.org/licenses/
> > > > .
> > > */
> > > -#ifndef RED_BITMAP_UTILS_H_
> > > -# define RED_BITMAP_UTILS_H_
> > > +#ifndef SPICE_BITMAP_UTILS_H_
> > > +#define SPICE_BITMAP_UTILS_H_
> > >
> > > -#include <glib.h>
> > > -#include <stdint.h>
> > > -#include "common/draw.h"
> > > -#include "common/log.h"
> > > +#include "red-common.h"
I think this is the problem. This header cleanup should be moved to the next
patch (8/15 "misc header cleanups"). At the moment, red-common.h does not yet
include glib.h, so by removing glib.h here, we no longer have the definition for
G_STATIC_ASSERT. After applying the next patches, the compile error disappears.
> > >
> > > typedef enum {
> > > BITMAP_GRADUAL_INVALID,
> > > @@ -88,4 +85,8 @@ static inline int bitmap_fmt_has_graduality(uint8_t fmt)
> > > BitmapGradualType bitmap_get_graduality_level (SpiceBitmap *bitmap);
> > > int bitmap_has_extra_stride (SpiceBitmap *bitmap);
> > >
> > > -#endif /* RED_BITMAP_UTILS_H_ */
> > > +void dump_bitmap(SpiceBitmap *bitmap);
> > > +
> > > +int spice_bitmap_from_surface_type(uint32_t surface_format);
> > > +
> > > +#endif /* SPICE_BITMAP_UTILS_H_ */
> > > diff --git a/server/spice_bitmap_utils.c b/server/spice_bitmap_utils.c
> > > deleted file mode 100644
> > > index ae3fc8b..0000000
> > > --- a/server/spice_bitmap_utils.c
> > > +++ /dev/null
> > > @@ -1,188 +0,0 @@
> > > -/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> > > -/*
> > > - Copyright (C) 2009-2015 Red Hat, Inc.
> > > -
> > > - This library is free software; you can redistribute it and/or
> > > - modify it under the terms of the GNU Lesser General Public
> > > - License as published by the Free Software Foundation; either
> > > - version 2.1 of the License, or (at your option) any later version.
> > > -
> > > - This library is distributed in the hope that it will be useful,
> > > - but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> > > - Lesser General Public License for more details.
> > > -
> > > - You should have received a copy of the GNU Lesser General Public
> > > - License along with this library; if not, see
> > > <http://www.gnu.org/licenses/
> > > > .
> > > -*/
> > > -#ifdef HAVE_CONFIG_H
> > > -#include <config.h>
> > > -#endif
> > > -#include <stdio.h>
> > > -
> > > -#include "common/log.h"
> > > -#include "common/draw.h"
> > > -
> > > -#include "spice_bitmap_utils.h"
> > > -
> > > -int spice_bitmap_from_surface_type(uint32_t surface_format)
> > > -{
> > > - switch (surface_format) {
> > > - case SPICE_SURFACE_FMT_16_555:
> > > - return SPICE_BITMAP_FMT_16BIT;
> > > - case SPICE_SURFACE_FMT_32_xRGB:
> > > - return SPICE_BITMAP_FMT_32BIT;
> > > - case SPICE_SURFACE_FMT_32_ARGB:
> > > - return SPICE_BITMAP_FMT_RGBA;
> > > - case SPICE_SURFACE_FMT_8_A:
> > > - return SPICE_BITMAP_FMT_8BIT_A;
> > > - default:
> > > - spice_critical("Unsupported surface format");
> > > - }
> > > - return 0;
> > > -}
> > > -
> > > -#define RAM_PATH "/tmp/tmpfs"
> > > -
> > > -static void 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);
> > > - }
> > > -}
> > > -
> > > -static void dump_line(FILE *f, uint8_t* line, uint16_t n_pixel_bits, int
> > > width, int row_size)
> > > -{
> > > - int i;
> > > - 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);
> > > - }
> > > - }
> > > -}
> > > -void dump_bitmap(SpiceBitmap *bitmap)
> > > -{
> > > - static uint32_t file_id = 0;
> > > -
> > > - char file_str[200];
> > > - int rgb = TRUE;
> > > - uint16_t n_pixel_bits;
> > > - SpicePalette *plt = NULL;
> > > - uint32_t id;
> > > - int row_size;
> > > - uint32_t file_size;
> > > - 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;
> > > -
> > > - switch (bitmap->format) {
> > > - case SPICE_BITMAP_FMT_1BIT_BE:
> > > - case SPICE_BITMAP_FMT_1BIT_LE:
> > > - rgb = FALSE;
> > > - n_pixel_bits = 1;
> > > - break;
> > > - case SPICE_BITMAP_FMT_4BIT_BE:
> > > - case SPICE_BITMAP_FMT_4BIT_LE:
> > > - rgb = FALSE;
> > > - n_pixel_bits = 4;
> > > - break;
> > > - case SPICE_BITMAP_FMT_8BIT:
> > > - rgb = FALSE;
> > > - n_pixel_bits = 8;
> > > - break;
> > > - case SPICE_BITMAP_FMT_16BIT:
> > > - n_pixel_bits = 16;
> > > - break;
> > > - case SPICE_BITMAP_FMT_24BIT:
> > > - n_pixel_bits = 24;
> > > - break;
> > > - case SPICE_BITMAP_FMT_32BIT:
> > > - n_pixel_bits = 32;
> > > - break;
> > > - case SPICE_BITMAP_FMT_RGBA:
> > > - n_pixel_bits = 32;
> > > - alpha = 1;
> > > - break;
> > > - default:
> > > - spice_error("invalid bitmap format %u", bitmap->format);
> > > - return;
> > > - }
> > > -
> > > - if (!rgb) {
> > > - if (!bitmap->palette) {
> > > - return; // dont dump masks.
> > > - }
> > > - plt = bitmap->palette;
> > > - }
> > > - row_size = (((bitmap->x * n_pixel_bits) + 31) / 32) * 4;
> > > - bitmap_data_offset = header_size;
> > > -
> > > - if (plt) {
> > > - bitmap_data_offset += plt->num_ents * 4;
> > > - }
> > > - file_size = bitmap_data_offset + (bitmap->y * row_size);
> > > -
> > > - id = ++file_id;
> > > - sprintf(file_str, "%s/%u.bmp", RAM_PATH, id);
> > > -
> > > - f = fopen(file_str, "wb");
> > > - if (!f) {
> > > - spice_error("Error creating bmp");
> > > - return;
> > > - }
> > > -
> > > - /* 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);
> > > -
> > > - if (plt) {
> > > - dump_palette(f, plt);
> > > - }
> > > - /* 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);
> > > - }
> > > - }
> > > - fclose(f);
> > > -}
> > > diff --git a/server/spice_bitmap_utils.h b/server/spice_bitmap_utils.h
> > > deleted file mode 100644
> > > index 69860e5..0000000
> > > --- a/server/spice_bitmap_utils.h
> > > +++ /dev/null
> > > @@ -1,8 +0,0 @@
> > > -#ifndef H_SPICE_BITMAP_UTILS
> > > -#define H_SPICE_BITMAP_UTILS
> > > -
> > > -void dump_bitmap(SpiceBitmap *bitmap);
> > > -
> > > -int spice_bitmap_from_surface_type(uint32_t surface_format);
> > > -
> > > -#endif
> >
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel