Look for png images in ${srcdir}/filename as well, so that make distcheck can still find them.

Add romedalen.png to EXTRA_DIST so the tests can pass from the tar file.
Fix typo: cairo-win3 -> cairo-win32.
Add cairo-win32.xml to the list, so it gets generated as well.
Add pointer to new win32 documentation.

7 files changed, 41 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ef4919b3..9a08cbd5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2005-03-08  Carl Worth  <cworth@cworth.org>
 
+	* test/cairo_test.c (cairo_test_create_png_pattern): Look for png
+	images in ${srcdir}/filename as well, so that make distcheck can
+	still find them.
+
+	* test/Makefile.am (EXTRA_DIST): Add romedalen.png to EXTRA_DIST
+	so the tests can pass from the tar file.
+
+	* doc/public/cairo-sections.txt: Fix typo: cairo-win3 ->
+	cairo-win32.
+
+	* doc/public/cairo-docs.xml: Add cairo-win32.xml to the list, so
+	it gets generated as well.
+
+	* NEWS (http): Add pointer to new win32 documentation.
+
 	* configure.in: Increment CAIRO_VERSION to 0.4.0
 
 	* NEWS: Added notes for snapshot 0.4.0
diff --git a/NEWS b/NEWS
index 3dd37bb26..62a1b1829 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,10 @@ This is the first snapshot to include a functional win32 backend,
 	double
 	cairo_win32_font_get_scale_factor (cairo_font_t *font);
 
+And see also the documentation at:
+
+http://cairographics.org/manual/cairo-Microsoft-Windows-Backend.html
+
 Disabled backend: quartz
 ------------------------
 Unfortunately, the quartz backend code is currently out of date with
diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index a07791673..2a4cdae8a 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -19,6 +19,7 @@
     <xi:include href="xml/cairo-png.xml"/>
     <xi:include href="xml/cairo-ps.xml"/>
     <xi:include href="xml/cairo-quartz.xml"/>
+    <xi:include href="xml/cairo-win32.xml"/>
     <xi:include href="xml/cairo-xcb.xml"/>
     <xi:include href="xml/cairo-xlib.xml"/>
   </part>				  
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index 7368e59c1..3da0fa801 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -50,7 +50,7 @@ cairo_quartz_surface_create
 </SECTION>
 
 <SECTION>
-<FILE>cairo-win3</FILE>
+<FILE>cairo-win32</FILE>
 <TITLE>Microsoft Windows Backend</TITLE>
 cairo_set_target_win32
 cairo_win32_surface_create
diff --git a/test/Makefile.am b/test/Makefile.am
index 5c56a3013..994c2127f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -22,7 +22,8 @@ linear_gradient-ref.png		\
 move_to_show_surface-ref.png	\
 coverage-ref.png		\
 clip_twice-ref.png		\
-pixman_rotate-ref.png
+pixman_rotate-ref.png		\
+romedalen.png
 
 # Once we can draw the text_rotate.c test case correctly, we should
 # create and add text_rotate-ref.png to the list of reference PNGs.
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 30ca1dcb9..06f7672fd 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -222,8 +222,17 @@ cairo_test_create_png_pattern (cairo_t *cr, const char *filename)
     unsigned char *buffer;
     int w, h, stride;
     read_png_status_t status;
+    char *srcdir = getenv ("srcdir");
 
     status = read_png_argb32 (filename, &buffer, &w,&h, &stride);
+    if (status != READ_PNG_SUCCESS) {
+	if (srcdir) {
+	    char *srcdir_filename;
+	    xasprintf (&srcdir_filename, "%s/%s", srcdir, filename);
+	    status = read_png_argb32 (srcdir_filename, &buffer, &w,&h, &stride);
+	    free (srcdir_filename);
+	}
+    }
     if (status != READ_PNG_SUCCESS)
 	return NULL;
 
diff --git a/test/cairo_test.c b/test/cairo_test.c
index 30ca1dcb9..06f7672fd 100644
--- a/test/cairo_test.c
+++ b/test/cairo_test.c
@@ -222,8 +222,17 @@ cairo_test_create_png_pattern (cairo_t *cr, const char *filename)
     unsigned char *buffer;
     int w, h, stride;
     read_png_status_t status;
+    char *srcdir = getenv ("srcdir");
 
     status = read_png_argb32 (filename, &buffer, &w,&h, &stride);
+    if (status != READ_PNG_SUCCESS) {
+	if (srcdir) {
+	    char *srcdir_filename;
+	    xasprintf (&srcdir_filename, "%s/%s", srcdir, filename);
+	    status = read_png_argb32 (srcdir_filename, &buffer, &w,&h, &stride);
+	    free (srcdir_filename);
+	}
+    }
     if (status != READ_PNG_SUCCESS)
 	return NULL;