diff options
| author | bfriesen <bfriesen> | 2012-07-04 19:45:32 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2012-07-04 19:45:32 +0000 |
| commit | 392debac93e27e4aada814181f042cac75a66490 (patch) | |
| tree | 5582f70582427761ef6bcf766394908ece768d53 | |
| parent | 4da017dd3819f6052b05d9c670250ba00dec9b89 (diff) | |
| download | libtiff-392debac93e27e4aada814181f042cac75a66490.tar.gz | |
test/raw_decode.c: Add changes so that test can run with build directory outside of source directory.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/raw_decode.c | 24 |
2 files changed, 27 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2012-07-04 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + + * test/raw_decode.c: Add changes so that test can run with build + directory outside of source directory. + 2012-07-02 Frank Warmerdam <warmerdam@google.com> * libtiff/tif_jpeg.c: Fix handling when writing RGBA jpeg compressed diff --git a/test/raw_decode.c b/test/raw_decode.c index 1521c970..0fd52fc3 100644 --- a/test/raw_decode.c +++ b/test/raw_decode.c @@ -1,4 +1,4 @@ -/* $Id: raw_decode.c,v 1.2 2012-07-03 20:48:11 tgl Exp $ */ +/* $Id: raw_decode.c,v 1.3 2012-07-04 19:45:32 bfriesen Exp $ */ /* * Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com> @@ -103,7 +103,9 @@ int main(int argc, char **argv) { TIFF *tif; - static const char *srcfile = "images/quad-tile.jpg.tiff"; + static const char *srcfilerel = "images/quad-tile.jpg.tiff"; + char *srcdir = NULL; + char srcfile[1024]; unsigned short h, v; int status; unsigned char *buffer; @@ -113,6 +115,17 @@ main(int argc, char **argv) (void) argc; (void) argv; + if ((srcdir = getenv("srcdir")) == NULL) { + srcdir = "."; + } + if ((strlen(srcdir) + 1 + strlen(srcfilerel)) >= sizeof(srcfile)) { + fprintf( stderr, "srcdir too long %s\n", srcdir); + exit( 1 ); + } + strcpy(srcfile,srcdir); + strcat(srcfile,"/"); + strcat(srcfile,srcfilerel); + tif = TIFFOpen(srcfile,"r"); if ( tif == NULL ) { fprintf( stderr, "Could not open %s\n", srcfile); @@ -217,3 +230,10 @@ main(int argc, char **argv) } /* vim: set ts=8 sts=8 sw=8 noet: */ +/* + * Local Variables: + * mode: c + * c-basic-offset: 8 + * fill-column: 78 + * End: + */ |