[Spice-commits] 3 commits - client/Makefile.am client/x11

[Hans de Goede]

 client/Makefile.am           |    8 ++++----
 client/x11/red_drawable.cpp  |    2 +-
 client/x11/red_pixmap_gl.cpp |    6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit bb9b8a3c1330411288ae32b0419b816434e487fa
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Apr 7 18:05:42 2011 +0200

    gl: remove unused variables
    
    gcc 4.6 warned about these.

diff --git a/client/x11/red_pixmap_gl.cpp b/client/x11/red_pixmap_gl.cpp
index 7c85966..0e7b8c1 100644
--- a/client/x11/red_pixmap_gl.cpp
+++ b/client/x11/red_pixmap_gl.cpp
@@ -175,10 +175,7 @@ void RedPixmapGL::update_texture(const SpiceRect *bbox)
 {
     RenderType rendertype;
     GLuint tex;
-    int width_powed;
-    int height_powed;
     int height;
-    int width;
 
     rendertype = ((PixelsSource_p*)get_opaque())->gl.rendertype;
 
@@ -189,9 +186,6 @@ void RedPixmapGL::update_texture(const SpiceRect *bbox)
         int is_enabled;
         GLint prev_tex;
 
-        width_powed = ((PixelsSource_p*)get_opaque())->gl.width_powed;
-        height_powed = ((PixelsSource_p*)get_opaque())->gl.height_powed;
-        width = ((PixelsSource_p*)get_opaque())->gl.width;
         height = ((PixelsSource_p*)get_opaque())->gl.height;
 
         tex = ((PixelsSource_p*)get_opaque())->gl.tex;
commit ace31d1c8a5ea88a8eb55568208d6e297e089a81
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Apr 7 18:05:41 2011 +0200

    gl: use correct pixman accessor for image data
    
    Commit 774e5bd36f4 changed
    -  dest->source.pixmap.x_image->data +
    +  (uint8_t *)pixman_image_get_stride(dest->source.pixmap.pixman_image) +
    
    The correct accessor to use is pixman_image_get_data. Thanks to gcc
    4.6 for warning about a "different size" int to pointer conversion.

diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp
index e7151ed..19dcd92 100644
--- a/client/x11/red_drawable.cpp
+++ b/client/x11/red_drawable.cpp
@@ -353,7 +353,7 @@ static inline void copy_to_pixmap_from_gltexture(const RedDrawable_p* dest,
     while (height > 0) {
         glReadPixels(src_x, y - height, area.right - area.left, 1,
                      GL_BGRA, GL_UNSIGNED_BYTE,
-                     (uint8_t *)pixman_image_get_stride(dest->source.pixmap.pixman_image) +
+                     (uint8_t *)pixman_image_get_data(dest->source.pixmap.pixman_image) +
                      (area.left + offset.x) * 4 +
                      (area.top + offset.y + height - 1) *
                      pixman_image_get_stride(dest->source.pixmap.pixman_image));
commit 0fcba8ba40979bf799ab9faabdb44b6f21a7302f
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Apr 7 18:05:40 2011 +0200

    client: use silent generation rules in Makefile.am
    
    The server Makefile.am rules for marshallers generation are
    prefixed with AM_V_SILENT to integrate nicely with automake silent
    rules. The same AM_V_SILENT prefix isn't used in client/Makefile.am
    resulting in verbose output even when automake silent mode is
    enabled. This commit removes this verbosity.

diff --git a/client/Makefile.am b/client/Makefile.am
index da859f4..a5effed 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,16 +6,16 @@ DIST_SUBDIRS = x11 windows gui
 spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp generated_demarshallers1.cpp generated_marshallers1.cpp
 
 generated_demarshallers.cpp: $(top_srcdir)/spice.proto
-	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h $(top_srcdir)/spice.proto generated_demarshallers.cpp
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h $(top_srcdir)/spice.proto generated_demarshallers.cpp
 
 generated_demarshallers1.cpp: $(top_srcdir)/spice1.proto
-	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h --prefix 1 --ptrsize 8 $(top_srcdir)/spice1.proto generated_demarshallers1.cpp
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h --prefix 1 --ptrsize 8 $(top_srcdir)/spice1.proto generated_demarshallers1.cpp
 
 generated_marshallers.cpp: $(top_srcdir)/spice.proto
-	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P  --include "common.h" --include messages.h --include marshallers.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P  --include "common.h" --include messages.h --include marshallers.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp
 
 generated_marshallers1.cpp: $(top_srcdir)/spice1.proto
-	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P  --include "common.h" --include messages.h --include marshallers.h --client --prefix 1 --ptrsize 8 $(top_srcdir)/spice1.proto generated_marshallers1.cpp
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P  --include "common.h" --include messages.h --include marshallers.h --client --prefix 1 --ptrsize 8 $(top_srcdir)/spice1.proto generated_marshallers1.cpp
 
 if SUPPORT_GL
 GL_SRCS =				\