[Plplot-cvs] plplot/examples/java x20.java,1.5,1.6

[Andrew R. <and...@us...>]

Update of /cvsroot/plplot/plplot/examples/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4354/examples/java

Modified Files:
	x20.java 
Log Message:

Original change to get example 20 to work as part of ctest was flawed. 
Instead, make a copy of lena.pgm in the top level build tree and also 
install it in the examples directory. Examples now look in the current 
directory and the one above for the image. This was it will work in the
build tree and in the installed tree (either by running directly or 
running the plplot-test.sh script). This also gets round the symlink 
problems and avoids having multiple copies of the image installed.



Index: x20.java
===================================================================
RCS file: /cvsroot/plplot/plplot/examples/java/x20.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- x20.java	20 Jul 2006 09:59:48 -0000	1.5
+++ x20.java	1 Dec 2006 14:48:00 -0000	1.6
@@ -182,7 +182,8 @@
 
 
 	/* read Lena image */
-	if ((img_f = read_img("lena.pgm", n)) == null) {
+	if ((img_f = read_img("lena.pgm", n)) == null && 
+	    (img_f = read_img("../lena.pgm", n)) == null ) {
 	    System.out.println("File error - aborting"); 
 	    pls.end();
 	    System.exit(1);