[Xcb-commit] 3 commits - image

[Bart Massey]

 image/Makefile.am          |    3 +--
 image/test_bitmap.c        |    2 +-
 image/test_formats.c       |   10 +++++-----
 image/test_xcb_image.c     |    2 +-
 image/test_xcb_image_shm.c |    2 +-
 image/xcb_image.c          |    5 +++--
 image/xcb_pixel.h          |    2 ++
 7 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 1f43c4572fc2f2e35f3d705219eae2afe065aeb5
Author: Bart Massey <bart at cs.pdx.edu>
Date:   Sun Jan 27 11:57:36 2008 -0800

    made image tests compile when not installed; fixed regression in test_formats.c

diff --git a/image/test_bitmap.c b/image/test_bitmap.c
index fe1b3bb..c9d5b49 100644
--- a/image/test_bitmap.c
+++ b/image/test_bitmap.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <assert.h>
 #include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
+#include "../aux/xcb_aux.h"
 #include "xcb_image.h"
 
 #include "test.xbm"
diff --git a/image/test_formats.c b/image/test_formats.c
index 276f442..d64e55b 100644
--- a/image/test_formats.c
+++ b/image/test_formats.c
@@ -1,10 +1,10 @@
-#include <xcb/xcb.h>
-#include "xcb_image.h"
-#include "xcb_aux.h"
-#include "xcb_bitops.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <xcb/xcb.h>
+#include "../aux/xcb_aux.h"
+#include "../aux/xcb_bitops.h"
+#include "xcb_image.h"
 
 #define WIDTH 50
 #define HEIGHT 50
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 	if(argc > 1)
 		format = parse_format(argv[1]);
 	if (root->root_depth != 24 ||
-	    visual->visual_class != XCB_VISUAL_CLASS_TRUE_COLOR)
+	    visual->_class != XCB_VISUAL_CLASS_TRUE_COLOR)
 	{
 		printf("Only 24 bit TrueColor visuals for now\n");
 		exit(1);
diff --git a/image/test_xcb_image.c b/image/test_xcb_image.c
index 56904cf..ddb708e 100644
--- a/image/test_xcb_image.c
+++ b/image/test_xcb_image.c
@@ -5,7 +5,7 @@
 
 #include <xcb/xcb.h>
 
-#include "xcb_aux.h"
+#include "../aux/xcb_aux.h"
 #include "xcb_image.h"
 
 #define W_W 64
diff --git a/image/test_xcb_image_shm.c b/image/test_xcb_image_shm.c
index 7e0bc59..c879dbe 100644
--- a/image/test_xcb_image_shm.c
+++ b/image/test_xcb_image_shm.c
@@ -7,7 +7,7 @@
 #include <xcb/xcb.h>
 #include <xcb/shm.h>
 
-#include "xcb_aux.h"
+#include "../aux/xcb_aux.h"
 #include "xcb_image.h"
 
 #define W_W 40
commit 49fe359978c99e56865bf525636e7bc45e19301e
Author: Bart Massey <bart at cs.pdx.edu>
Date:   Sun Jan 27 11:49:46 2008 -0800

    stopped image test programs from being built by default

diff --git a/image/Makefile.am b/image/Makefile.am
index 1774417..a039c2b 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -16,7 +16,7 @@ pkgconfig_DATA = xcb-image.pc
 
 EXTRA_DIST=xcb-image.pc.in
 
-noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_bitmap
+EXTRA_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_bitmap
 
 test_xcb_image_SOURCES = test_xcb_image.c
 test_xcb_image_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
commit cc37cfa202bae8df786e547b93966d830bec53b8
Author: Bart Massey <bart at cs.pdx.edu>
Date:   Sun Jan 27 11:41:01 2008 -0800

    sorted out dependencies for building while uninstalled---includes horrible kludges

diff --git a/image/Makefile.am b/image/Makefile.am
index 9a88187..1774417 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -1,4 +1,3 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 lib_LTLIBRARIES = libxcb-image.la
diff --git a/image/xcb_image.c b/image/xcb_image.c
index 4c646bc..17ea59c 100644
--- a/image/xcb_image.c
+++ b/image/xcb_image.c
@@ -29,9 +29,10 @@
 
 #include <xcb/xcb.h>
 #include <xcb/shm.h>
-#include <xcb/xcb_aux.h>
-#include "xcb_bitops.h"
+#include "../aux/xcb_aux.h"
+#include "../aux/xcb_bitops.h"
 #include "xcb_image.h"
+#define BUILD
 #include "xcb_pixel.h"
 
 
diff --git a/image/xcb_pixel.h b/image/xcb_pixel.h
index d7d5382..fcb22b4 100644
--- a/image/xcb_pixel.h
+++ b/image/xcb_pixel.h
@@ -28,8 +28,10 @@
 
 #include <inttypes.h>
 #include <X11/Xfuncproto.h>
+#ifndef BUILD
 #include <xcb/xcb_bitops.h>
 #include <xcb/xcb_image.h>
+#endif
 
 /**
  * XCB Image fast pixel ops.