diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/.hgignore work/libLAS-1.2.1/.hgignore --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/.hgignore 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/.hgignore 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,53 @@ +syntax: glob +*.la +*.lo +*.o +*.obj +.deps +.libs +*.exe +*.exp +*.lib +*.res +*.dll +*.bz2 +*.gz +*.bz2.md5 +*.gz.md5 +aclocal.m4 +apps/las2las +apps/las2txt +apps/lasinfo +apps/lasmerge +apps/liblas-config +apps/ts2las +apps/txt2las +apps/las2oci +apps/las2ogr +apps/lasindex +autom4te.cache +config.guess +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +liblas_test +ltmain.sh +missing +Makefile +Makefile.in +build.hobu +test/data/*.dat +test/data/*.idx +python/build/* +python/dist/* +python/libLAS.egg-info/* +*.pyc +src/CMakeFiles +CMakeFiles +CMakeCache.txt +cmake_install.cmake +src/liblas.a \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/.hgtags work/libLAS-1.2.1/.hgtags --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/.hgtags 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/.hgtags 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1 @@ +0cb8499784632233a01b9d96e2132bb0a599a208 1.2.1 diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/CMakeLists.txt work/libLAS-1.2.1/apps/CMakeLists.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/CMakeLists.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,33 @@ +# $Id$ +# +# Build libLAS utility programs +# +INCLUDE_DIRECTORIES( + . + ../include + ../include/liblas/capi +) + +SET( LASINFO lasinfo ) +SET( LAS2LAS las2las ) +SET( LAS2TXT las2txt ) +SET( TXT2LAS txt2las ) +SET( LASMERGE lasmerge ) + +SET( LASINFO_SRC lascommon.c ${LASINFO}.c ) +SET( LAS2LAS_SRC lascommon.c ${LAS2LAS}.c ) +SET( LAS2TXT_SRC lascommon.c ${LAS2TXT}.c) +SET( TXT2LAS_SRC lascommon.c ${TXT2LAS}.c ) +SET( LASMERGE_SRC lascommon.c ${LASMERGE}.c ) + +ADD_EXECUTABLE( ${LASINFO} ${LASINFO_SRC} ) +ADD_EXECUTABLE( ${LAS2LAS} ${LAS2LAS_SRC} ) +ADD_EXECUTABLE( ${LAS2TXT} ${LAS2TXT_SRC} ) +ADD_EXECUTABLE( ${TXT2LAS} ${TXT2LAS_SRC} ) +ADD_EXECUTABLE( ${LASMERGE} ${LASMERGE_SRC} ) + +TARGET_LINK_LIBRARIES( ${LASINFO} ${LIBLAS_C_LIB_NAME} ) +TARGET_LINK_LIBRARIES( ${LAS2LAS} ${LIBLAS_C_LIB_NAME} ) +TARGET_LINK_LIBRARIES( ${LAS2TXT} ${LIBLAS_C_LIB_NAME} ) +TARGET_LINK_LIBRARIES( ${TXT2LAS} ${LIBLAS_C_LIB_NAME} ) +TARGET_LINK_LIBRARIES( ${LASMERGE} ${LIBLAS_C_LIB_NAME} ) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/las2las.c work/libLAS-1.2.1/apps/las2las.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/las2las.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/las2las.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,802 @@ +/*************************************************************************** + * $Id$ + * $Date$ + * + * Project: libLAS -- C/C++ read/write library for LAS LIDAR data + * Purpose: LAS translation with optional configuration + * Author: Martin Isenburg isenburg@cs.unc.edu + *************************************************************************** + * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu + * + * See LICENSE.txt in this source distribution for more information. + **************************************************************************/ + +#include +#include +#include +#include +#include + +#include "liblas.h" + +LASPointSummary* SummarizePoints(LASReaderH reader); +void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header); +void print_point(FILE *file, LASPointH point); +void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR); +void repair_header(FILE *file, LASHeaderH header, LASPointSummary* summary) ; + +#define LAS_FORMAT_10 0 +#define LAS_FORMAT_11 1 +#define LAS_FORMAT_12 2 + +void usage() +{ + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," las2las (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Clip las file to a bounding box, throwing out points that have invalid data:\n"); + fprintf(stderr," las2las -i in.las -clip 63000000 483450000 63050000 483500000 -o out.las --skip_invalid\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Read from stdin, eliminate intensities below 2000, and write to stdout:\n"); + fprintf(stderr," las2las --eliminate_intensity_below 2000 --stdin --stdout < in.las > out.las \n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate return number two:\n"); + fprintf(stderr," las2las -i in.las -eliminate_return 2 -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate scan angles above 15:\n"); + fprintf(stderr," las2las -i in.las -eliminate_scan_angle_above 15 -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate intensities below 1000:\n"); + fprintf(stderr," las2las -i in.las -eliminate_intensity_below 1000 --stdout > out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate intensities below 1000 and classifications that equal 2 (ground):\n"); + fprintf(stderr," las2las -i in.las --eliminate_class 2 --out out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Capture only first returns and clip to bounding box:\n"); + fprintf(stderr," las2las -i in.las -first_only -clip 63000000 483450000 63050000 483500000 -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Capture only last returns, eliminate intensities below 2000, and write to stdout:\n"); + fprintf(stderr," las2las --input in.las --last_only --eliminate_intensity_below 2000 --stdout > out.las\n"); + fprintf(stderr,"\n"); + + + fprintf(stderr, "\nFor more information, see the full documentation for las2las at:\n" + " http://liblas.org/browser/trunk/doc/las2las.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + +} + +void ptime(const char *const msg) +{ + float t= ((float)clock())/CLOCKS_PER_SEC; + fprintf(stderr, "cumulative CPU time thru %s = %f\n", msg, t); +} + +int main(int argc, char *argv[]) +{ + int i; + int verbose = FALSE; + int use_stdin = FALSE; + int use_stdout = FALSE; + char* file_name_in = 0; + char* file_name_out = 0; + double *clip_xy_min = NULL; + double *clip_xy_max = NULL; + int clip = FALSE; + int remove_extra_header = FALSE; + int elim_return = 0; + int elim_scan_angle_above = 0; + int elim_intensity_below = 0; + int elim_class = 0; + int clsidx = 0; + int first_only = FALSE; + int last_only = FALSE; + int skip_invalid = FALSE; + int format = LAS_FORMAT_12; + + LASReaderH reader = NULL; + LASHeaderH header = NULL; + LASHeaderH surviving_header = NULL; + LASPointH p = NULL; + LASWriterH writer = NULL; + + int first_surviving_point = TRUE; + unsigned int surviving_number_of_point_records = 0; + unsigned int surviving_number_of_points_by_return[] = {0,0,0,0,0,0,0,0}; + LASPointH surviving_point_min = NULL; + LASPointH surviving_point_max = NULL; + double surviving_gps_time_min; + double surviving_gps_time_max; + + int clipped = 0; + int eliminated_return = 0; + int eliminated_scan_angle = 0; + int eliminated_intensity = 0; + int eliminated_class = 0; + int eliminated_first_only = 0; + int eliminated_last_only = 0; + + double minx, maxx, miny, maxy, minz, maxz; + + LASPointSummary* summary = NULL; + + for (i = 1; i < argc; i++) { + if ( strcmp(argv[i],"-h") == 0 || + strcmp(argv[i],"--help") == 0 + ) + { + usage(); + exit(0); + } + else if ( strcmp(argv[i],"-v") == 0 || + strcmp(argv[i],"--verbose") == 0 + ) + { + verbose = TRUE; + } + else if ( strcmp(argv[i],"-s") == 0 || + strcmp(argv[i],"--skip_invalid") == 0 + ) + { + skip_invalid = TRUE; + } + else if ( strcmp(argv[i],"--input") == 0 || + strcmp(argv[i],"-input") == 0 || + strcmp(argv[i],"-i") == 0 || + strcmp(argv[i],"-in") == 0 + ) + { + i++; + file_name_in = argv[i]; + } + else if ( strcmp(argv[i],"--output") == 0 || + strcmp(argv[i],"--out") == 0 || + strcmp(argv[i],"-out") == 0 || + strcmp(argv[i],"-o") == 0 + ) + { + i++; + file_name_out = argv[i]; + } + + else if ( strcmp(argv[i],"--stdout") == 0 || + strcmp(argv[i],"-olas") == 0 + ) + { + use_stdout = TRUE; + file_name_out = "stdout"; + } + else if ( strcmp(argv[i],"--clip") == 0 || + strcmp(argv[i],"-clip") == 0 || + strcmp(argv[i],"-clip_xy") == 0 + ) + { + clip_xy_min = (double*) malloc (2 * sizeof(double)); + clip_xy_max = (double*) malloc( 2 * sizeof(double)); + i++; + clip_xy_min[0] = atof(argv[i]); + i++; + clip_xy_min[1] = atof(argv[i]); + i++; + clip_xy_max[0] = atof(argv[i]); + i++; + clip_xy_max[1] = atof(argv[i]); + clip = TRUE; + } + else if ( strcmp(argv[i],"--format") == 0 || + strcmp(argv[i],"-f") == 0 || + strcmp(argv[i],"-format") == 0 + ) + { + i++; + if (strcmp(argv[i], "1.0") == 0) { + format = LAS_FORMAT_10; + } + else if (strcmp(argv[i], "1.1") == 0) { + format = LAS_FORMAT_11; + } + else if (strcmp(argv[i], "1.2") == 0) { + format = LAS_FORMAT_12; + } + else { + LASError_Print("Format must be specified as 1.0, 1.1, or 1.2"); + } + + } + + else if ( strcmp(argv[i],"--eliminate_return") == 0 || + strcmp(argv[i],"-eliminate_return") == 0 || + strcmp(argv[i],"-elim_return") == 0 || + strcmp(argv[i],"-elim_ret") == 0 + ) + { + i++; + elim_return |= (1 << atoi(argv[i])); + } + else if ( strcmp(argv[i],"--eliminate_scan_angle_above") == 0 || + strcmp(argv[i],"-eliminate_scan_angle_above") == 0 || + strcmp(argv[i],"-elim_scan_angle_above") == 0 || + strcmp(argv[i],"--clip_scan_above") == 0 + ) + { + i++; + elim_scan_angle_above = atoi(argv[i]); + } + else if ( strcmp(argv[i],"--eliminate_class") == 0 || + strcmp(argv[i],"-eliminate_class") == 0 || + strcmp(argv[i],"-elim_class") == 0 || + strcmp(argv[i],"--class") == 0 + ) + { + i++; + elim_class = atoi(argv[i]); + } + else if ( strcmp(argv[i],"--eliminate_intensity_below") == 0 || + strcmp(argv[i],"-eliminate_intensity_below") == 0 || + strcmp(argv[i],"-elim_intensity_below") == 0 || + strcmp(argv[i],"--clip_intensity_below") == 0 + ) + { + i++; + elim_intensity_below = atoi(argv[i]); + } + else if ( strcmp(argv[i], "--stdin") == 0 || + strcmp(argv[i], "-ilas") == 0 + ) + { + use_stdin = TRUE; + } + else if ( strcmp(argv[i], "--first_only") == 0 || + strcmp(argv[i], "-first_only") == 0 + ) + { + first_only = TRUE; + } + else if ( strcmp(argv[i], "--last_only") == 0 || + strcmp(argv[i], "-last_only") == 0 + ) + { + last_only = TRUE; + } + else if ( strcmp(argv[i], "--remove_extra_header") == 0 || + strcmp(argv[i], "-remove_extra_header") == 0 + ) + { + remove_extra_header = TRUE; + } + else if (file_name_in == NULL && file_name_out == NULL) + { + file_name_in = argv[i]; + } + else if (file_name_in != NULL && file_name_out == NULL) + { + file_name_out = argv[i]; + } + else + { + fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); + usage(); + exit(1); + } + } + + if (use_stdin) file_name_in="stdin"; + if (file_name_in) + { + reader = LASReader_Create(file_name_in); + if (!reader) { + LASError_Print("Could not open file to read"); + exit(1); + } + } + else + { + LASError_Print("no input specified"); + usage(); + exit(1); + } + + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not fetch header"); + exit(1); + } + + if (verbose) { + ptime("start."); + fprintf(stderr, "first pass reading %d points ...\n", LASHeader_GetPointRecordsCount(header)); + } + + p = LASReader_GetNextPoint(reader); + + if (!p) { + if (LASError_GetLastErrorNum()) + LASError_Print("Not able to fetch a point. LASReader is invalid"); + else + LASError_Print("File does not contain any points to read."); + exit(1); + } + + while (p) + { + + if (last_only && LASPoint_GetReturnNumber(p) != LASPoint_GetNumberOfReturns(p)) + { + eliminated_last_only++; + p = LASReader_GetNextPoint(reader); + continue; + } + if (first_only && LASPoint_GetReturnNumber(p) != 1) + { + eliminated_first_only++; + p = LASReader_GetNextPoint(reader); + continue; + } + + if (clip && (LASPoint_GetX(p) < clip_xy_min[0] || LASPoint_GetY(p) < clip_xy_min[1])) + { + clipped++; + p = LASReader_GetNextPoint(reader); + continue; + } + if (clip && (LASPoint_GetX(p) > clip_xy_max[0] || LASPoint_GetY(p) > clip_xy_max[1])) + { + clipped++; + p = LASReader_GetNextPoint(reader); + continue; + } + if (elim_return && (elim_return & (1 << LASPoint_GetReturnNumber(p)))) + { + eliminated_return++; + p = LASReader_GetNextPoint(reader); + continue; + } + if (elim_scan_angle_above && (LASPoint_GetScanAngleRank(p) > elim_scan_angle_above || LASPoint_GetScanAngleRank(p) < -elim_scan_angle_above)) + { + eliminated_scan_angle++; + p = LASReader_GetNextPoint(reader); + continue; + } + + clsidx = LASPoint_GetClassification(p); + clsidx = (clsidx & 31); // 31 is max index in classification lookup table + assert(clsidx <= 31); + if (elim_class && (elim_class == clsidx)) + { + eliminated_class++; + p = LASReader_GetNextPoint(reader); + continue; + } + + if (elim_intensity_below && LASPoint_GetIntensity(p) < elim_intensity_below) + { + eliminated_intensity++; + p = LASReader_GetNextPoint(reader); + continue; + } + surviving_number_of_point_records++; + + if (LASPoint_GetReturnNumber(p)) + surviving_number_of_points_by_return[LASPoint_GetReturnNumber(p)-1]++; + else + surviving_number_of_points_by_return[LASPoint_GetReturnNumber(p)]++; + + if (first_surviving_point) + { + surviving_point_min = LASPoint_Copy(p); + surviving_point_max = LASPoint_Copy(p); + surviving_gps_time_min = LASPoint_GetTime(p); + surviving_gps_time_max = LASPoint_GetTime(p); + first_surviving_point = FALSE; + } + else + { + if (LASPoint_GetX(p) < LASPoint_GetX(surviving_point_min)) + LASPoint_SetX(surviving_point_min,LASPoint_GetX(p)); + else if (LASPoint_GetX(p) > LASPoint_GetX(surviving_point_max)) + LASPoint_SetX(surviving_point_max,LASPoint_GetX(p)); + + if (LASPoint_GetY(p) < LASPoint_GetY(surviving_point_min)) + LASPoint_SetY(surviving_point_min,LASPoint_GetY(p)); + else if (LASPoint_GetY(p) > LASPoint_GetY(surviving_point_max)) + LASPoint_SetY(surviving_point_max,LASPoint_GetY(p)); + + if (LASPoint_GetZ(p) < LASPoint_GetZ(surviving_point_min)) + LASPoint_SetZ(surviving_point_min,LASPoint_GetZ(p)); + else if (LASPoint_GetZ(p) > LASPoint_GetZ(surviving_point_max)) + LASPoint_SetZ(surviving_point_max,LASPoint_GetZ(p)); + + if (LASPoint_GetIntensity(p) < LASPoint_GetIntensity(surviving_point_min)) + LASPoint_SetIntensity(surviving_point_min,LASPoint_GetIntensity(p)); + else if (LASPoint_GetIntensity(p) > LASPoint_GetIntensity(surviving_point_max)) + LASPoint_SetIntensity(surviving_point_max,LASPoint_GetIntensity(p)); + + if (LASPoint_GetFlightLineEdge(p) < LASPoint_GetFlightLineEdge(surviving_point_min)) + LASPoint_SetFlightLineEdge(surviving_point_min,LASPoint_GetFlightLineEdge(p)); + else if (LASPoint_GetFlightLineEdge(p) > LASPoint_GetFlightLineEdge(surviving_point_max)) + LASPoint_SetFlightLineEdge(surviving_point_max,LASPoint_GetFlightLineEdge(p)); + + if (LASPoint_GetScanDirection(p) < LASPoint_GetScanDirection(surviving_point_min)) + LASPoint_SetScanDirection(surviving_point_min,LASPoint_GetScanDirection(p)); + else if (LASPoint_GetScanDirection(p) > LASPoint_GetScanDirection(surviving_point_max)) + LASPoint_SetScanDirection(surviving_point_max,LASPoint_GetScanDirection(p)); + + if (LASPoint_GetNumberOfReturns(p) < LASPoint_GetNumberOfReturns(surviving_point_min)) + LASPoint_SetNumberOfReturns(surviving_point_min,LASPoint_GetNumberOfReturns(p)); + else if (LASPoint_GetNumberOfReturns(p) > LASPoint_GetNumberOfReturns(surviving_point_max)) + LASPoint_SetNumberOfReturns(surviving_point_max,LASPoint_GetNumberOfReturns(p)); + + if (LASPoint_GetReturnNumber(p) < LASPoint_GetReturnNumber(surviving_point_min)) + LASPoint_SetReturnNumber(surviving_point_min,LASPoint_GetReturnNumber(p)); + else if (LASPoint_GetReturnNumber(p) > LASPoint_GetReturnNumber(surviving_point_max)) + LASPoint_SetReturnNumber(surviving_point_max,LASPoint_GetReturnNumber(p)); + + if (LASPoint_GetClassification(p) < LASPoint_GetClassification(surviving_point_min)) + LASPoint_SetClassification(surviving_point_min,LASPoint_GetClassification(p)); + else if (LASPoint_GetReturnNumber(p) > LASPoint_GetClassification(surviving_point_max)) + LASPoint_SetClassification(surviving_point_max,LASPoint_GetClassification(p)); + + if (LASPoint_GetScanAngleRank(p) < LASPoint_GetScanAngleRank(surviving_point_min)) + LASPoint_SetScanAngleRank(surviving_point_min,LASPoint_GetScanAngleRank(p)); + else if (LASPoint_GetScanAngleRank(p) > LASPoint_GetScanAngleRank(surviving_point_max)) + LASPoint_SetScanAngleRank(surviving_point_max,LASPoint_GetScanAngleRank(p)); + + if (LASPoint_GetUserData(p) < LASPoint_GetUserData(surviving_point_min)) + LASPoint_SetUserData(surviving_point_min,LASPoint_GetUserData(p)); + else if (LASPoint_GetUserData(p) > LASPoint_GetUserData(surviving_point_max)) + LASPoint_SetUserData(surviving_point_max,LASPoint_GetUserData(p)); + + if (LASPoint_GetTime(p) < LASPoint_GetTime(surviving_point_min)) + LASPoint_SetTime(surviving_point_min,LASPoint_GetTime(p)); + else if (LASPoint_GetTime(p) > LASPoint_GetTime(surviving_point_max)) + LASPoint_SetTime(surviving_point_max,LASPoint_GetTime(p)); + +/* + if (lasreader->point.point_source_ID < surviving_point_min.point_source_ID) surviving_point_min.point_source_ID = lasreader->point.point_source_ID; + else if (lasreader->point.point_source_ID > surviving_point_max.point_source_ID) surviving_point_max.point_source_ID = lasreader->point.point_source_ID; +*/ + } + + p = LASReader_GetNextPoint(reader); + } + + if (eliminated_first_only) + fprintf(stderr, + "eliminated based on first returns only: %d\n", + eliminated_first_only); + if (eliminated_last_only) + fprintf(stderr, + "eliminated based on last returns only: %d\n", + eliminated_last_only); + if (eliminated_class) + fprintf(stderr, + "eliminated classification: %d\n", + eliminated_class); + if (clipped) + fprintf(stderr, + "clipped: %d\n", + clipped); + if (eliminated_return) + fprintf(stderr, + "eliminated based on return number: %d\n", + eliminated_return); + if (eliminated_scan_angle) + fprintf(stderr, + "eliminated based on scan angle: %d\n", + eliminated_scan_angle); + if (eliminated_intensity) + fprintf(stderr, + "eliminated based on intensity: %d\n", + eliminated_intensity); + + LASReader_Destroy(reader); + LASHeader_Destroy(header); + + if (verbose) + { + fprintf(stderr, + "x %.3f %.3f %.3f\n", + LASPoint_GetX(surviving_point_min), + LASPoint_GetX(surviving_point_max), + LASPoint_GetX(surviving_point_max) - LASPoint_GetX(surviving_point_min) + ); + fprintf(stderr, + "y %.3f %.3f %.3f\n", + LASPoint_GetY(surviving_point_min), + LASPoint_GetY(surviving_point_max), + LASPoint_GetY(surviving_point_max) - LASPoint_GetY(surviving_point_min) + ); + fprintf(stderr, + "z %.3f %.3f %.3f\n", + LASPoint_GetZ(surviving_point_min), + LASPoint_GetZ(surviving_point_max), + LASPoint_GetZ(surviving_point_max) - LASPoint_GetZ(surviving_point_min) + ); + fprintf(stderr, + "intensity %d %d %d\n", + LASPoint_GetIntensity(surviving_point_min), + LASPoint_GetIntensity(surviving_point_max), + LASPoint_GetIntensity(surviving_point_max) - LASPoint_GetIntensity(surviving_point_min) + ); + fprintf(stderr, + "edge_of_flight_line %d %d %d\n", + LASPoint_GetFlightLineEdge(surviving_point_min), + LASPoint_GetFlightLineEdge(surviving_point_max), + LASPoint_GetFlightLineEdge(surviving_point_max) - LASPoint_GetFlightLineEdge(surviving_point_min) + ); + fprintf(stderr, + "scan_direction_flag %d %d %d\n", + LASPoint_GetScanDirection(surviving_point_min), + LASPoint_GetScanDirection(surviving_point_max), + LASPoint_GetScanDirection(surviving_point_max) - LASPoint_GetScanDirection(surviving_point_min) + ); + fprintf(stderr, + "number_of_returns_of_given_pulse %d %d %d\n", + LASPoint_GetNumberOfReturns(surviving_point_min), + LASPoint_GetNumberOfReturns(surviving_point_max), + LASPoint_GetNumberOfReturns(surviving_point_max) - LASPoint_GetNumberOfReturns(surviving_point_min) + ); + fprintf(stderr, + "return_number %d %d %d\n", + LASPoint_GetReturnNumber(surviving_point_min), + LASPoint_GetReturnNumber(surviving_point_max), + LASPoint_GetReturnNumber(surviving_point_max) - LASPoint_GetReturnNumber(surviving_point_min) + ); + fprintf(stderr, + "classification %d %d %d\n", + LASPoint_GetClassification(surviving_point_min), + LASPoint_GetClassification(surviving_point_max), + LASPoint_GetClassification(surviving_point_max) - LASPoint_GetClassification(surviving_point_min) + ); + fprintf(stderr, + "scan_angle_rank %d %d %d\n", + LASPoint_GetScanAngleRank(surviving_point_min), + LASPoint_GetScanAngleRank(surviving_point_max), + LASPoint_GetScanAngleRank(surviving_point_max) - LASPoint_GetScanAngleRank(surviving_point_min) + ); + fprintf(stderr, + "user_data %d %d %d\n", + LASPoint_GetUserData(surviving_point_min), + LASPoint_GetUserData(surviving_point_max), + LASPoint_GetUserData(surviving_point_max) - LASPoint_GetUserData(surviving_point_min) + ); + fprintf(stderr, + "gps_time %.8f %.8f %.8f\n", + LASPoint_GetTime(surviving_point_min), + LASPoint_GetTime(surviving_point_max), + LASPoint_GetTime(surviving_point_max) - LASPoint_GetTime(surviving_point_min) + ); +/* + fprintf(stderr, "point_source_ID %d %d %d\n",surviving_point_min.point_source_ID, surviving_point_max.point_source_ID, surviving_point_max.point_source_ID - surviving_point_min.point_source_ID); +*/ + } + + + if (file_name_out == NULL && !use_stdout) + { + LASError_Print("no output specified. exiting..."); + exit(1); + } + + + if (file_name_in) + { + reader = LASReader_Create(file_name_in); + if (!reader) { + LASError_Print("Could not open file to read"); + exit(1); + } + } + else + { + LASError_Print("no input specified"); + usage(); + exit(1); + } + + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not read header"); + exit(1); + } + + + surviving_header = LASHeader_Copy(header); + + LASHeader_SetPointRecordsCount(surviving_header, surviving_number_of_point_records); + LASHeader_SetSystemId(surviving_header, "MODIFICATION"); + + for (i = 0; i < 5; i++) LASHeader_SetPointRecordsByReturnCount(surviving_header, i, surviving_number_of_points_by_return[i]); + + minx = LASPoint_GetX(surviving_point_min) * LASHeader_GetScaleX(surviving_header) + LASHeader_GetOffsetX(surviving_header); + maxx = LASPoint_GetX(surviving_point_max) * LASHeader_GetScaleX(surviving_header) + LASHeader_GetOffsetX(surviving_header); + + miny = LASPoint_GetY(surviving_point_min) * LASHeader_GetScaleY(surviving_header) + LASHeader_GetOffsetY(surviving_header); + maxy = LASPoint_GetY(surviving_point_max) * LASHeader_GetScaleY(surviving_header) + LASHeader_GetOffsetY(surviving_header); + + minz = LASPoint_GetZ(surviving_point_min) * LASHeader_GetScaleZ(surviving_header) + LASHeader_GetOffsetZ(surviving_header); + maxz = LASPoint_GetZ(surviving_point_max) * LASHeader_GetScaleZ(surviving_header) + LASHeader_GetOffsetZ(surviving_header); + + if (format == LAS_FORMAT_10) { + LASHeader_SetVersionMinor(surviving_header, 0); + } else if (format == LAS_FORMAT_11){ + LASHeader_SetVersionMinor(surviving_header, 1); + } else if (format == LAS_FORMAT_12) { + LASHeader_SetVersionMinor(surviving_header, 2); + } + + +/* if (remove_extra_header) surviving_header.offset_to_point_data = surviving_header.header_size; +*/ + + if (verbose) { + fprintf(stderr, + "second pass reading %d and writing %d points ...\n", + LASHeader_GetPointRecordsCount(surviving_header), + surviving_number_of_point_records); + } + + if (use_stdout) file_name_out = "stdout"; + + writer = LASWriter_Create(file_name_out, surviving_header, LAS_MODE_WRITE); + if (!writer) { + LASError_Print("Could not open file to write"); + exit(1); + } + +/* + + if (!remove_extra_header) + { + for (unsigned int u = lasreader->header.header_size; u < lasreader->header.offset_to_point_data; u++) + { + fputc(fgetc(file_in),file_out); + } + } +*/ + + + LASReader_Destroy(reader); + reader = NULL; + if (file_name_in) + { + reader = LASReader_Create(file_name_in); + if (!reader) { + LASError_Print("Could not open file to read"); + exit(1); + } + } + else + { + LASError_Print("no input specified"); + usage(); + exit(1); + } + + p = LASReader_GetNextPoint(reader); + if (!p) { + if (LASError_GetLastErrorNum()) + LASError_Print("Not able to fetch a point. LASReader is invalid"); + else + LASError_Print("File does not contain any points to read."); + exit(1); + } + + while (p) { + + if (skip_invalid && !LASPoint_IsValid(p)) { + p = LASReader_GetNextPoint(reader); + continue; + } + if (last_only && LASPoint_GetReturnNumber(p) != LASPoint_GetNumberOfReturns(p)) + { + p = LASReader_GetNextPoint(reader); + continue; + } + if (first_only && LASPoint_GetReturnNumber(p) != 1) + { + p = LASReader_GetNextPoint(reader); + continue; + + } + if (clip_xy_min && (LASPoint_GetX(p) < clip_xy_min[0] || LASPoint_GetY(p) < clip_xy_min[1])) + { + p = LASReader_GetNextPoint(reader); + continue; + } + if (clip_xy_max && (LASPoint_GetX(p) > clip_xy_max[0] || LASPoint_GetY(p) > clip_xy_max[1])) + { + p = LASReader_GetNextPoint(reader); + continue; + } + if (elim_return && (elim_return & (1 << LASPoint_GetReturnNumber(p)))) + { + p = LASReader_GetNextPoint(reader); + continue; + } + if (elim_scan_angle_above && (LASPoint_GetScanAngleRank(p) > elim_scan_angle_above || LASPoint_GetScanAngleRank(p) < -elim_scan_angle_above)) + { + p = LASReader_GetNextPoint(reader); + continue; + } + if (elim_intensity_below && LASPoint_GetIntensity(p) < elim_intensity_below) + { + p = LASReader_GetNextPoint(reader); + continue; + } + + clsidx = LASPoint_GetClassification(p); + clsidx = (clsidx & 31); // 31 is max index in classification lookup table + assert(clsidx <= 31); + if (elim_class && (elim_class == clsidx)) + { + p = LASReader_GetNextPoint(reader); + continue; + } + LASWriter_WritePoint(writer,p); + + p = LASReader_GetNextPoint(reader); + } + + LASWriter_Destroy(writer); + LASReader_Destroy(reader); + LASHeader_Destroy(header); + LASHeader_Destroy(surviving_header); + LASPoint_Destroy(surviving_point_max); + LASPoint_Destroy(surviving_point_min); + + reader = LASReader_Create(file_name_out); + if (!reader) { + LASError_Print("Could not open file to read"); + exit(1); + } + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not read header"); + exit(1); + } + summary = SummarizePoints(reader); + if (verbose) { + print_point_summary(stderr, summary, header); + } + repair_header(stderr, header, summary) ; + + if (summary) { + LASPoint_Destroy(summary->pmin); + LASPoint_Destroy(summary->pmax); + free(summary); + } + + if (reader) { + LASReader_Destroy(reader); + reader = NULL; + } + + writer = LASWriter_Create(file_name_out, header, LAS_MODE_APPEND); + if (!writer) { + LASError_Print("Problem creating LASWriterH object for append"); + LASHeader_Destroy(header); + header = NULL; + exit(1); + } + LASWriter_Destroy(writer); + writer = NULL; + LASHeader_Destroy(header); + header = NULL; + + if (verbose) ptime("done."); + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/las2ogr.cpp work/libLAS-1.2.1/apps/las2ogr.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/las2ogr.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/las2ogr.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,377 @@ +// $Id$ +// +// las2ogr translates LAS file to OGR datasource. +// Inspired by pylas.py script developed by Matthew Perry and Carl Anderson, +// available at http://code.google.com/p/pylas/ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#ifdef HAVE_GDAL +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif +// liblas +#include +#include +#include +#include +// ogr +#include +//std +#include +#include +#include +#include +#include +#include + +// Anonymous namespace for local definitions +namespace { + +template +class ogr_wrapper +{ + typedef void(*deleter_type)(T p); + +public: + + ogr_wrapper(T p, deleter_type d) + : p_(p), del_(d) + {} + + ~ogr_wrapper() + { + do_delete(p_); + } + + void reset(T p) + { + do_delete(p_); + p_= p; + } + + operator T() + { + return get(); + } + + + T get() const + { + return p_; + } + + void swap(ogr_wrapper& other) + { + std::swap(p_, other.p_); + } + +private: + + ogr_wrapper(ogr_wrapper const& other); + ogr_wrapper& operator=(ogr_wrapper const& rhs); + + void do_delete(T p) + { + assert(del_); + if (0 != p) + del_(p); + } + + T p_; + deleter_type del_; + +}; + +bool term_progress(std::ostream& os, double complete) +{ + static int lastTick = -1; + int tick = static_cast(complete * 40.0); + + tick = std::min(40, std::max(0, tick)); + + // Have we started a new progress run? + if (tick < lastTick && lastTick >= 39) + lastTick = -1; + + if (tick <= lastTick) + return true; + + while (tick > lastTick) + { + lastTick++; + if (lastTick % 4 == 0) + os << (lastTick / 4) * 10; + else + os << "."; + } + + if( tick == 40 ) + os << " - done.\n"; + else + os.flush(); + + return true; +} + +OGRFieldDefnH create_field(const char* name, OGRFieldType type, int width, int precision) +{ + OGRFieldDefnH fld; + fld= OGR_Fld_Create(name, type); + OGR_Fld_SetWidth(fld, width); + OGR_Fld_SetPrecision(fld, precision); + + return fld; +} + +void create_layer_def(OGRLayerH lyr) +{ + assert(0 != lyr); + + std::string fldname("return_num"); + + OGRFieldDefnH fld = create_field("return_num", OFTInteger, 10, 0); + OGRErr err = OGR_L_CreateField(lyr, fld, 0); + if (OGRERR_NONE != err) + { + throw std::runtime_error("return_num field creation failed"); + } + + OGR_Fld_Destroy(fld); + + fld = create_field("angle", OFTInteger, 10, 0); + err = OGR_L_CreateField(lyr, fld, 0); + if (OGRERR_NONE != err) + { + throw std::runtime_error("angle field cration failed"); + } + + OGR_Fld_Destroy(fld); + + fld = create_field("intensity", OFTInteger, 10, 0); + err = OGR_L_CreateField(lyr, fld, 0); + if (OGRERR_NONE != err) + { + throw std::runtime_error("intensity field cration failed"); + } + + OGR_Fld_Destroy(fld); + + fld = create_field("asprsclass", OFTInteger, 10, 0); + err = OGR_L_CreateField(lyr, fld, 0); + if (OGRERR_NONE != err) + { + throw std::runtime_error("asprsclass field creation failed"); + } + + OGR_Fld_Destroy(fld); + + fld = create_field("return_tot", OFTInteger, 10, 0); + err = OGR_L_CreateField(lyr, fld, 0); + if (OGRERR_NONE != err) + { + throw std::runtime_error("return_tot field creation failed"); + } + + OGR_Fld_Destroy(fld); + + fld = create_field("gpstime", OFTReal, 10, 0); + err = OGR_L_CreateField(lyr, fld, 0); + if (OGRERR_NONE != err) + { + throw std::runtime_error("gpstime field cration failed"); + } + + OGR_Fld_Destroy(fld); +} + +void report_ogr_formats(std::ostream& os) +{ + os << "Supported OGR formats:"; + + for (int i = 0; i < OGRGetDriverCount(); ++i) + { + OGRSFDriverH drv = OGRGetDriver(i); + assert(0 != drv); + + if (OGR_Dr_TestCapability(drv, ODrCCreateDataSource)) + { + os << "\n - " << OGR_Dr_GetName(drv); + } + } + + os << "\nMore details at http://gdal.org/ogr/ogr_formats.html" << std::endl; +} + +void usage() +{ + std::cerr << "Usage: las2ogr OPTIONS\nOptions are:\n" + << "\t-h print this message\n" + << "\t-i \tinput ASPRS LAS file\n" + << "\t-o \toutput file\n" + << "\t-f \tOGR format for output file\n" + << "\t-formats\tlist supported OGR formats\n"; +} + +} // anonymous namespace + +int main(int argc, char* argv[]) +{ + int rc = 0; + + try + { + OGRRegisterAll(); + + // Parse command-line options + std::string in_file; + std::string out_file; + std::string out_frmt; + { + int on_arg = 1; + while (on_arg < argc) + { + std::string arg(argv[on_arg]); + if (arg == "-h") + { + usage(); + return 0; + } + else if (arg == "-formats") + { + report_ogr_formats(std::cout); + return 0; + } + else if (arg == "-i" && (on_arg + 1 < argc)) + { + ++on_arg; + assert(on_arg < argc); + in_file = argv[on_arg]; + } + else if (arg == "-o" && (on_arg + 1 < argc)) + { + ++on_arg; + assert(on_arg < argc); + out_file = argv[on_arg]; + out_frmt = "ESRI Shapefile"; // default output format + } + else if (arg == "-f" && (on_arg + 1 < argc)) + { + ++on_arg; + assert(on_arg < argc); + out_frmt = argv[on_arg]; + } + else + { + throw std::runtime_error(std::string("unrecognized parameter: ") + arg); + } + ++on_arg; + } + + if (in_file.empty() || out_file.empty() || out_frmt.empty()) + { + throw std::runtime_error("missing input paremeters"); + } + } + + // + // Source + // + std::cout << "Source:" << "\n - dataset: " << in_file << std::endl; + + std::ifstream ifs; + if (!liblas::Open(ifs, in_file.c_str())) + { + throw std::runtime_error(std::string("Can not open \'") + in_file + "\'"); + } + liblas::LASReader reader(ifs); + + // + // Target + // + std::string const lyrname(out_file.substr(0, out_file.find_last_of('.'))); + + std::cout << "Target:" + << "\n - format: " << out_frmt + << "\n - dataset: " << out_file + << "\n - layer: " << lyrname + << std::endl; + + OGRSFDriverH drv = OGRGetDriverByName(out_frmt.c_str()); + if (0 == drv) + { + throw std::runtime_error(out_frmt + " driver not available"); + } + + ogr_wrapper ds(OGR_Dr_CreateDataSource(drv, out_file.c_str(), 0), OGR_DS_Destroy); + if (0 == ds.get()) + { + throw std::runtime_error(out_file + " datasource creation failed"); + } + + OGRLayerH lyr = OGR_DS_CreateLayer(ds, lyrname.c_str(), 0, wkbPoint25D, 0); + if (0 == lyr) + { + throw std::runtime_error(out_file + " layer creation failed"); + } + + // Prepare layer schema + create_layer_def(lyr); + + // + // Translation of points cloud to features set + // + liblas::uint32_t i = 0; + liblas::uint32_t const size = reader.GetHeader().GetPointRecordsCount(); + + std::cout << "Translating " << size << " points:\n"; + + ogr_wrapper feat(OGR_F_Create(OGR_L_GetLayerDefn(lyr)), OGR_F_Destroy); + + while (reader.ReadNextPoint()) + { + liblas::LASPoint const& p = reader.GetPoint(); + + OGR_F_SetFieldInteger(feat, 0, p.GetReturnNumber()); + OGR_F_SetFieldInteger(feat, 1, p.GetScanAngleRank()); + OGR_F_SetFieldInteger(feat, 2, p.GetIntensity()); + OGR_F_SetFieldInteger(feat, 3, p.GetClassification()); + OGR_F_SetFieldInteger(feat, 4, p.GetNumberOfReturns()); + OGR_F_SetFieldDouble(feat, 5, p.GetTime()); + + ogr_wrapper geom(OGR_G_CreateGeometry(wkbPoint25D), OGR_G_DestroyGeometry); + OGR_G_SetPoint(geom, 0, p.GetX(), p.GetY(), p.GetZ()); + if (OGRERR_NONE != OGR_F_SetGeometry(feat, geom)) + { + throw std::runtime_error("geometry creation failed"); + } + + if (OGRERR_NONE != OGR_L_CreateFeature(lyr, feat)) + { + throw std::runtime_error("feature creation failed"); + } + + term_progress(std::cout, (i + 1) / static_cast(size)); + i++; + } + + std::cout << std::endl; + } + catch (std::exception const& e) + { + std::cerr << "Error: " << e.what() << std::endl; + rc = -1; + } + catch (...) + { + std::cerr << "Unknown error\n"; + rc = -1; + } + + return rc; +} +#endif // #ifdef HAVE_GDAL + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/las2txt.c work/libLAS-1.2.1/apps/las2txt.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/las2txt.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/las2txt.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,583 @@ +/*************************************************************************** + * $Id$ + * $Date$ + * + * Project: libLAS -- C/C++ read/write library for LAS LIDAR data + * Purpose: LAS translation to ASCII text with optional configuration + * Author: Martin Isenburg isenburg@cs.unc.edu + *************************************************************************** + * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu + * + * See LICENSE.txt in this source distribution for more information. + **************************************************************************/ + +#include +#include +#include +#include + +#include "liblas.h" + +void print_header(FILE *file, LASHeaderH header, const char* file_name); + +void usage() +{ + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," las2txt (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Convert a las file to text on stdout:\n"); + fprintf(stderr," las2txt lidar.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Convert using stdin and stdout:\n"); + fprintf(stderr," las2txt --stdin --stdout < lidar.las > lidar.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Convert to text with a specified format :\n"); + fprintf(stderr," las2txt --parse xyziar lidar.las lidar.txt\n"); + fprintf(stderr,"\n"); + + + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," The '--parse txyz' flag specifies how to format each\n"); + fprintf(stderr," each line of the ASCII file. For example, 'txyzia'\n"); + fprintf(stderr," means that the first number of each line should be the\n"); + fprintf(stderr," gpstime, the next three numbers should be the x, y, and\n"); + fprintf(stderr," z coordinate, the next number should be the intensity\n"); + fprintf(stderr," and the next number should be the scan angle.\n"); + fprintf(stderr," The supported entries are:\n"); + fprintf(stderr," a - scan angle\n"); + fprintf(stderr," i - intensity\n"); + fprintf(stderr," n - number of returns for given pulse\n"); + fprintf(stderr," r - number of this return\n"); + fprintf(stderr," c - classification\n"); + fprintf(stderr," u - user data (does not currently work)\n"); + fprintf(stderr," p - point source ID\n"); + fprintf(stderr," e - edge of flight line\n"); + fprintf(stderr," d - direction of scan flag\n"); + fprintf(stderr," R - red channel of RGB color\n"); + fprintf(stderr," G - green channel of RGB color\n"); + fprintf(stderr," B - blue channel of RGB color\n"); + fprintf(stderr," M - vertex index number\n\n"); + + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," The '--sep space' flag specifies what separator to use. The\n"); + fprintf(stderr," default is a space but 'tab', 'komma', 'colon', 'hyphen',\n"); + fprintf(stderr," 'dot', or 'semicolon' are other possibilities.\n\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," The '--header pound' flag results in the header information\n"); + fprintf(stderr," being printed at the beginning of the ASCII file in form of\n"); + fprintf(stderr," a comment that starts with the special character '#'. Also\n"); + fprintf(stderr," possible are 'percent', 'dollar', 'semicolon', 'komma',\n"); + fprintf(stderr," 'star', 'colon', or 'semicolon' as that special character.\n"); + + fprintf(stderr, "\nFor more information, see the full documentation for las2txt at:\n" + " http://liblas.org/browser/trunk/doc/las2txt.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + +} + + +static int lidardouble2string(char* string, double value) +{ + int len; + len = sprintf(string, "%f", value) - 1; + while (string[len] == '0') len--; + if (string[len] != '.') len++; + string[len] = '\0'; + return len; +} + + +int main(int argc, char *argv[]) +{ + int i; + int use_stdin = FALSE; + int use_stdout = FALSE; + int skip_invalid = FALSE; + + int verbose = FALSE; + char* file_name_in = 0; + char* file_name_out = 0; + char separator_sign = ' '; + char header_comment_sign = '\0'; + char* parse_string = "xyz"; + char printstring[256]; + LASReaderH reader = NULL; + LASHeaderH header = NULL; + LASPointH p = NULL; + FILE* file_out = NULL; + int len; + + uint32_t index = 0; + + for (i = 1; i < argc; i++) + { + if ( strcmp(argv[i],"-h") == 0 || + strcmp(argv[i],"--help") == 0 + ) + { + usage(); + exit(0); + } + else if ( strcmp(argv[i],"-v") == 0 || + strcmp(argv[i],"--verbose") == 0 + ) + { + verbose = TRUE; + } + else if ( strcmp(argv[i],"-s") == 0 || + strcmp(argv[i],"--skip_invalid") == 0 + ) + { + skip_invalid = TRUE; + } + else if ( strcmp(argv[i], "--parse") == 0 || + strcmp(argv[i], "-parse") == 0 + ) + { + i++; + parse_string = argv[i]; + } + else if ( strcmp(argv[i], "--sep") == 0 || + strcmp(argv[i], "-sep") == 0 + ) + { + i++; + + if (strcmp(argv[i],"komma") == 0 || + strcmp(argv[i],"comma") == 0 ) + { + separator_sign = ','; + } + else if (strcmp(argv[i],"tab") == 0) + { + separator_sign = '\t'; + } + else if ( strcmp(argv[i],"dot") == 0 || + strcmp(argv[i],"period") == 0 + ) + { + separator_sign = '.'; + } + else if (strcmp(argv[i],"colon") == 0) + { + separator_sign = ':'; + } + else if ( strcmp(argv[i],"scolon") == 0 || + strcmp(argv[i],"semicolon") == 0 + ) + { + separator_sign = ';'; + } + else if ( strcmp(argv[i],"hyphen") == 0 || + strcmp(argv[i],"minus") == 0 + ) + { + separator_sign = '-'; + } + else if (strcmp(argv[i],"space") == 0) + { + separator_sign = ' '; + } + else + { + fprintf(stderr, "ERROR: unknown seperator '%s'\n",argv[i]); + usage(); + exit(1); + } + } + else if ( strcmp(argv[i], "--header") == 0 || + strcmp(argv[i], "--comment") == 0 || + strcmp(argv[i], "-header") == 0 || + strcmp(argv[i], "-comment") == 0 || + strcmp(argv[i], "-head") == 0 + ) + { + i++; + if (strcmp(argv[i],"komma") == 0 || + strcmp(argv[i],"comma") == 0 ) + { + header_comment_sign = ','; + } + else if (strcmp(argv[i],"colon") == 0) + { + header_comment_sign = ':'; + } + else if ( strcmp(argv[i],"scolon") == 0 || + strcmp(argv[i],"semicolon") == 0 + ) + { + header_comment_sign = ';'; + } + else if ( strcmp(argv[i],"pound") == 0 || + strcmp(argv[i],"hash") == 0 + ) + { + header_comment_sign = '#'; + } + else if (strcmp(argv[i],"percent") == 0) + { + header_comment_sign = '%'; + } + else if (strcmp(argv[i],"dollar") == 0) + { + header_comment_sign = '$'; + } + else if (strcmp(argv[i],"star") == 0) + { + header_comment_sign = '*'; + } + else + { + fprintf(stderr, "ERROR: unknown comment symbol '%s'\n",argv[i]); + usage(); + exit(1); + } + } + else if ( strcmp(argv[i], "--stdin") == 0 || + strcmp(argv[i], "-ilas") == 0 + ) + { + use_stdin = TRUE; + } + else if ( strcmp(argv[i], "--stdout") == 0 + ) + { + use_stdout = TRUE; + } + else if ( strcmp(argv[i],"--input") == 0 || + strcmp(argv[i],"-input") == 0 || + strcmp(argv[i],"-i") == 0 || + strcmp(argv[i],"-in") == 0 + ) + { + i++; + file_name_in = argv[i]; + } + else if ( strcmp(argv[i],"--output") == 0 || + strcmp(argv[i],"--out") == 0 || + strcmp(argv[i],"-out") == 0 || + strcmp(argv[i],"-o") == 0 + ) + { + i++; + file_name_out = argv[i]; + } + else if (file_name_in == 0 && file_name_out == 0) + { + file_name_in = argv[i]; + } + else if (file_name_in && file_name_out == 0) + { + file_name_out = argv[i]; + } + else + { + fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); + usage(); + exit(1); + } + } /* end looping through argc/argv */ + + + if (use_stdin) file_name_in = "stdin"; + reader = LASReader_Create(file_name_in); + if (!reader) { + LASError_Print("Unable to read file"); + exit(1); + } + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Unable to fetch header for file"); + exit(1); + } + + + + + + if (use_stdout) + { + file_out = stdout; + } + else + { + if (file_name_out == NULL) + { + if (file_name_in == NULL) + { + LASError_Print("No input filename was specified"); + usage(); + exit(1); + } + + len = (int)strlen(file_name_in); + file_name_out = strdup(file_name_in); + if (file_name_out[len-3] == '.' && file_name_out[len-2] == 'g' && file_name_out[len-1] == 'z') + { + len = len - 4; + } + while (len > 0 && file_name_out[len] != '.') + { + len--; + } + file_name_out[len] = '.'; + file_name_out[len+1] = 't'; + file_name_out[len+2] = 'x'; + file_name_out[len+3] = 't'; + file_name_out[len+4] = '\0'; + } + file_out = fopen(file_name_out, "w"); + + if (file_out == 0) + { + LASError_Print("Could not open file for write"); + usage(); + exit(1); + } + } + + + + if (verbose) + { + print_header(stderr, header, file_name_in); + } + + if (header_comment_sign) + { + + fprintf(file_out, + "%c file signature: '%s'\012", + header_comment_sign, + LASHeader_GetFileSignature(header) + ); + fprintf(file_out, + "%c file source ID: %d\012", + header_comment_sign, + LASHeader_GetFileSourceId(header) + ); + fprintf(file_out, + "%c reserved: %d\012", + header_comment_sign, + LASHeader_GetReserved(header) + ); + fprintf(file_out, + "%c project ID GUID: %s\012", + header_comment_sign, + LASHeader_GetProjectId(header) + ); + fprintf(file_out, + "%c version major.minor: %d.%d\012", + header_comment_sign, + LASHeader_GetVersionMajor(header), + LASHeader_GetVersionMinor(header) + ); + fprintf(file_out, + "%c system_identifier: '%s'\012", + header_comment_sign, + LASHeader_GetSystemId(header) + ); + fprintf(file_out, + "%c generating_software: '%s'\012", + header_comment_sign, + LASHeader_GetSoftwareId(header) + ); + fprintf(file_out, + "%c file creation day/year: %d/%d\012", + header_comment_sign, + LASHeader_GetCreationDOY(header), + LASHeader_GetCreationYear(header) + ); + fprintf(file_out, + "%c header size %d\012", + header_comment_sign, + LASHeader_GetHeaderSize(header) + ); + fprintf(file_out, + "%c offset to point data %d\012", + header_comment_sign, + LASHeader_GetDataOffset(header) + ); + fprintf(file_out, + "%c number var. length records %d\012", + header_comment_sign, + LASHeader_GetRecordsCount(header) + ); + fprintf(file_out, + "%c point data format %d\012", + header_comment_sign, + LASHeader_GetDataFormatId(header) + ); + fprintf(file_out, + "%c point data record length %d\012", + header_comment_sign, + LASHeader_GetDataRecordLength(header) + ); + fprintf(file_out, + "%c number of point records %d\012", + header_comment_sign, + LASHeader_GetPointRecordsCount(header) + ); + fprintf(file_out, + "%c number of points by return %d %d %d %d %d\012", + header_comment_sign, + LASHeader_GetPointRecordsByReturnCount(header, 0), + LASHeader_GetPointRecordsByReturnCount(header, 1), + LASHeader_GetPointRecordsByReturnCount(header, 2), + LASHeader_GetPointRecordsByReturnCount(header, 3), + LASHeader_GetPointRecordsByReturnCount(header, 4) + ); + fprintf(file_out, + "%c scale factor x y z %.6f %.6f %.6f\n", + header_comment_sign, + LASHeader_GetScaleX(header), + LASHeader_GetScaleY(header), + LASHeader_GetScaleZ(header) + ); + fprintf(file_out, + "%c offset x y z %.6f %.6f %.6f\n", + header_comment_sign, + LASHeader_GetOffsetX(header), + LASHeader_GetOffsetY(header), + LASHeader_GetOffsetZ(header) + ); + fprintf(file_out, + "%c min x y z %.6f %.6f %.6f\n", + header_comment_sign, + LASHeader_GetMinX(header), + LASHeader_GetMinY(header), + LASHeader_GetMinZ(header) + ); + fprintf(file_out, + "%c max x y z %.6f %.6f %.6f\n", + header_comment_sign, + LASHeader_GetMaxX(header), + LASHeader_GetMaxY(header), + LASHeader_GetMaxZ(header) + ); + + } + + + + p = LASReader_GetNextPoint(reader); + while (p) + { + + if (skip_invalid && !LASPoint_IsValid(p)) { + if (verbose) { + LASError_Print("Skipping writing invalid point..."); + } + p = LASReader_GetNextPoint(reader); + index -=1; + continue; + } + + i = 0; + for (;;) + { + LASColorH color = LASPoint_GetColor(p); + + switch (parse_string[i]) + { + /* // the x coordinate */ + case 'x': + lidardouble2string(printstring, LASPoint_GetX(p)); fprintf(file_out, printstring); + break; + /* // the y coordinate */ + case 'y': + lidardouble2string(printstring, LASPoint_GetY(p)); fprintf(file_out, printstring); + break; + /* // the z coordinate */ + case 'z': + lidardouble2string(printstring, LASPoint_GetZ(p)); fprintf(file_out, printstring); + break; + /* // the gps-time */ + case 't': + lidardouble2string(printstring,LASPoint_GetTime(p)); fprintf(file_out, printstring); + break; + /* // the intensity */ + case 'i': + fprintf(file_out, "%d", LASPoint_GetIntensity(p)); + break; + /* the scan angle */ + case 'a': + fprintf(file_out, "%d", LASPoint_GetScanAngleRank(p)); + break; + /* the number of the return */ + case 'r': + fprintf(file_out, "%d", LASPoint_GetReturnNumber(p)); + break; + /* the classification */ + case 'c': + fprintf(file_out, "%d", LASPoint_GetClassification(p)); + break; + /* the user data */ + case 'u': + fprintf(file_out, "%d", LASPoint_GetUserData(p)); + break; + /* the number of returns of given pulse */ + case 'n': + fprintf(file_out, "%d", LASPoint_GetNumberOfReturns(p)); + break; + /* the red channel color */ + case 'R': + fprintf(file_out, "%d", LASColor_GetRed(color)); + break; + /* the green channel color */ + case 'G': + fprintf(file_out, "%d", LASColor_GetGreen(color)); + break; + /* the blue channel color */ + case 'B': + fprintf(file_out, "%d", LASColor_GetBlue(color)); + break; + case 'M': + fprintf(file_out, "%d", index); + break; + case 'p': + fprintf(file_out, "%d", LASPoint_GetPointSourceId(p)); + break; + /* the edge of flight line flag */ + case 'e': + fprintf(file_out, "%d", LASPoint_GetFlightLineEdge(p)); + break; + /* the direction of scan flag */ + case 'd': + fprintf(file_out, "%d", LASPoint_GetScanDirection(p)); + break; + } + i++; + if (parse_string[i]) + { + fprintf(file_out, "%c", separator_sign); + } + else + { + fprintf(file_out, "\012"); + break; + } + + LASColor_Destroy(color); + + } + + p = LASReader_GetNextPoint(reader); + index +=1; + } + + + LASReader_Destroy(reader); + LASHeader_Destroy(header); + + + + fclose(file_out); + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lascommon.c work/libLAS-1.2.1/apps/lascommon.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lascommon.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/lascommon.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,637 @@ +#include +#include +#include +#include + +#ifdef HAVE_GEOTIFF +#include +#endif + + +static const char * LASPointClassification [] = { + "Created, never classified", + "Unclassified", + "Ground", + "Low Vegetation", + "Medium Vegetation", + "High Vegetation", + "Building", + "Low Point (noise)", + "Model Key-point (mass point)", + "Water", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Overlap Points", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition" +}; + + +LASPointSummary* SummarizePoints(LASReaderH reader) { + + LASPointSummary* summary; + LASPointH p = NULL; + LASColorH color = NULL; + LASColorH min_color = NULL; + LASColorH max_color = NULL; + + uint8_t cls = 0; + uint16_t red = 0; + uint16_t green = 0; + uint16_t blue = 0; + + uint16_t ptsrc = 0; + + int i = 0; + + summary = (LASPointSummary*) malloc(sizeof(LASPointSummary)); + + summary->number_of_point_records = 0; + for (i=0; i<8;i++) + summary->number_of_points_by_return[i] = 0; + for (i=0; i<8;i++) + summary->number_of_returns_of_given_pulse[i] = 0; + for (i=0; i<32;i++) + summary->classification[i] = 0; + summary->classification_synthetic = 0; + summary->classification_keypoint = 0; + summary->classification_withheld = 0; + + + + + p = LASReader_GetNextPoint(reader); + + if (!p) { + if (LASError_GetLastErrorNum()) + LASError_Print("Not able to fetch a point. LASReaderH is invalid"); + else + LASError_Print("File does not contain any points to read."); + exit(1); + } + + summary->pmin = LASPoint_Copy(p); + summary->pmax = LASPoint_Copy(p); + + /* If we got this far we have one point */ + i = 1; + while (p) + { + + summary->x = LASPoint_GetX(p); + LASPoint_SetX(summary->pmin, MIN(summary->x, LASPoint_GetX(summary->pmin))); + LASPoint_SetX(summary->pmax, MAX(summary->x, LASPoint_GetX(summary->pmax))); + + summary->y = LASPoint_GetY(p); + LASPoint_SetY(summary->pmin, MIN(summary->y, LASPoint_GetY(summary->pmin))); + LASPoint_SetY(summary->pmax, MAX(summary->y, LASPoint_GetY(summary->pmax))); + + summary->z = LASPoint_GetZ(p); + LASPoint_SetZ(summary->pmin, MIN(summary->z, LASPoint_GetZ(summary->pmin))); + LASPoint_SetZ(summary->pmax, MAX(summary->z, LASPoint_GetZ(summary->pmax))); + + summary->intensity = LASPoint_GetIntensity(p); + LASPoint_SetIntensity(summary->pmin, MIN(summary->intensity, LASPoint_GetIntensity(summary->pmin))); + LASPoint_SetIntensity(summary->pmax, MAX(summary->intensity, LASPoint_GetIntensity(summary->pmax))); + + summary->t = LASPoint_GetTime(p); + LASPoint_SetTime(summary->pmin, MIN(summary->t, LASPoint_GetTime(summary->pmin))); + LASPoint_SetTime(summary->pmax, MAX(summary->t, LASPoint_GetTime(summary->pmax))); + + summary->retnum = LASPoint_GetReturnNumber(p); + LASPoint_SetReturnNumber(summary->pmin, MIN(summary->retnum, LASPoint_GetReturnNumber(summary->pmin))); + LASPoint_SetReturnNumber(summary->pmax, MAX(summary->retnum, LASPoint_GetReturnNumber(summary->pmax))); + + summary->numret = LASPoint_GetNumberOfReturns(p); + LASPoint_SetNumberOfReturns(summary->pmin, MIN(summary->numret, LASPoint_GetNumberOfReturns(summary->pmin))); + LASPoint_SetNumberOfReturns(summary->pmax, MAX(summary->numret, LASPoint_GetNumberOfReturns(summary->pmax))); + + summary->scandir = LASPoint_GetScanDirection(p); + LASPoint_SetScanDirection(summary->pmin, MIN(summary->scandir, LASPoint_GetScanDirection(summary->pmin))); + LASPoint_SetScanDirection(summary->pmax, MAX(summary->scandir, LASPoint_GetScanDirection(summary->pmax))); + + summary->fedge = LASPoint_GetFlightLineEdge(p); + LASPoint_SetFlightLineEdge(summary->pmin, MIN(summary->fedge, LASPoint_GetFlightLineEdge(summary->pmin))); + LASPoint_SetFlightLineEdge(summary->pmax, MAX(summary->fedge, LASPoint_GetFlightLineEdge(summary->pmax))); + + summary->scan_angle = LASPoint_GetScanAngleRank(p); + LASPoint_SetScanAngleRank(summary->pmin, MIN(summary->scan_angle, LASPoint_GetScanAngleRank(summary->pmin))); + LASPoint_SetScanAngleRank(summary->pmax, MAX(summary->scan_angle, LASPoint_GetScanAngleRank(summary->pmax))); + + summary->user_data = LASPoint_GetUserData(p); + LASPoint_SetUserData(summary->pmin, MIN(summary->user_data, LASPoint_GetUserData(summary->pmin))); + LASPoint_SetUserData(summary->pmax, MAX(summary->user_data, LASPoint_GetUserData(summary->pmax))); + + summary->number_of_point_records = i; + + if (LASPoint_GetReturnNumber(p)) + summary->number_of_points_by_return[LASPoint_GetReturnNumber(p)-1]++; + else + summary->number_of_points_by_return[LASPoint_GetReturnNumber(p)]++; + + summary->number_of_returns_of_given_pulse[LASPoint_GetNumberOfReturns(p)]++; + + cls = LASPoint_GetClassification(p); + LASPoint_SetClassification(summary->pmin, MIN(cls, LASPoint_GetClassification(summary->pmin))); + LASPoint_SetClassification(summary->pmax, MAX(cls, LASPoint_GetClassification(summary->pmax))); + + ptsrc = LASPoint_GetPointSourceId(p); + LASPoint_SetPointSourceId(summary->pmin, MIN(ptsrc, LASPoint_GetPointSourceId(summary->pmin))); + LASPoint_SetPointSourceId(summary->pmax, MAX(ptsrc, LASPoint_GetPointSourceId(summary->pmax))); + + color = LASPoint_GetColor(p); + min_color = LASPoint_GetColor(summary->pmin); + max_color = LASPoint_GetColor(summary->pmax); + + red = MIN(LASColor_GetRed(min_color), LASColor_GetRed(color)); + green = MIN(LASColor_GetGreen(min_color), LASColor_GetGreen(color)); + blue = MIN(LASColor_GetBlue(min_color), LASColor_GetBlue(color)); + + LASColor_SetRed(min_color, red); + LASColor_SetGreen(min_color, green); + LASColor_SetBlue(min_color, blue); + + LASPoint_SetColor(summary->pmin, min_color); + LASColor_Destroy(min_color); + + red = MAX(LASColor_GetRed(max_color), LASColor_GetRed(color)); + green = MAX(LASColor_GetGreen(max_color), LASColor_GetGreen(color)); + blue = MAX(LASColor_GetBlue(max_color), LASColor_GetBlue(color)); + + LASColor_SetRed(max_color, red); + LASColor_SetGreen(max_color, green); + LASColor_SetBlue(max_color, blue); + + LASPoint_SetColor(summary->pmax, max_color); + LASColor_Destroy(max_color); + + LASColor_Destroy(color); + + + + summary->classification[(cls & 31)]++; + if (cls & 32) summary->classification_synthetic++; + if (cls & 64) summary->classification_keypoint++; + if (cls & 128) summary->classification_withheld++; + + /* + // if (lasreader->point.point_source_ID < point_min.point_source_ID) point_min.point_source_ID = lasreader->point.point_source_ID; + // else if (lasreader->point.point_source_ID > point_max.point_source_ID) point_max.point_source_ID = lasreader->point.point_source_ID; + + */ + p = LASReader_GetNextPoint(reader); + + if (LASError_GetLastErrorNum()) { + LASError_Print("Not able to fetch point"); + exit(1); + } + + i++; + } + + return summary; +} + +void print_point(FILE *file, LASPointH point) { + + fprintf(file, "---------------------------------------------------------\n"); + + fprintf(file, " X: \t\t%.6f\n", + LASPoint_GetX(point) + ); + fprintf(file, " Y: \t\t%.6f\n", + LASPoint_GetY(point) + ); + fprintf(file, " Z: \t\t%.6f\n", + LASPoint_GetZ(point) + ); + fprintf(file, " Time:\t\t\t%.6f\n", + LASPoint_GetTime(point) + ); + fprintf(file, " Return Number:\t%d\n", + LASPoint_GetReturnNumber(point) + ); + fprintf(file, " Return Count:\t\t%d\n", + LASPoint_GetNumberOfReturns(point) + ); + fprintf(file, " Flightline Edge:\t%d\n", + LASPoint_GetFlightLineEdge(point) + ); + fprintf(file, " Intensity:\t\t%d\n", + LASPoint_GetIntensity(point) + ); + fprintf(file, " Scan Direction Flag:\t%d\n", + LASPoint_GetScanDirection(point) + ); + fprintf(file, " Scan Angle Rank:\t%d\n", + LASPoint_GetScanAngleRank(point) + ); + + fprintf(file, " Classification:\t%d\n", + LASPoint_GetClassification(point) + ); + fprintf(file, " Color:\t%d %d %d\n", + LASColor_GetRed(LASPoint_GetColor(point)), + LASColor_GetGreen(LASPoint_GetColor(point)), + LASColor_GetBlue(LASPoint_GetColor(point)) + ); +} +void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header) { + + long rgpsum = 0; + long pbretsum = 0; + + int i = 0; + + if (!summary) {LASError_Print("Point Summary does not exist!"); exit(1);} + + fprintf(file, "\n---------------------------------------------------------\n"); + fprintf(file, " Point Inspection Summary\n"); + fprintf(file, "---------------------------------------------------------\n"); + + fprintf(file, " Header Point Count: %d\n", + LASHeader_GetPointRecordsCount(header)); + + fprintf(file, " Actual Point Count: %d\n", + summary->number_of_point_records); + + fprintf(file, "\n Minimum and Maximum Attributes (min,max)\n"); + fprintf(file, "---------------------------------------------------------\n"); + + fprintf(file, " Min X,Y,Z: \t\t%.6f,%.6f,%.6f\n", + LASPoint_GetX(summary->pmin), + LASPoint_GetY(summary->pmin), + LASPoint_GetZ(summary->pmin) + ); + fprintf(file, " Max X,Y,Z: \t\t%.6f,%.6f,%.6f\n", + LASPoint_GetX(summary->pmax), + LASPoint_GetY(summary->pmax), + LASPoint_GetZ(summary->pmax) + ); + fprintf(file, " Bounding Box:\t\t%.2f,%.2f,%.2f,%.2f\n", + LASPoint_GetX(summary->pmin), + LASPoint_GetY(summary->pmin), + LASPoint_GetX(summary->pmax), + LASPoint_GetY(summary->pmax) + ); + fprintf(file, " Time:\t\t\t%.6f,%.6f\n", + LASPoint_GetTime(summary->pmin), + LASPoint_GetTime(summary->pmax) + ); + fprintf(file, " Return Number:\t%d,%d\n", + LASPoint_GetReturnNumber(summary->pmin), + LASPoint_GetReturnNumber(summary->pmax) + ); + fprintf(file, " Return Count:\t\t%d,%d\n", + LASPoint_GetNumberOfReturns(summary->pmin), + LASPoint_GetNumberOfReturns(summary->pmax) + ); + fprintf(file, " Flightline Edge:\t%d,%d\n", + LASPoint_GetFlightLineEdge(summary->pmin), + LASPoint_GetFlightLineEdge(summary->pmax) + ); + fprintf(file, " Intensity:\t\t%d,%d\n", + LASPoint_GetIntensity(summary->pmin), + LASPoint_GetIntensity(summary->pmax) + ); + fprintf(file, " Scan Direction Flag:\t%d,%d\n", + LASPoint_GetScanDirection(summary->pmin), + LASPoint_GetScanDirection(summary->pmax) + ); + fprintf(file, " Scan Angle Rank:\t%d,%d\n", + LASPoint_GetScanAngleRank(summary->pmin), + LASPoint_GetScanAngleRank(summary->pmax) + ); + fprintf(file, " Classification:\t%d,%d\n", + LASPoint_GetClassification(summary->pmin), + LASPoint_GetClassification(summary->pmax) + ); + fprintf(file, " Point Source Id:\t%d,%d\n", + LASPoint_GetPointSourceId(summary->pmin), + LASPoint_GetPointSourceId(summary->pmax) + ); + fprintf(file, " Minimum Color:\t %d %d %d\n", + LASColor_GetRed(LASPoint_GetColor(summary->pmin)), + LASColor_GetGreen(LASPoint_GetColor(summary->pmin)), + LASColor_GetBlue(LASPoint_GetColor(summary->pmin)) + ); + + fprintf(file, " Maximum Color:\t %d %d %d\n", + LASColor_GetRed(LASPoint_GetColor(summary->pmax)), + LASColor_GetGreen(LASPoint_GetColor(summary->pmax)), + LASColor_GetBlue(LASPoint_GetColor(summary->pmax)) + ); + + fprintf(file, "\n Number of Points by Return\n"); + fprintf(file, "---------------------------------------------------------\n"); + + for (i = 0; i < 5; i++) { + pbretsum = pbretsum + summary->number_of_points_by_return[i]; + fprintf(file, "\t(%d) %d", i,summary->number_of_points_by_return[i]); + } + fprintf(file, "\n Total Points: %ld\n", pbretsum); + + fprintf(file, "\n Number of Returns by Pulse\n"); + fprintf(file, "---------------------------------------------------------\n"); + + for (i = 1; i < 8; i++) { + rgpsum = rgpsum + summary->number_of_returns_of_given_pulse[i]; + fprintf(file, "\t(%d) %d", i,summary->number_of_returns_of_given_pulse[i]); + } + fprintf(file, "\n Total Pulses: %ld\n", rgpsum); + + + for (i = 0; i < 5; i++) { + if (LASHeader_GetPointRecordsByReturnCount(header, i) != summary->number_of_points_by_return[i]) + { + fprintf(file, " \n Actual number of points by return \n is different from header (actual, header):\n"); + for (i = 0; i < 5; i++) { + fprintf(file, "\t(%d,%d)", + summary->number_of_points_by_return[i], + LASHeader_GetPointRecordsByReturnCount(header, i) + ); + } + fprintf(file, "\n"); + } + } + + fprintf(file, "\n Point Classifications\n"); + fprintf(file, "---------------------------------------------------------\n"); + + for (i = 0; i < 32; i++) { + if (summary->classification[i]) { + fprintf(file, "\t%8d %s (%d)\n", + summary->classification[i], + LASPointClassification[i], + i); + } + } + + if (summary->classification_synthetic || summary->classification_keypoint || summary->classification_withheld) { + fprintf(file, "\n Point Classification Histogram\n"); + fprintf(file, "---------------------------------------------------------\n"); + + if (summary->classification_synthetic) fprintf(file, " +-> flagged as synthetic: %d\n", summary->classification_synthetic); + if (summary->classification_keypoint) fprintf(file, " +-> flagged as keypoints: %d\n", summary->classification_keypoint); + if (summary->classification_withheld) fprintf(file, " +-> flagged as withheld: %d\n", summary->classification_withheld); + } +} + + + +void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR) { + + char *pszSignature = NULL; + char *pszProjectId = NULL; + char *pszSystemId = NULL; + char *pszSoftwareId = NULL; + char *pszProj4 = NULL; + + char *pszVLRUser = NULL; + char *pszVLRDescription = NULL; + uint16_t nVLRLength = 0; + uint16_t nVLRRecordId = 0; + + LASVLRH pVLR = NULL; + LASSRSH pSRS = NULL; + uint32_t nVLR = 0; + int i = 0; + +#ifdef HAVE_GEOTIFF + const GTIF* pGTIF = NULL; +#else + const void* pGTIF = NULL; +#endif + + pszSignature = LASHeader_GetFileSignature(header); + pszProjectId = LASHeader_GetProjectId(header); + pszSystemId = LASHeader_GetSystemId(header); + pszSoftwareId = LASHeader_GetSoftwareId(header); + + pSRS = LASHeader_GetSRS(header); + pszProj4 = LASSRS_GetProj4(pSRS); + pGTIF = LASSRS_GetGTIF(pSRS); + + nVLR = LASHeader_GetRecordsCount(header); + + + + + fprintf(file, "\n---------------------------------------------------------\n"); + fprintf(file, " Header Summary\n"); + fprintf(file, "---------------------------------------------------------\n"); + + + fprintf(file, " File Name: %s\n", file_name); + + if (strcmp(pszSignature,"LASF") !=0) { + LASError_Print("File signature is not 'LASF'... aborting"); + exit(1); + } + fprintf(file, " Version: %d.%d\n", + LASHeader_GetVersionMajor(header), + LASHeader_GetVersionMinor(header)); + + fprintf(file, " Source ID: %d\n", + LASHeader_GetFileSourceId(header) ) ; + + fprintf(file, " Reserved: %d\n", + LASHeader_GetReserved(header) ); + + fprintf(file, " Project ID/GUID: '%s'\n", + pszProjectId); + + fprintf(file, " System Identifier: '%s'\n", + pszSystemId); + + fprintf(file, " Generating Software: '%s'\n", + pszSoftwareId); + + fprintf(file, " File Creation Day/Year: %d/%d\n", + LASHeader_GetCreationDOY(header), + LASHeader_GetCreationYear(header)); + + fprintf(file, " Header Size %d\n", + LASHeader_GetHeaderSize(header)); + + fprintf(file, " Offset to Point Data %d\n", + LASHeader_GetDataOffset(header)); + + fprintf(file, " Number Var. Length Records %d\n", + LASHeader_GetRecordsCount(header)); + + fprintf(file, " Point Data Format %d\n", + LASHeader_GetDataFormatId(header)); + + fprintf(file, " Point Data Record Length %d\n", + LASHeader_GetDataRecordLength(header)); + + fprintf(file, " Number of Point Records %d\n", + LASHeader_GetPointRecordsCount(header)); + + fprintf(file, " Number of Points by Return %d %d %d %d %d\n", + LASHeader_GetPointRecordsByReturnCount(header, 0), + LASHeader_GetPointRecordsByReturnCount(header, 1), + LASHeader_GetPointRecordsByReturnCount(header, 2), + LASHeader_GetPointRecordsByReturnCount(header, 3), + LASHeader_GetPointRecordsByReturnCount(header, 4)); + + fprintf(file, " Scale Factor X Y Z %.6g %.6g %.6g\n", + LASHeader_GetScaleX(header), + LASHeader_GetScaleY(header), + LASHeader_GetScaleZ(header)); + + fprintf(file, " Offset X Y Z %.6f %.6f %.6f\n", + LASHeader_GetOffsetX(header), + LASHeader_GetOffsetY(header), + LASHeader_GetOffsetZ(header)); + + fprintf(file, " Min X Y Z %.6f %.6f %.6f\n", + LASHeader_GetMinX(header), + LASHeader_GetMinY(header), + LASHeader_GetMinZ(header)); + + fprintf(file, " Max X Y Z %.6f %.6f %.6f\n", + LASHeader_GetMaxX(header), + LASHeader_GetMaxY(header), + LASHeader_GetMaxZ(header)); + + fprintf(file, " Spatial Reference %s\n", + pszProj4); +#ifdef HAVE_LIBGEOTIFF + if (pGTIF) GTIFPrint((GTIF*)pGTIF, 0, 0); +#endif + if (nVLR && !bSkipVLR) { + + fprintf(file, "\n---------------------------------------------------------\n"); + fprintf(file, " VLR Summary\n"); + fprintf(file, "---------------------------------------------------------\n"); + + for (i = 0; i < (int)nVLR; i++) { + pVLR = LASHeader_GetVLR(header, i); + + if (LASError_GetLastErrorNum()) { + LASError_Print("Unable to fetch VLR"); + exit(1); + } + + pszVLRUser = LASVLR_GetUserId(pVLR); + pszVLRDescription = LASVLR_GetDescription(pVLR); + nVLRLength = LASVLR_GetRecordLength(pVLR); + nVLRRecordId = LASVLR_GetRecordId(pVLR); + + + fprintf(file, " User: '%s' - Description: '%s'\n", pszVLRUser, pszVLRDescription); + fprintf(file, " ID: %d Length: %d\n\n", nVLRRecordId, nVLRLength); + + LASVLR_Destroy(pVLR); + pVLR = NULL; + + free(pszVLRUser); + free(pszVLRDescription); + } + + } + free(pszSignature); + free(pszProjectId); + free(pszSystemId); + free(pszSoftwareId); + free(pszProj4); +} + +void repair_header(FILE *file, LASHeaderH header, LASPointSummary* summary) { + + int repair_bounding_box = FALSE; + int update_return_counts = FALSE; + int err = 0; + int i = 0; + + if (! header) { + LASError_Print("Inputted header to repair_header was NULL "); + exit(1); + } + + if (! summary) { + LASError_Print("Inputted summary to repair_header was NULL "); + exit(1); + + } + + + if (! repair_bounding_box) { + if ( LASHeader_GetMinX(header) != LASPoint_GetX(summary->pmin) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMinY(header) != LASPoint_GetY(summary->pmin) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMinZ(header) != LASPoint_GetZ(summary->pmin) ) + repair_bounding_box = TRUE; + + if ( LASHeader_GetMaxX(header) != LASPoint_GetX(summary->pmax) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMaxY(header) != LASPoint_GetY(summary->pmax) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMaxZ(header) != LASPoint_GetZ(summary->pmax) ) + repair_bounding_box = TRUE; + } + + if (repair_bounding_box) { + fprintf(file, " Reparing Bounding Box...\n"); + err = LASHeader_SetMin( header, + LASPoint_GetX(summary->pmin), + LASPoint_GetY(summary->pmin), + LASPoint_GetZ(summary->pmin) + ); + if (err) { + LASError_Print("Could not set minimum for header "); + exit(1); + } + err = LASHeader_SetMax( header, + LASPoint_GetX(summary->pmax), + LASPoint_GetY(summary->pmax), + LASPoint_GetZ(summary->pmax) + ); + if (err) { + LASError_Print("Could not set minimum for header "); + exit(1); + } + + } + + + for (i = 0; i < 5; i++) { + + if (LASHeader_GetPointRecordsByReturnCount(header, i) != + summary->number_of_points_by_return[i]) + { + update_return_counts = TRUE; + break; + } + } + + if (update_return_counts) { + fprintf(file, " Reparing Point Count by Return...\n"); + for (i = 0; i < 5; i++) { + LASHeader_SetPointRecordsByReturnCount( header, + i, + summary->number_of_points_by_return[i]); + } + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lasdiff.c work/libLAS-1.2.1/apps/lasdiff.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lasdiff.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/lasdiff.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,399 @@ +/*************************************************************************** + * $Id$ + * $Date$ + * + * Project: libLAS -- C/C++ read/write library for LAS LIDAR data + * Purpose: LAS difference scanning + * Author: Martin Isenburg isenburg@cs.unc.edu + *************************************************************************** + * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu + * + * See LICENSE.txt in this source distribution for more information. + **************************************************************************/ + +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif + + +#include +#include +#include + +#include + + +void usage() +{ + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," lasdiff (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"lasdiff lidar1.las lidar2.las\n"); + fprintf(stderr,"lasdiff lidar1.las lidar1.las.lz\n"); + fprintf(stderr,"lasdiff -i lidar1.las -i lidar1.laz\n"); + fprintf(stderr,"lasdiff -h\n"); + fprintf(stderr, "\nFor more information, see the full documentation for lasdiff at:\n" + " http://liblas.org/browser/trunk/doc/lasdiff.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); +} + +static int lidardouble2string(char* string, double value0, double value1) +{ + int len; + len = sprintf(string, "%f", value0) - 1; + while (string[len] == '0') len--; + if (string[len] != '.') len++; + len += sprintf(&(string[len]), " %f", value1) - 1; + while (string[len] == '0') len--; + if (string[len] != '.') len++; + string[len] = '\0'; + return len; +} + +void print_error(char* message) { + + if (LASError_GetErrorCount()) { + fprintf(stdout, + "%s: %s (%d) from method %s\n", + message, + LASError_GetLastErrorMsg(), + LASError_GetLastErrorNum(), + LASError_GetLastErrorMethod() + ); + } else { + fprintf(stdout, + "You have encountered an error. '%s'\n", + message + ); + } + +} + +int main(int argc, char *argv[]) +{ + int i; + char* file_name_in1 = 0; + char* file_name_in2 = 0; + + LASReaderH reader1 = NULL; + LASReaderH reader2 = NULL; + + for (i = 1; i < argc; i++) + { + if (strcmp(argv[i],"-i") == 0) + { + i++; + if (file_name_in1) file_name_in2 = argv[i]; + else file_name_in1 = argv[i]; + } + else if (i == argc - 2 && file_name_in1 == 0 && file_name_in2 == 0) + { + if (file_name_in1) file_name_in2 = argv[i]; + else file_name_in1 = argv[i]; + } + else if (i == argc - 1 && file_name_in1 && file_name_in2 == 0) + { + if (file_name_in1) file_name_in2 = argv[i]; + else file_name_in1 = argv[i]; + } + else + { + usage(); + } + } + + + if (file_name_in1) + { + reader1 = LASReader_Create(file_name_in1); + if (!reader1) { + print_error("Could not open file 1"); + exit(1); + } + } + else + { + print_error("No input specified for first file"); + } + + if (file_name_in2) + { + reader2 = LASReader_Create(file_name_in2); + if (!reader2) { + print_error("Could not open file 2"); + exit(1); + } + } + else + { + print_error("No input specified for second file"); + usage(); + } + + + + // check header + + if (memcmp((const void*)&(lasreader1->header), (const void*)&(lasreader2->header), sizeof(LASheader))) + { + char printstring[128]; + + fprintf(stderr, "header is different\n"); + + LASheader* lasheader1 = &(lasreader1->header); + LASheader* lasheader2 = &(lasreader2->header); + + bool fatal_difference = false; + + if (strncmp(lasheader1->file_signature, lasheader2->file_signature, 4)) + { + fprintf(stderr, " file_signature: %s %s\n", lasheader1->file_signature, lasheader2->file_signature); + } + if (lasheader2->file_source_id != lasheader2->file_source_id) + { + fprintf(stderr, " file_source_id: %d %d\n", lasheader1->file_source_id, lasheader2->file_source_id); + } + if (lasheader1->reserved != lasheader2->reserved) + { + fprintf(stderr, " reserved: %d %d\n", lasheader1->reserved, lasheader2->reserved); + } + if (lasheader1->project_ID_GUID_data_1 != lasheader2->project_ID_GUID_data_1) + { + fprintf(stderr, " project_ID_GUID_data_1: %d %d\n", lasheader1->project_ID_GUID_data_1, lasheader2->project_ID_GUID_data_1); + } + if (lasheader1->project_ID_GUID_data_2 != lasheader2->project_ID_GUID_data_2) + { + fprintf(stderr, " project_ID_GUID_data_2: %d %d\n", lasheader1->project_ID_GUID_data_2, lasheader2->project_ID_GUID_data_2); + } + if (lasheader1->project_ID_GUID_data_3 != lasheader2->project_ID_GUID_data_3) + { + fprintf(stderr, " project_ID_GUID_data_3: %d %d\n", lasheader1->project_ID_GUID_data_3, lasheader2->project_ID_GUID_data_3); + } + if (strncmp(lasheader1->project_ID_GUID_data_4, lasheader2->project_ID_GUID_data_4, 8)) + { + fprintf(stderr, " project_ID_GUID_data_4: %s %s\n", lasheader1->project_ID_GUID_data_4, lasheader2->project_ID_GUID_data_4); + } + if (lasheader1->version_major != lasheader2->version_major || lasheader1->version_minor != lasheader2->version_minor) + { + fprintf(stderr, " version: %d.%d %d.%d\n", lasheader1->version_major, lasheader1->version_minor, lasheader2->version_major, lasheader2->version_minor); + } + if (strncmp(lasheader1->system_identifier, lasheader2->system_identifier, 32)) + { + fprintf(stderr, " system_identifier: %s %s\n", lasheader1->system_identifier, lasheader2->system_identifier); + } + if (strncmp(lasheader1->generating_software, lasheader2->generating_software, 32)) + { + fprintf(stderr, " generating_software: %s %s\n", lasheader1->generating_software, lasheader2->generating_software); + } + if (lasheader1->file_creation_day != lasheader2->file_creation_day || lasheader1->file_creation_year != lasheader2->file_creation_year) + { + fprintf(stderr, " file_creation day.year: %d.%d %d.%d\n", lasheader1->file_creation_day, lasheader1->file_creation_year, lasheader2->file_creation_day, lasheader2->file_creation_year); + } + if (lasheader1->header_size != lasheader2->header_size) + { + fprintf(stderr, " header_size: %d %d\n", lasheader1->header_size, lasheader2->header_size); + fatal_difference = true; + } + if (lasheader1->offset_to_point_data != lasheader2->offset_to_point_data) + { + fprintf(stderr, " offset_to_point_data: %d %d\n", lasheader1->offset_to_point_data, lasheader2->offset_to_point_data); + } + if (lasheader1->point_data_format != lasheader2->point_data_format) + { + fprintf(stderr, " point_data_format: %d %d\n", lasheader1->point_data_format, lasheader2->point_data_format); + fatal_difference = true; + } + if (lasheader1->point_data_record_length != lasheader2->point_data_record_length) + { + fprintf(stderr, " point_data_record_length: %d %d\n", lasheader1->point_data_record_length, lasheader2->point_data_record_length); + fatal_difference = true; + } + if (lasheader1->number_of_point_records != lasheader2->number_of_point_records) + { + fprintf(stderr, " number_of_point_records: %d %d\n", lasheader1->number_of_point_records, lasheader2->number_of_point_records); + fatal_difference = true; + } + if (lasheader1->number_of_points_by_return[0] != lasheader2->number_of_points_by_return[0] || lasheader1->number_of_points_by_return[1] != lasheader2->number_of_points_by_return[1] || lasheader1->number_of_points_by_return[2] != lasheader2->number_of_points_by_return[2] || lasheader1->number_of_points_by_return[3] != lasheader2->number_of_points_by_return[3] || lasheader1->number_of_points_by_return[4] != lasheader2->number_of_points_by_return[4]) + { + fprintf(stderr, " number_of_points_by_return: (%d,%d,%d,%d,%d) (%d,%d,%d,%d,%d)\n", lasheader1->number_of_points_by_return[0], lasheader1->number_of_points_by_return[1], lasheader1->number_of_points_by_return[2], lasheader1->number_of_points_by_return[3], lasheader1->number_of_points_by_return[4], lasheader2->number_of_points_by_return[0], lasheader2->number_of_points_by_return[1], lasheader2->number_of_points_by_return[2], lasheader2->number_of_points_by_return[3], lasheader2->number_of_points_by_return[4]); + } + if (lasheader1->x_scale_factor != lasheader2->x_scale_factor) + { + lidardouble2string(printstring, lasheader1->x_scale_factor, lasheader2->x_scale_factor); fprintf(stderr, " x_scale_factor: %s\n", printstring); + fatal_difference = true; + } + if (lasheader1->y_scale_factor != lasheader2->y_scale_factor) + { + lidardouble2string(printstring, lasheader1->y_scale_factor, lasheader2->y_scale_factor); fprintf(stderr, " y_scale_factor: %s\n", printstring); + fatal_difference = true; + } + if (lasheader1->z_scale_factor != lasheader2->z_scale_factor) + { + lidardouble2string(printstring, lasheader1->z_scale_factor, lasheader2->z_scale_factor); fprintf(stderr, " z_scale_factor: %s\n", printstring); + fatal_difference = true; + } + if (lasheader1->x_offset != lasheader2->x_offset) + { + lidardouble2string(printstring, lasheader1->x_offset, lasheader2->x_offset); fprintf(stderr, " x_offset: %s\n", printstring); + fatal_difference = true; + } + if (lasheader1->y_offset != lasheader2->y_offset) + { + lidardouble2string(printstring, lasheader1->y_offset, lasheader2->y_offset); fprintf(stderr, " y_offset: %s\n", printstring); + fatal_difference = true; + } + if (lasheader1->z_offset != lasheader2->z_offset) + { + lidardouble2string(printstring, lasheader1->z_offset, lasheader2->z_offset); fprintf(stderr, " z_offset: %s\n", printstring); + fatal_difference = true; + } + if (lasheader1->max_x != lasheader2->max_x) + { + lidardouble2string(printstring, lasheader1->max_x, lasheader2->max_x); fprintf(stderr, " max_x: %s\n", printstring); + } + if (lasheader1->min_x != lasheader2->min_x) + { + lidardouble2string(printstring, lasheader1->min_x, lasheader2->min_x); fprintf(stderr, " min_x: %s\n", printstring); + } + if (lasheader1->max_y != lasheader2->max_y) + { + lidardouble2string(printstring, lasheader1->max_y, lasheader2->max_y); fprintf(stderr, " max_y: %s\n", printstring); + } + if (lasheader1->min_y != lasheader2->min_y) + { + lidardouble2string(printstring, lasheader1->min_y, lasheader2->min_y); fprintf(stderr, " min_y: %s\n", printstring); + } + if (lasheader1->max_z != lasheader2->max_z) + { + lidardouble2string(printstring, lasheader1->max_z, lasheader2->max_z); fprintf(stderr, " max_z: %s\n", printstring); + } + if (lasheader1->min_z != lasheader2->min_z) + { + lidardouble2string(printstring, lasheader1->min_z, lasheader2->min_z); fprintf(stderr, " min_z: %s\n", printstring); + } + if (fatal_difference) + { + fprintf(stderr, "difference was fatal ... no need to check points\n"); + exit(1); + } + } + + // check variable header (and user data) + + if (lasreader1->header.offset_to_point_data == lasreader2->header.offset_to_point_data) + { + bool already_output = false; + for (unsigned int u = lasreader1->header.header_size; u < lasreader1->header.offset_to_point_data; u++) + { + if (fgetc(file_in1) != fgetc(file_in2)) + { + if (!already_output) + { + fprintf(stderr, "variable header (or user data) is different at byte %d of %d\n", lasreader1->header.header_size - u, lasreader1->header.offset_to_point_data - u); + already_output = true; + } + } + } + } + else + { + unsigned int u; + fprintf(stderr, "skipping check of variable header (or user data) due to length difference\n"); + for (u = lasreader1->header.header_size; u < lasreader1->header.offset_to_point_data; u++) fgetc(file_in1); + for (u = lasreader2->header.header_size; u < lasreader2->header.offset_to_point_data; u++) fgetc(file_in2); + } + + // check points + + while (true) + { + if (lasreader1->read_point()) + { + if (lasreader2->read_point()) + { + if (memcmp((const void*)&(lasreader1->point), (const void*)&(lasreader2->point), sizeof(LASpoint))) + { + fprintf(stderr, "point %d of %d is different\n", lasreader1->p_count, lasreader1->npoints); + if (lasreader1->point.x != lasreader2->point.x) + { + fprintf(stderr, " x: %d %d\n", lasreader1->point.x, lasreader2->point.x); + } + if (lasreader1->point.y != lasreader2->point.y) + { + fprintf(stderr, " y: %d %d\n", lasreader1->point.y, lasreader2->point.y); + } + if (lasreader1->point.z != lasreader2->point.z) + { + fprintf(stderr, " z: %d %d\n", lasreader1->point.z, lasreader2->point.z); + } + if (lasreader1->point.intensity != lasreader2->point.intensity) + { + fprintf(stderr, " intensity: %d %d\n", lasreader1->point.intensity, lasreader2->point.intensity); + } + if (lasreader1->point.return_number != lasreader2->point.return_number) + { + fprintf(stderr, " return_number: %d %d\n", lasreader1->point.return_number, lasreader2->point.return_number); + } + if (lasreader1->point.number_of_returns_of_given_pulse != lasreader2->point.number_of_returns_of_given_pulse) + { + fprintf(stderr, " number_of_returns_of_given_pulse: %d %d\n", lasreader1->point.number_of_returns_of_given_pulse, lasreader2->point.number_of_returns_of_given_pulse); + } + if (lasreader1->point.scan_direction_flag != lasreader2->point.scan_direction_flag) + { + fprintf(stderr, " scan_direction_flag: %d %d\n", lasreader1->point.scan_direction_flag, lasreader2->point.scan_direction_flag); + } + if (lasreader1->point.edge_of_flight_line != lasreader2->point.edge_of_flight_line) + { + fprintf(stderr, " edge_of_flight_line: %d %d\n", lasreader1->point.edge_of_flight_line, lasreader2->point.edge_of_flight_line); + } + if (lasreader1->point.classification != lasreader2->point.classification) + { + fprintf(stderr, " classification: %d %d\n", lasreader1->point.classification, lasreader2->point.classification); + } + if (lasreader1->point.scan_angle_rank != lasreader2->point.scan_angle_rank) + { + fprintf(stderr, " scan_angle_rank: %d %d\n", lasreader1->point.scan_angle_rank, lasreader2->point.scan_angle_rank); + } + if (lasreader1->point.user_data != lasreader2->point.user_data) + { + fprintf(stderr, " user_data: %d %d\n", lasreader1->point.user_data, lasreader2->point.user_data); + } + if (lasreader1->point.point_source_ID != lasreader2->point.point_source_ID) + { + fprintf(stderr, " point_source_ID: %d %d\n", lasreader1->point.point_source_ID, lasreader2->point.point_source_ID); + } + exit(1); + } + } + else + { + fprintf(stderr, "%s has fewer points (%d) than %s\n", lasreader2->p_count, file_name_in2, file_name_in1); + exit(1); + } + } + else + { + if (lasreader2->read_point()) + { + fprintf(stderr, "%s has more points (%d) than %s\n", file_name_in2, lasreader2->p_count, file_name_in1); + exit(1); + } + else + { + break; + } + } + } + + fprintf(stderr, "files are identical. both have %d points\n", lasreader1->p_count); + + lasreader1->close(); + lasreader2->close(); + + fclose(file_in1); + fclose(file_in2); + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lasinfo.c work/libLAS-1.2.1/apps/lasinfo.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lasinfo.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/lasinfo.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,418 @@ +/*************************************************************************** + * $Id$ + * $Date$ + * + * Project: libLAS -- C/C++ read/write library for LAS LIDAR data + * Purpose: LAS information reporting and setting + * Author: Martin Isenburg isenburg@cs.unc.edu + *************************************************************************** + * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu + * + * See LICENSE.txt in this source distribution for more information. + **************************************************************************/ + +/* TODO: Remove before releasing */ +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif + + +#include +#include +#include + +#include + + +LASPointSummary* SummarizePoints(LASReaderH reader); +void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header); +void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR); + +void usage() +{ + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," lasinfo (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Printing simple header info:\n"); + fprintf(stderr," lasinfo lidar.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Checking point information:\n"); + fprintf(stderr," lasinfo --input lidar.las --check\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Print header info and point summary and redirect output to a file:\n"); + fprintf(stderr," lasinfo --check --input lidar.las 2> output.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Read from stdin, scan the points, and skip printing VLR info:\n"); + fprintf(stderr," lasinfo --stdin --check --skip_vlr < lidar.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Repairing header info to reflect point data:\n"); + fprintf(stderr," lasinfo -i lidar.las --repair\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Altering header info:\n"); + fprintf(stderr, " lasinfo -i lidar.las --system_identifier \"hello world!\" " + "--generating_software \"this is a test (-:\" --file_creation 8 2007\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Print this output:\n"); + fprintf(stderr, " lasinfo --help\n"); + fprintf(stderr,"\n"); + + fprintf(stderr, "\nFor more information, see the full documentation for lasinfo at:\n" + " http://liblas.org/browser/trunk/doc/lasinfo.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + +} + + + +int main(int argc, char *argv[]) +{ + int i; + char* file_name = NULL; + + LASReaderH reader = NULL; + LASHeaderH header = NULL; + LASWriterH writer = NULL; + + int check_points = FALSE; + int repair_header = FALSE; + int change_header = FALSE; + int repair_bounding_box = FALSE; + int use_stdin = FALSE; + int update_return_counts = FALSE; + int skip_vlr = FALSE; + + + char *system_identifier = NULL; + char *generating_software = NULL; + uint8_t file_creation_day = 0; + uint8_t file_creation_year = 0; + + int err = 0; + + LASPointSummary* summary = NULL; + + for (i = 1; i < argc; i++) + { + if ( strcmp(argv[i],"-h") == 0 || + strcmp(argv[i],"--help") == 0 + ) + { + usage(); + exit(0); + } + else if ( strcmp(argv[i],"--input") == 0 || + strcmp(argv[i],"-input") == 0 || + strcmp(argv[i],"-i") == 0 || + strcmp(argv[i],"-in") == 0 + ) + { + i++; + file_name = argv[i]; + } + else if ( strcmp(argv[i], "--points") == 0 || + strcmp(argv[i], "--check") == 0 || + strcmp(argv[i], "--check_points") == 0 || + strcmp(argv[i], "-c") == 0 || + strcmp(argv[i], "-points") == 0 || + strcmp(argv[i], "-check") == 0 || + strcmp(argv[i], "-check_points") == 0 + ) + { + check_points = TRUE; + } + else if ( strcmp(argv[i], "--nocheck") == 0 || + strcmp(argv[i], "-nocheck") == 0 + ) + { + check_points = FALSE; + } + else if ( strcmp(argv[i], "--stdin") == 0 || + strcmp(argv[i], "-ilas") == 0 + ) + { + use_stdin = TRUE; + } + + else if ( strcmp(argv[i], "--repair") == 0 || + strcmp(argv[i], "-r") == 0 || + strcmp(argv[i], "-repair_header") == 0 || + strcmp(argv[i], "-repair") == 0 + ) + { + repair_header = TRUE; + check_points = TRUE; + } + + else if ( strcmp(argv[i], "--repair_bb") == 0 || + strcmp(argv[i], "--repair_bounding_box") == 0 || + strcmp(argv[i], "--repair_boundingbox") == 0 || + strcmp(argv[i], "-repair_bb") == 0 || + strcmp(argv[i], "-repair_bounding_box") == 0 || + strcmp(argv[i], "-repair_boundingbox") == 0 || + strcmp(argv[i], "-repair") == 0 || + strcmp(argv[i], "-rb") == 0 + + ) + { + repair_bounding_box = TRUE; + check_points = TRUE; + } + + else if ( strcmp(argv[i],"--system_identifier") == 0 || + strcmp(argv[i],"-system_identifier") == 0 || + strcmp(argv[i],"-s") == 0 || + strcmp(argv[i],"-sys_id") == 0) + { + i++; + system_identifier = (char*) malloc(31 * sizeof(char)); + strcpy(system_identifier, argv[i]); + change_header = TRUE; + } + + else if ( strcmp(argv[i],"--generating_software") == 0 || + strcmp(argv[i],"-generating_software") == 0 || + strcmp(argv[i],"-g") == 0 || + strcmp(argv[i],"-gen_soft") == 0) + { + i++; + generating_software = (char*) malloc(31*sizeof(char)); + strcpy(generating_software, argv[i]); + change_header = TRUE; + } + + else if ( strcmp(argv[i],"--file_creation") == 0 || + strcmp(argv[i],"-file_creation") == 0) + { + /* XXX - mloskot: Consider replacing atoi with strtol, + see http://www.iso-9899.info/wiki/Converting */ + i++; + file_creation_day = (uint8_t)atoi(argv[i]); + i++; + file_creation_year = (uint8_t)atoi(argv[i]); + change_header = TRUE; + } + else if ( strcmp(argv[i],"--skip_vlr") == 0 || + strcmp(argv[i],"--no_vlr") == 0) + { + skip_vlr = TRUE; + } + else if (file_name == NULL) + { + file_name = argv[i]; + } + else + { + usage(); + exit(1); + fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); + } + } + + if (use_stdin) { + file_name = "stdin"; + } + + if (!file_name) { + LASError_Print("No filename was provided to be opened"); + usage(); + exit(1); + } + + reader = LASReader_Create(file_name); + if (!reader) { + LASError_Print("Could not open file "); + exit(1); + } + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not get LASHeader "); + exit(1); + } + + + + print_header(stdout, header, file_name, skip_vlr); + + if (change_header) { + if (system_identifier) { + err = LASHeader_SetSystemId (header, system_identifier); + if (err) LASError_Print("Could not set SystemId"); + } + if (generating_software) { + err = LASHeader_SetSoftwareId(header, generating_software); + if (err) LASError_Print("Could not set SoftwareId"); + } + if ( file_creation_day || file_creation_year) { + err = LASHeader_SetCreationDOY(header, file_creation_day); + if (err) LASError_Print("Could not set file creation day"); + err = LASHeader_SetCreationYear(header, file_creation_year); + if (err) LASError_Print("Could not set file creation year"); + } + + /* We need to wipe out the reader and make a writer. */ + if (reader) { + LASReader_Destroy(reader); + reader = NULL; + } + + writer = LASWriter_Create(file_name, header, LAS_MODE_APPEND); + if (!writer) { + LASError_Print("Problem creating LASWriterH object"); + LASHeader_Destroy(header); + header = NULL; + exit(1); + } + + if (writer) LASWriter_Destroy(writer); + writer = NULL; + if (header) LASHeader_Destroy(header); + header = NULL; + } + + if (check_points) + { + if (!reader) { + reader = LASReader_Create(file_name); + if (!reader) { + LASError_Print("Could not open file "); + exit(1); + } + } + + if (! header) { + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not get LASHeader "); + exit(1); + } + } + + if (!summary) + summary = SummarizePoints(reader); + print_point_summary(stdout, summary, header); + + if (repair_header) { + fprintf(stdout, "\n---------------------------------------------------------\n"); + fprintf(stdout, " Repair Summary\n"); + fprintf(stdout, "---------------------------------------------------------\n"); + + + if (use_stdin) { + LASError_Print("Cannot update header information on piped input!"); + exit(1); + } + + + if (! header) { + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not get LASHeader "); + exit(1); + } + } + + if (! repair_bounding_box) { + if ( LASHeader_GetMinX(header) != LASPoint_GetX(summary->pmin) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMinY(header) != LASPoint_GetY(summary->pmin) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMinZ(header) != LASPoint_GetZ(summary->pmin) ) + repair_bounding_box = TRUE; + + if ( LASHeader_GetMaxX(header) != LASPoint_GetX(summary->pmax) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMaxY(header) != LASPoint_GetY(summary->pmax) ) + repair_bounding_box = TRUE; + if ( LASHeader_GetMaxZ(header) != LASPoint_GetZ(summary->pmax) ) + repair_bounding_box = TRUE; + } + + if (repair_bounding_box) { + fprintf(stdout, " Reparing Bounding Box...\n"); + err = LASHeader_SetMin( header, + LASPoint_GetX(summary->pmin), + LASPoint_GetY(summary->pmin), + LASPoint_GetZ(summary->pmin) + ); + if (err) { + LASError_Print("Could not set minimum for header "); + exit(1); + } + err = LASHeader_SetMax( header, + LASPoint_GetX(summary->pmax), + LASPoint_GetY(summary->pmax), + LASPoint_GetZ(summary->pmax) + ); + if (err) { + LASError_Print("Could not set minimum for header "); + exit(1); + } + + } + + + for (i = 0; i < 5; i++) { + + if (LASHeader_GetPointRecordsByReturnCount(header, i) != + summary->number_of_points_by_return[i]) + { + update_return_counts = TRUE; + break; + } + } + + if (update_return_counts) { + fprintf(stdout, " Reparing Point Count by Return...\n"); + for (i = 0; i < 5; i++) { + LASHeader_SetPointRecordsByReturnCount( header, + i, + summary->number_of_points_by_return[i]); + } + } + + + + + if (reader) { + LASReader_Destroy(reader); + reader = NULL; + } + + writer = LASWriter_Create(file_name, header, LAS_MODE_APPEND); + if (!writer) { + LASError_Print("Problem creating LASWriterH object for append"); + LASHeader_Destroy(header); + header = NULL; + exit(1); + } + LASWriter_Destroy(writer); + writer = NULL; + LASHeader_Destroy(header); + header = NULL; + + + } + if (summary) { + LASPoint_Destroy(summary->pmin); + LASPoint_Destroy(summary->pmax); + free(summary); + + } + +} + + if (reader) LASReader_Destroy(reader); + if (header) LASHeader_Destroy(header); + + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lasmerge.c work/libLAS-1.2.1/apps/lasmerge.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/lasmerge.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/lasmerge.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,512 @@ +/*************************************************************************** + * $Id$ + * $Date$ + * + * Project: libLAS -- C/C++ read/write library for LAS LIDAR data + * Purpose: LAS file merging + * Author: Martin Isenburg isenburg@cs.unc.edu + *************************************************************************** + * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu + * + * See LICENSE.txt in this source distribution for more information. + **************************************************************************/ + + +#include +#include +#include +#include + +#include "liblas.h" + +LASPointSummary* SummarizePoints(LASReaderH reader); +void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header); +void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR); + +void usage() +{ + + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," lasmerge (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge using a list of files:\n"); + fprintf(stderr," lasmerge -i lasfiles.txt -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Manually list files to merge:\n"); + fprintf(stderr," lasmerge -i file1.las -i file2.las -i file3.las -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge to stdout:\n"); + fprintf(stderr," lasmerge -i file1.las -i file2.las --stdout\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge and set scale:\n"); + fprintf(stderr, " lasmerge --input lasfiles.txt --scale 0.01 --output out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge and set scale individually:\n"); + fprintf(stderr, " lasmerge --input lasfiles.txt --xyz_scale 0.01 0.01 0.1 --output out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge and set offset individually:\n"); + fprintf(stderr, " lasmerge --input lasfiles.txt --xyz_offset 0.01 0.01 0.1 --output out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Print this output:\n"); + fprintf(stderr, " lasmerge --help\n"); + fprintf(stderr,"\n"); + + fprintf(stderr, "For more information, see the full documentation for lasmerge at:\n" + " http://liblas.org/browser/trunk/doc/lasmerge.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + +} + +void ptime(const char *const msg) +{ + float t= ((float)clock())/CLOCKS_PER_SEC; + fprintf(stderr, "cumulative CPU time thru %s = %f\n", msg, t); +} + +int main(int argc, char *argv[]) +{ + int i; + int verbose = FALSE; + int skip_vlr = FALSE; + int num_file_name_in = 0; + int alloced_file_name_in = 32; + char** file_names_in = (char**)malloc(sizeof(char*)*alloced_file_name_in); + char* file_name_out = 0; + int use_stdout = FALSE; + double xyz_scale[3] = {0.0, 0.0, 0.0}; + double xyz_offset[3] = {0.0, 0.0, 0.0}; + + double minx, miny, maxx, maxy, minz, maxz; + double x_scale_factor, y_scale_factor, z_scale_factor; + + + LASHeaderH merged_header=NULL; + LASHeaderH header = NULL; + LASReaderH reader = NULL; + LASWriterH writer = NULL; + LASPointH p = NULL; + + FILE* file = NULL; + + int smallest_int = (1<<31)+10; + int largest_int = smallest_int-1-20; + + int same = TRUE; + LASPointSummary* summary = NULL; + + for (i = 1; i < argc; i++) + { + if ( strcmp(argv[i],"-h") == 0 || + strcmp(argv[i],"--help") == 0 + ) + { + usage(); + exit(0); + } + else if ( strcmp(argv[i],"-v") == 0 || + strcmp(argv[i],"--verbose") == 0 + ) + { + verbose = TRUE; + } + else if ( strcmp(argv[i],"--input") == 0 || + strcmp(argv[i],"-input") == 0 || + strcmp(argv[i],"-i") == 0 || + strcmp(argv[i],"-in") == 0 + ) + { + i++; + if (num_file_name_in == alloced_file_name_in) + { + alloced_file_name_in *= 2; + file_names_in = (char**)realloc(file_names_in,sizeof(char*)*alloced_file_name_in); + } + file_names_in[num_file_name_in] = argv[i]; + num_file_name_in++; + } + else if ( strcmp(argv[i],"--output") == 0 || + strcmp(argv[i],"--out") == 0 || + strcmp(argv[i],"-out") == 0 || + strcmp(argv[i],"-o") == 0 + ) + { + i++; + file_name_out = argv[i]; + } + else if ( strcmp(argv[i],"--scale") == 0 || + strcmp(argv[i],"-scale") == 0 || + strcmp(argv[i],"-s") == 0 + ) + { + + i++; + sscanf(argv[i], "%lf", &(xyz_scale[2])); + xyz_scale[0] = xyz_scale[1] = xyz_scale[2]; + } + else if ( strcmp(argv[i],"--xyz_scale") == 0 || + strcmp(argv[i],"-xyz_scale") == 0 + ) + + { + i++; + sscanf(argv[i], "%lf", &(xyz_scale[0])); + i++; + sscanf(argv[i], "%lf", &(xyz_scale[1])); + i++; + sscanf(argv[i], "%lf", &(xyz_scale[2])); + } + else if ( strcmp(argv[i],"--xyz_offset") == 0 || + strcmp(argv[i],"-xyz_offset") == 0 + ) + { + i++; + sscanf(argv[i], "%lf", &(xyz_offset[0])); + i++; + sscanf(argv[i], "%lf", &(xyz_offset[1])); + i++; + sscanf(argv[i], "%lf", &(xyz_offset[2])); + } + else if ( strcmp(argv[i],"--stdout") == 0 || + strcmp(argv[i],"-olas") == 0 + ) + { + use_stdout = TRUE; + file_name_out = "stdout"; + } + else if ( strcmp(argv[i],"--skip_vlr") == 0 || + strcmp(argv[i],"--no_vlr") == 0) + { + skip_vlr = TRUE; + } + else if (i == argc - 2 && num_file_name_in == 0 && file_name_out == 0) + { + file_names_in[0] = argv[i]; + num_file_name_in = 1; + } + else if (i == argc - 1 && num_file_name_in == 0 && file_name_out == 0) + { + file_names_in[0] = argv[i]; + num_file_name_in = 1; + } + else if (i == argc - 1 && num_file_name_in != 0 && file_name_out == 0) + { + file_name_out = argv[i]; + } + else + { + fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); + usage(); + exit(1); + } + } + + if (num_file_name_in == 0) + { + fprintf(stderr, "ERROR: no input specified\n"); + usage(); + exit(1); + } + + if ( num_file_name_in == 1 && + strstr(file_names_in[0],".las") == 0 && + strstr(file_names_in[0],".LAS") == 0 + ) + { + char line[512]; + + num_file_name_in = 0; + file = fopen(file_names_in[0], "r"); + while (fgets(line, sizeof(char) * 512, file)) + { + if (strstr(line,".las") || strstr(line,".LAS") ) + { + if (num_file_name_in == alloced_file_name_in) + { + alloced_file_name_in *= 2; + file_names_in = (char**)realloc(file_names_in,sizeof(char*)*alloced_file_name_in); + } + file_names_in[num_file_name_in] = strdup(line); + i = (int)strlen(file_names_in[num_file_name_in]) - 1; + while ( i && + file_names_in[num_file_name_in][i] != 's' && + file_names_in[num_file_name_in][i] != 'S' && + file_names_in[num_file_name_in][i] != 'z' && + file_names_in[num_file_name_in][i] != 'Z') + i--; + if (i) + { + file_names_in[num_file_name_in][i+1] = '\0'; + num_file_name_in++; + } + else + { + fprintf(stderr, "WARNING: cannot parse line '%s'\n",line); + } + } + else + { + fprintf(stderr, "WARNING: no a valid LAS file name '%s'\n",line); + } + } + } + + + if (verbose) ptime("starting first pass."); + fprintf(stderr, "first pass ... reading headers of %d LAS files...\n", num_file_name_in); + + for (i = 0; i < num_file_name_in; i++) + { + reader = LASReader_Create(file_names_in[i]); + if (!reader) { + LASError_Print("Could not get LASReader "); + exit(1); + } + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not get LASHeader "); + exit(1); + } + + + if (i == 0) + { + merged_header = LASReader_GetHeader(reader); + } + else + { + LASHeader_SetPointRecordsCount( merged_header, + LASHeader_GetPointRecordsCount(merged_header) + + LASHeader_GetPointRecordsCount(header)); + LASHeader_SetPointRecordsByReturnCount( merged_header, + 0, + LASHeader_GetPointRecordsByReturnCount(merged_header,0) + + LASHeader_GetPointRecordsByReturnCount(header,0)); + LASHeader_SetPointRecordsByReturnCount( merged_header, + 1, + LASHeader_GetPointRecordsByReturnCount(merged_header,1) + + LASHeader_GetPointRecordsByReturnCount(header,1)); + LASHeader_SetPointRecordsByReturnCount( merged_header, + 2, + LASHeader_GetPointRecordsByReturnCount(merged_header,2) + + LASHeader_GetPointRecordsByReturnCount(header,2)); + LASHeader_SetPointRecordsByReturnCount( merged_header, + 3, + LASHeader_GetPointRecordsByReturnCount(merged_header,3) + + LASHeader_GetPointRecordsByReturnCount(header,3)); + LASHeader_SetPointRecordsByReturnCount( merged_header, + 4, + LASHeader_GetPointRecordsByReturnCount(merged_header,4) + + LASHeader_GetPointRecordsByReturnCount(header,4)); + + LASHeader_SetSystemId(merged_header, "MERGED"); + + minx = LASHeader_GetMinX(merged_header); + maxx = LASHeader_GetMaxX(merged_header); + miny = LASHeader_GetMinY(merged_header); + maxy = LASHeader_GetMaxY(merged_header); + minz = LASHeader_GetMinZ(merged_header); + maxz = LASHeader_GetMaxZ(merged_header); + + if (minx > LASHeader_GetMinX(header)) minx = LASHeader_GetMinX(header); + if (maxx < LASHeader_GetMaxX(header)) maxx = LASHeader_GetMaxX(header); + if (miny > LASHeader_GetMinY(header)) miny = LASHeader_GetMinY(header); + if (maxy < LASHeader_GetMaxY(header)) maxy = LASHeader_GetMaxY(header); + if (minz > LASHeader_GetMinZ(header)) minz = LASHeader_GetMinZ(header); + if (maxz < LASHeader_GetMaxZ(header)) maxz = LASHeader_GetMaxZ(header); + + LASHeader_SetMin(merged_header, minx, miny, minz); + LASHeader_SetMax(merged_header, maxx, maxy, maxz); + } + + LASHeader_Destroy(header); + LASReader_Destroy(reader); + } + + if (verbose) + { + fprintf(stderr, " number_of_point_records %d\n", + LASHeader_GetPointRecordsCount(merged_header)); + fprintf(stderr, " number of points by return %d %d %d %d %d\n", + LASHeader_GetPointRecordsByReturnCount(merged_header, 0), + LASHeader_GetPointRecordsByReturnCount(merged_header, 1), + LASHeader_GetPointRecordsByReturnCount(merged_header, 2), + LASHeader_GetPointRecordsByReturnCount(merged_header, 3), + LASHeader_GetPointRecordsByReturnCount(merged_header, 4)); + fprintf(stderr, " min x y z %.6f %.6f %.6f\n", + LASHeader_GetMinX(merged_header), + LASHeader_GetMinY(merged_header), + LASHeader_GetMinZ(merged_header)); + fprintf(stderr, " max x y z %.6f %.6f %.6f\n", + LASHeader_GetMaxX(merged_header), + LASHeader_GetMaxY(merged_header), + LASHeader_GetMaxZ(merged_header)); + } + + if (xyz_scale) + { + LASHeader_SetScale( merged_header, + xyz_scale[0], + xyz_scale[1], + xyz_scale[2]); + } + + if (xyz_offset) + { + LASHeader_SetOffset(merged_header, + xyz_offset[0], + xyz_offset[1], + xyz_offset[2] ); + } + + x_scale_factor = LASHeader_GetScaleX(merged_header); + if (((LASHeader_GetMaxX(merged_header) - LASHeader_GetOffsetX(merged_header)) / LASHeader_GetScaleX(merged_header)) > largest_int || + ((LASHeader_GetMinX(merged_header) - LASHeader_GetOffsetX(merged_header)) / LASHeader_GetScaleX(merged_header)) < smallest_int ) + { + x_scale_factor = 0.0000001; + while (((LASHeader_GetMaxX(merged_header) - LASHeader_GetOffsetX(merged_header)) / x_scale_factor) > largest_int || + ((LASHeader_GetMinX(merged_header) - LASHeader_GetOffsetX(merged_header)) / x_scale_factor) < smallest_int ) + { + x_scale_factor *= 10; + } + fprintf(stderr, "x_scale_factor of merged_header changed to %g\n", x_scale_factor); + } + + y_scale_factor = LASHeader_GetScaleY(merged_header); + if (((LASHeader_GetMaxY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) > largest_int || + ((LASHeader_GetMinY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) < smallest_int ) + { + y_scale_factor = 0.0000001; + while (((LASHeader_GetMaxY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) > largest_int || + ((LASHeader_GetMinY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) < smallest_int ) + { + y_scale_factor *= 10; + } + fprintf(stderr, "y_scale_factor of merged_header changed to %g\n", y_scale_factor); + } + + z_scale_factor = LASHeader_GetScaleZ(merged_header); + if (((LASHeader_GetMaxZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) > largest_int || + ((LASHeader_GetMinZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) < smallest_int ) + { + z_scale_factor = 0.0000001; + while (((LASHeader_GetMaxZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) > largest_int || + ((LASHeader_GetMinZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) < smallest_int )\ + { + z_scale_factor *= 10; + } + fprintf(stderr, "z_scale_factor of merged_header changed to %g\n", z_scale_factor); + } + + LASHeader_SetScale( merged_header, + x_scale_factor, + y_scale_factor, + z_scale_factor); + + if (file_name_out == NULL && !use_stdout) + { + LASError_Print("no output was specified "); + exit(1); + } + + writer = LASWriter_Create(file_name_out, merged_header, LAS_MODE_WRITE); + if (!writer) { + LASError_Print("Could not create LASWriter "); + exit(1); + } + + if (verbose) ptime("starting second pass."); + fprintf(stderr, "second pass ... merge %d LAS files into one ...\n", num_file_name_in); + + for (i = 0; i < num_file_name_in; i++) + { + reader = LASReader_Create(file_names_in[i]); + if (!reader) { + LASError_Print("Could not get LASReader "); + exit(1); + } + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not get LASHeader "); + exit(1); + } + + same = TRUE; + if (LASHeader_GetOffsetX(merged_header) != LASHeader_GetOffsetX(header)) same = FALSE; + if (LASHeader_GetOffsetY(merged_header) != LASHeader_GetOffsetY(header)) same = FALSE; + if (LASHeader_GetOffsetZ(merged_header) != LASHeader_GetOffsetZ(header)) same = FALSE; + + if (LASHeader_GetScaleX(merged_header) != LASHeader_GetScaleX(header)) same = FALSE; + if (LASHeader_GetScaleY(merged_header) != LASHeader_GetScaleY(header)) same = FALSE; + if (LASHeader_GetScaleZ(merged_header) != LASHeader_GetScaleZ(header)) same = FALSE; + + + if (same) + { + p = LASReader_GetNextPoint(reader); + while (p) + { + LASWriter_WritePoint(writer, p); + p = LASReader_GetNextPoint(reader); + } + } + else + { + p = LASReader_GetNextPoint(reader); + while (p) + { + LASPoint_SetX(p,(0.5 + (LASPoint_GetX(p) - LASHeader_GetOffsetX(merged_header)) / LASHeader_GetScaleX(merged_header))); + LASPoint_SetY(p,(0.5 + (LASPoint_GetY(p) - LASHeader_GetOffsetY(merged_header)) / LASHeader_GetScaleY(merged_header))); + LASPoint_SetZ(p,(0.5 + (LASPoint_GetZ(p) - LASHeader_GetOffsetZ(merged_header)) / LASHeader_GetScaleZ(merged_header))); + LASWriter_WritePoint(writer, p); + p = LASReader_GetNextPoint(reader); + } + } + + LASHeader_Destroy(header); + LASReader_Destroy(reader); + reader = NULL; + } + + LASHeader_Destroy(merged_header); + LASWriter_Destroy(writer); + + if (verbose) ptime("done."); + + if (verbose) { + reader = LASReader_Create(file_name_out); + if (!reader) { + LASError_Print("Could not open file "); + exit(1); + } + + header = LASReader_GetHeader(reader); + if (!header) { + LASError_Print("Could not get LASHeader "); + exit(1); + } + + print_header(stderr, header, file_name_out, skip_vlr); + summary = SummarizePoints(reader); + print_point_summary(stderr, summary, header); + + LASHeader_Destroy(header); + header = NULL; + LASReader_Destroy(reader); + reader = NULL; + + LASPoint_Destroy(summary->pmin); + LASPoint_Destroy(summary->pmax); + free(summary); + } + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/liblas-config.in work/libLAS-1.2.1/apps/liblas-config.in --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/liblas-config.in 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/liblas-config.in 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,53 @@ +#!/bin/sh + + + +usage() +{ + cat <&2 +fi + +case $1 in + --libs) + echo @LIBS@ + ;; + + --defines) + echo @DEFS@ + ;; + + --includes) + echo @GEOTIFF_INC@ @GDAL_INC@ + ;; + + --cflags) + echo @CFLAGS@ + ;; + + --cxxflags) + echo @CXXFLAGS@ + ;; + + --version) + echo @RELEASE_VERSION@ + ;; + + *) + usage 1 1>&2 + ;; + +esac diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/Makefile.am work/libLAS-1.2.1/apps/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,27 @@ +if GDAL_IS_CONFIG +GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 +endif + +if GEOTIFF_IS_CONFIG +GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 +endif + +AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include/liblas/capi -I../include + +lasinfo_SOURCES = lasinfo.c lascommon.c +las2las_SOURCES = las2las.c lascommon.c +lasmerge_SOURCES = lasmerge.c lascommon.c +las2txt_SOURCES = las2txt.c lascommon.c +txt2las_SOURCES = txt2las.c + + +bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las + +bin_SCRIPTS = liblas-config + +if GDAL_IS_CONFIG +las2ogr_SOURCES = las2ogr.cpp +bin_PROGRAMS += las2ogr +endif + +LDADD = ../src/liblas.la diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/makefile.vc work/libLAS-1.2.1/apps/makefile.vc --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/makefile.vc 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/makefile.vc 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,55 @@ +# $Id$ +# +LAS_ROOT = .. + +!INCLUDE $(LAS_ROOT)\nmake.opt + +all: default + +las2las.exe: + $(CC) $(CFLAGS) las2las.c lascommon.c $(LAS_ROOT)/src/$(LAS_LIB_DLL) $(GEOTIFF_LIB) + if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 + +lasinfo.exe: + $(CC) $(CFLAGS) lasinfo.c lascommon.c $(LAS_ROOT)/src/$(LAS_LIB_DLL) $(GEOTIFF_LIB) + if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 + +#lasdiff.exe: +# $(CC) $(CFLAGS) lasdiff.cpp lascommon.c $(LAS_ROOT)/src/$(LAS_LIB_DLL) +# if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 + +las2txt.exe: + $(CC) $(CFLAGS) las2txt.c lascommon.c $(LAS_ROOT)/src/$(LAS_LIB_DLL) $(GEOTIFF_LIB) + if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 + +lasmerge.exe: + $(CC) $(CFLAGS) lasmerge.c lascommon.c $(LAS_ROOT)/src/$(LAS_LIB_DLL) $(GEOTIFF_LIB) + if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 + +txt2las.exe: + $(CC) $(CFLAGS) txt2las.c lascommon.c $(LAS_ROOT)/src/$(LAS_LIB_DLL) $(GEOTIFF_LIB) + if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 + +!IF "$(GDAL_HOME)" != "" && EXIST("$(GDAL_HOME)") +las2ogr.exe: + $(CC) $(CFLAGS) las2ogr.cpp $(LAS_ROOT)/src/$(LAS_LIB_DLL) $(GDAL_LIB) ..\src\$(LAS_LIB) + if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1 +!ELSE +las2ogr.exe: + +!ENDIF + +default: las2las.exe lasinfo.exe las2txt.exe lasmerge.exe txt2las.exe las2ogr.exe + + +clean: + -del *.bak + -del *.exe + -del *.ilk + -del *.manifest + -del *.obj + -del *.pdb + +install: default + xcopy /y /r /d /f *.exe $(BINDIR) + xcopy /y /r /d /f *.exe $(OSGEO4W_DIR)\lib\bin diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/txt2las.c work/libLAS-1.2.1/apps/txt2las.c --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/apps/txt2las.c 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/apps/txt2las.c 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,916 @@ +/*************************************************************************** + * $Id$ + * $Date$ + * + * Project: libLAS -- C/C++ read/write library for LAS LIDAR data + * Purpose: ASCII text to LAS translation + * Author: Martin Isenburg isenburg@cs.unc.edu + *************************************************************************** + * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu + * + * See LICENSE.txt in this source distribution for more information. + **************************************************************************/ + +#include +#include +#include +#include + +#define LAS_FORMAT_10 0 +#define LAS_FORMAT_11 1 +#define LAS_FORMAT_12 2 + +void usage() +{ + + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," txt2las (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Parse a text file with a given format:\n"); + fprintf(stderr," txt2las -parse tsxyz lidar.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Set the scale:\n"); + fprintf(stderr," txt2las --parse xyz --scale 0.02 -i lidar.txt -o lidar.laz\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Set the xyz scale:\n"); + fprintf(stderr," txt2las --parse xsysz --verbose --xyz_scale 0.02 0.02 0.01 lidar.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr," The '--parse txyz' flag specifies how to format each\n"); + fprintf(stderr," each line of the ASCII file. For example, 'txyzia'\n"); + fprintf(stderr," means that the first number of each line should be the\n"); + fprintf(stderr," gpstime, the next three numbers should be the x, y, and\n"); + fprintf(stderr," z coordinate, the next number should be the intensity\n"); + fprintf(stderr," and the next number should be the scan angle.\n"); + fprintf(stderr," The supported entries are:\n"); + fprintf(stderr," a - scan angle\n"); + fprintf(stderr," i - intensity\n"); + fprintf(stderr," n - number of returns for given pulse\n"); + fprintf(stderr," r - number of this return\n"); + fprintf(stderr," c - classification\n"); + fprintf(stderr," u - user data (does not currently work)\n"); + fprintf(stderr," p - point source ID\n"); + fprintf(stderr," e - edge of flight line\n"); + fprintf(stderr," d - direction of scan flag\n"); + fprintf(stderr," R - red channel of RGB color\n"); + fprintf(stderr," G - green channel of RGB color\n"); + fprintf(stderr," B - blue channel of RGB color\n\n"); + + fprintf(stderr,"\n----------------------------------------------------------\n"); + fprintf(stderr," The '-scale 0.02' flag specifies the quantization. The\n"); + fprintf(stderr," default value of 0.01 means that the smallest increment\n"); + fprintf(stderr," two between coordinates is 0.01. If measurements are in\n"); + fprintf(stderr," meters this corresponds to centimeter accuracy, which is\n"); + fprintf(stderr," commonly considered sufficient for LIDAR data.\n"); + + fprintf(stderr,"\n----------------------------------------------------------\n"); + fprintf(stderr," Other parameters such as '--xyz_offset 500000 2000000 0'\n"); + fprintf(stderr," or '-xyz_scale 0.02 0.02 0.01' or '-file_creation 67 2003'\n"); + fprintf(stderr," or '-system_identifier \"Airborne One Leica 50,000 Hz\"'\n"); + fprintf(stderr," or '-generating_software \"TerraScan\"' are available too.\n"); + + fprintf(stderr, "For more information, see the full documentation for txt2las at:\n" + " http://liblas.org/browser/trunk/doc/txt2las.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + +} + +static void VecUpdateMinMax3dv(double min[3], double max[3], const double v[3]) +{ + if (v[0]max[0]) max[0]=v[0]; + if (v[1]max[1]) max[1]=v[1]; + if (v[2]max[2]) max[2]=v[2]; +} + +static void VecCopy3dv(double v[3], const double a[3]) +{ + v[0] = a[0]; + v[1] = a[1]; + v[2] = a[2]; +} + +static int parse(const char* parse_string, const char* line, double* xyz, LASPointH point, double* gps_time) +{ + int temp_i; + float temp_f; + const char* p = parse_string; + const char* l = line; + + LASColorH color = LASColor_Create(); + + while (p[0]) + { + /* // we expect the x coordinate */ + if (p[0] == 'x') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%lf", &(xyz[0])) != 1) return FALSE; + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the y coordinate */ + else if (p[0] == 'y') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%lf", &(xyz[1])) != 1) return FALSE; + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the x coordinate */ + else if (p[0] == 'z') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%lf", &(xyz[2])) != 1) return FALSE; + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect a string or a number that we don't care about */ + else if (p[0] == 's') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the intensity */ + else if (p[0] == 'i') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%f", &temp_f) != 1) return FALSE; + if (temp_f < 0.0f || temp_f > 65535.0f) + fprintf(stderr, + "WARNING: intensity %g is out of range of unsigned short\n", + temp_f); + LASPoint_SetIntensity(point, (int)temp_f); +/* point->intensity = (unsigned short)temp_f; */ + /* // then advance to next white space*/ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the scan angle */ + else if (p[0] == 'a') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%f", &temp_f) != 1) return FALSE; + if (temp_f < -128.0f || temp_f > 127.0f) + fprintf(stderr, + "WARNING: scan angle %g is out of range of char\n", + temp_f); + LASPoint_SetScanAngleRank(point, (int)temp_f); +/* point->scan_angle_rank = (char)temp_f; */ + /* // then advance to next white space*/ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the number of returns of given pulse */ + else if (p[0] == 'n') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 7) + fprintf(stderr, + "WARNING: return number %d is out of range of three bits\n", + temp_i); + LASPoint_SetNumberOfReturns(point, temp_i); +/* point->number_of_returns_of_given_pulse = temp_i & 7; */ + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the number of the return */ + else if (p[0] == 'r') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 7) + fprintf(stderr, + "WARNING: return number %d is out of range of three bits\n", + temp_i); +/* point->return_number = temp_i & 7; */ + LASPoint_SetReturnNumber(point, temp_i); + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the classification */ + else if (p[0] == 'c') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 255) + fprintf(stderr, + "WARNING: classification %d is out of range of unsigned char\n", + temp_i); + LASPoint_SetClassification(point, temp_i); +/* point->classification = (unsigned char)temp_i; */ + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the user data */ + else if (p[0] == 'u') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 255) + fprintf(stderr, + "WARNING: user data %d is out of range of unsigned char\n", + temp_i); + + LASPoint_SetUserData(point, temp_i); +/* point->user_data = temp_i & 255; */ + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the point source ID */ + else if (p[0] == 'p') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 65535) + fprintf(stderr, + "WARNING: point source ID %d is out of range of unsigned short\n", + temp_i); +/* point->point_source_ID = temp_i & 65535; */ + LASPoint_SetPointSourceId(point, temp_i); + /*// then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the edge of flight line flag */ + else if (p[0] == 'e') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 1) + fprintf(stderr, + "WARNING: edge of flight line flag %d is out of range of boolean flag\n", + temp_i); + LASPoint_SetFlightLineEdge(point, temp_i ? 1: 0); +/* point->edge_of_flight_line = (temp_i ? 1 : 0); */ + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the direction of scan flag */ + else if (p[0] == 'd') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + if (temp_i < 0 || temp_i > 1) + fprintf(stderr, + "WARNING: direction of scan flag %d is out of range of boolean flag\n", + temp_i); + LASPoint_SetScanDirection(point, temp_i ? 1: 0); +/* point->scan_direction_flag = (temp_i ? 1 : 0); */ + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the gps time */ + else if (p[0] == 't') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%lf", gps_time) != 1) return FALSE; + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the red channel of the RGB field */ + else if (p[0] == 'R') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + LASColor_SetRed(color, temp_i); + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the green channel of the RGB field */ + else if (p[0] == 'G') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + LASColor_SetGreen(color, temp_i); + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + /* // we expect the blue channel of the RGB field */ + else if (p[0] == 'B') + { + /* // first skip white spaces */ + while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; + if (l[0] == 0) return FALSE; + if (sscanf(l, "%d", &temp_i) != 1) return FALSE; + LASColor_SetBlue(color, temp_i); + /* // then advance to next white space */ + while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; + } + + else + { + fprintf(stderr, "ERROR: next symbol '%s' unknown in parse control string\n", p); + } + p++; + } + LASPoint_SetColor(point, color); + LASColor_Destroy(color); + return TRUE; +} + + +int main(int argc, char *argv[]) +{ + int i; + int dry = FALSE; + int verbose = FALSE; + char* file_name_in = 0; + char* file_name_out = 0; + double xyz_min[3] = {0.0, 0.0, 0.0}; + double xyz_max[3] = {0.0, 0.0, 0.0}; + double xyz_scale[3] = {0.01,0.01,0.01}; + double xyz_offset[3] = {0.0,0.0,0.0}; + unsigned int number_of_point_records = 0; + unsigned int number_of_points_by_return[8] = {0,0,0,0,0,0,0,0}; + char* parse_string = "xyz"; + int file_creation_day = 0; + int file_creation_year = 0; + char* system_identifier = 0; + char* generating_software = 0; +#define MAX_CHARACTERS_PER_LINE 512 + char line[MAX_CHARACTERS_PER_LINE]; + double xyz[3]; + LASPointH point = NULL; + double gps_time; + FILE* file_in = NULL; + char* parse_less = NULL; + LASHeaderH header = NULL; + LASWriterH writer = NULL; + LASError err; + int format = LAS_FORMAT_12; + + int xyz_min_quant[3] = {0, 0, 0}; + int xyz_max_quant[3] = {0, 0, 0}; + + double xyz_min_dequant[3] = {0.0, 0.0, 0.0}; + double xyz_max_dequant[3] = {0.0, 0.0, 0.0}; + + for (i = 1; i < argc; i++) + { + if ( strcmp(argv[i],"-h") == 0 || + strcmp(argv[i],"--help") == 0 + ) + { + usage(); + exit(0); + } + else if ( strcmp(argv[i],"-v") == 0 || + strcmp(argv[i],"--verbose") == 0 + ) + { + verbose = TRUE; + } + else if ( strcmp(argv[i],"-d") == 0 || + strcmp(argv[i],"-dry") == 0 || + strcmp(argv[i],"--dry") == 0 + ) + { + dry = TRUE; + } + else if ( strcmp(argv[i],"--parse") == 0 || + strcmp(argv[i],"-parse") == 0 || + strcmp(argv[i],"-p") == 0 + ) + { + i++; + parse_string = argv[i]; + } + else if ( strcmp(argv[i],"--scale") == 0 || + strcmp(argv[i],"-scale") == 0 || + strcmp(argv[i],"-s") == 0 + ) + { + + i++; + sscanf(argv[i], "%lf", &(xyz_scale[2])); + xyz_scale[0] = xyz_scale[1] = xyz_scale[2]; + } + else if ( strcmp(argv[i],"--xyz_scale") == 0 || + strcmp(argv[i],"-xyz_scale") == 0 + ) + + { + i++; + sscanf(argv[i], "%lf", &(xyz_scale[0])); + i++; + sscanf(argv[i], "%lf", &(xyz_scale[1])); + i++; + sscanf(argv[i], "%lf", &(xyz_scale[2])); + } + else if ( strcmp(argv[i],"--xyz_offset") == 0 || + strcmp(argv[i],"-xyz_offset") == 0 + ) + { + i++; + sscanf(argv[i], "%lf", &(xyz_offset[0])); + i++; + sscanf(argv[i], "%lf", &(xyz_offset[1])); + i++; + sscanf(argv[i], "%lf", &(xyz_offset[2])); + } + else if ( strcmp(argv[i],"--input") == 0 || + strcmp(argv[i],"-input") == 0 || + strcmp(argv[i],"-i") == 0 || + strcmp(argv[i],"-in") == 0 + ) + { + i++; + file_name_in = argv[i]; + } + + else if ( strcmp(argv[i],"--output") == 0 || + strcmp(argv[i],"--out") == 0 || + strcmp(argv[i],"-out") == 0 || + strcmp(argv[i],"-o") == 0 + ) + { + i++; + file_name_out = argv[i]; + } + + else if ( strcmp(argv[i],"--format") == 0 || + strcmp(argv[i],"-f") == 0 || + strcmp(argv[i],"-format") == 0 + ) + { + i++; + if (strcmp(argv[i], "1.0") == 0) { + format = LAS_FORMAT_10; + } + else if (strcmp(argv[i], "1.1") == 0) { + format = LAS_FORMAT_11; + } + else if (strcmp(argv[i], "1.2") == 0) { + format = LAS_FORMAT_12; + } + else { + LASError_Print("Format must be specified as 1.0, 1.1, or 1.2"); + } + + } + else if ( strcmp(argv[i],"--system_identifier") == 0 || + strcmp(argv[i],"-system_identifier") == 0 || + strcmp(argv[i],"-s") == 0 || + strcmp(argv[i],"-sys_id") == 0) + { + i++; + system_identifier = (char*) malloc(31 * sizeof(char)); + strcpy(system_identifier, argv[i]); + } + + else if ( strcmp(argv[i],"--generating_software") == 0 || + strcmp(argv[i],"-generating_software") == 0 || + strcmp(argv[i],"-g") == 0 || + strcmp(argv[i],"-gen_soft") == 0) + { + i++; + generating_software = (char*) malloc(31*sizeof(char)); + strcpy(generating_software, argv[i]); + } + + else if ( strcmp(argv[i],"--file_creation") == 0 || + strcmp(argv[i],"-file_creation") == 0) + { + i++; + file_creation_day = (unsigned short)atoi(argv[i]); + i++; + file_creation_year = (unsigned short)atoi(argv[i]); + } + else if ( file_name_in == NULL && + file_name_out == NULL + ) + { + file_name_in = argv[i]; + } + else if ( file_name_in && + file_name_out == NULL + ) + { + file_name_out = argv[i]; + } + else + { + fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); + usage(); + exit(1); + } + } + + /* create output file name if none specified and no piped output requested */ + if (file_name_out == NULL && file_name_in != NULL) + { + int len = (int)strlen(file_name_in); + file_name_out = strdup(file_name_in); + + while (len > 0 && file_name_out[len] != '.') + { + len--; + } + file_name_out[len] = '.'; + file_name_out[len+1] = 'l'; + file_name_out[len+2] = 'a'; + file_name_out[len+3] = 's'; + file_name_out[len+4] = '\0'; + } + + + /* make sure that input and output are not *both* piped */ + if (file_name_in == NULL && file_name_out == NULL) + { + LASError_Print("both input and output filenames are null!"); + usage(); + exit(1); + } + + file_in = fopen(file_name_in, "r"); + + if (file_in == NULL) + { + LASError_Print("could not open file to read for first pass"); + exit(1); + } + + /* create a cheaper parse string that only looks for 'x' 'y' 'z' and 'r' */ + parse_less = strdup(parse_string); + for (i = 0; i < (int)strlen(parse_string); i++) + { + if (parse_less[i] != 'x' && + parse_less[i] != 'y' && + parse_less[i] != 'z' && + parse_less[i] != 'r') + { + parse_less[i] = 's'; + } + } + + do + { + parse_less[i] = '\0'; + printf("nuking %d for %c\n", i, parse_less[i]); + i--; + } while (parse_less[i] == 's'); + + + /* first pass to figure out the bounding box and number of returns */ + if (verbose) { + fprintf(stderr, + "first pass over file '%s' with parse '%s'\n", + file_name_in, + parse_less); + } + + /* read the first line */ + while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) + { + point = LASPoint_Create(); + if (parse(parse_less, line, xyz, point, &gps_time)) + { + /* init the bounding box */ + VecCopy3dv(xyz_min, xyz); + VecCopy3dv(xyz_max, xyz); + + /* mark that we found the first point */ + number_of_point_records = 1; + + /* create return histogram */ + number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; + + /* we can stop this loop */ + break; + } + else + { + fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", + line, + parse_less); + + } + LASPoint_Destroy(point); + point = NULL; + } + + /* did we manage to parse a line? */ + if (number_of_point_records != 1) + { + fprintf(stderr, "ERROR: could not parse any lines with '%s'\n", + parse_less); + exit(1); + } + + /* loop over the remaining lines */ + while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) + { + point = LASPoint_Create(); + if (parse(parse_less, line, xyz, point, &gps_time)) + { + /* update bounding box */ + VecUpdateMinMax3dv(xyz_min, xyz_max, xyz); + + /* count points */ + number_of_point_records++; + + /* create return histogram */ + number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; + } + else + { + fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", + line, + parse_less); + + } + LASPoint_Destroy(point); + point = NULL; + } + + /* output some stats */ + if (verbose) + { + fprintf(stderr, + "npoints %d min %g %g %g max %g %g %g\n", + number_of_point_records, + xyz_min[0], + xyz_min[1], + xyz_min[2], + xyz_max[0], + xyz_max[1], + xyz_max[2] + ); + fprintf(stderr, + "return histogram %d %d %d %d %d %d %d %d\n", + number_of_points_by_return[0], + number_of_points_by_return[1], + number_of_points_by_return[2], + number_of_points_by_return[3], + number_of_points_by_return[4], + number_of_points_by_return[5], + number_of_points_by_return[6], + number_of_points_by_return[7] + ); + } + + /* close the input file */ + fclose(file_in); + + /* compute bounding box after quantization */ + for (i = 0; i < 3; i++) + { + xyz_min_quant[i] = (int)(0.5 + (xyz_min[i] - xyz_offset[i]) / xyz_scale[i]); + xyz_max_quant[i] = (int)(0.5 + (xyz_max[i] - xyz_offset[i]) / xyz_scale[i]); + } + + for (i = 0; i < 3; i++) + { + xyz_min_dequant[i] = xyz_offset[i] + (xyz_min_quant[i] * xyz_scale[i]); + xyz_max_dequant[i] = xyz_offset[i] + (xyz_max_quant[i] * xyz_scale[i]); + } + + +#define log_xor !=0==! + + /* make sure there is not sign flip */ + for (i = 0; i < 3; i++) + { + if ((xyz_min[i] > 0) log_xor (xyz_min_dequant[i] > 0)) + { + fprintf(stderr, + "WARNING: quantization sign flip for %s min coord %g -> %g. use offset or scale up\n", + (i ? (i == 1 ? "y" : "z") : "x"), + xyz_min[i], + xyz_min_dequant[i] + ); + } + if ((xyz_max[i] > 0) log_xor (xyz_max_dequant[i] > 0)) + { + fprintf(stderr, + "WARNING: quantization sign flip for %s max coord %g -> %g. use offset or scale up\n", + (i ? (i == 1 ? "y" : "z") : "x"), + xyz_max[i], + xyz_max_dequant[i] + ); + } + } + +#undef log_xor + + /* populate the header */ + + header = LASHeader_Create(); + + if (system_identifier) LASHeader_SetSystemId(header, system_identifier); + if (generating_software) LASHeader_SetSoftwareId(header, generating_software); + LASHeader_SetCreationDOY(header, file_creation_day); + LASHeader_SetCreationYear(header, file_creation_year); + + + if (format == LAS_FORMAT_10) { + LASHeader_SetVersionMinor(header, 0); + } else if (format == LAS_FORMAT_11){ + LASHeader_SetVersionMinor(header, 1); + } else if (format == LAS_FORMAT_12) { + LASHeader_SetVersionMinor(header, 2); + } + + if (strstr(parse_string,"t") && (strstr(parse_string, "R") || strstr(parse_string, "G") ||strstr(parse_string, "B") ) ) + { + fprintf(stderr, "Setting point format to 3, overriding version to 1.2 -- RGB + time\n"); + LASHeader_SetDataFormatId(header, 3); + LASHeader_SetVersionMinor(header, 2); + } + else if ((strstr(parse_string, "R") || strstr(parse_string, "G") ||strstr(parse_string, "B") ) ) + { + fprintf(stderr, "Setting point format to 2, overriding version to 1.2 -- RGB\n"); + LASHeader_SetDataFormatId(header, 2); + LASHeader_SetVersionMinor(header, 2); + } + else if (strstr(parse_string,"t")) + { + fprintf(stderr, "Setting point format to 1\n"); + LASHeader_SetDataFormatId(header, 1); + } + + else + { + LASHeader_SetDataFormatId(header, 0); + } + LASHeader_SetPointRecordsCount(header, number_of_point_records); + LASHeader_SetScale(header, xyz_scale[0], xyz_scale[1], xyz_scale[2]); + LASHeader_SetOffset(header, xyz_offset[0], xyz_offset[1], xyz_offset[2]); + LASHeader_SetMin(header, xyz_min_dequant[0], xyz_min_dequant[1], xyz_min_dequant[2]); + LASHeader_SetMax(header, xyz_max_dequant[0], xyz_max_dequant[1], xyz_max_dequant[2]); + LASHeader_SetPointRecordsByReturnCount(header, 0, number_of_points_by_return[1]); + LASHeader_SetPointRecordsByReturnCount(header, 1, number_of_points_by_return[2]); + LASHeader_SetPointRecordsByReturnCount(header, 2, number_of_points_by_return[3]); + LASHeader_SetPointRecordsByReturnCount(header, 3, number_of_points_by_return[4]); + LASHeader_SetPointRecordsByReturnCount(header, 4, number_of_points_by_return[5]); + + + + + /* reopen input file for the second pass */ + file_in = fopen(file_name_in, "r"); + + if (file_in == 0) + { + fprintf(stderr, "ERROR: could not open '%s' for second pass\n",file_name_in); + exit(1); + } + + /* + because the output goes to a file we can do everything in a + single pass and compute the header information along the way + */ + + /* open output file */ + printf("Creating file...\n"); + writer = LASWriter_Create(file_name_out, header, LAS_MODE_WRITE); + if (!writer) { + LASError_Print("Could not open file for write mode "); + exit(1); + } + + if (verbose) { + fprintf(stderr, + "scanning %s with parse '%s' writing to %s\n", + file_name_in , + parse_string, + file_name_out + ); + } + + + /* read the first line */ + while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) + { + point = LASPoint_Create(); + if (parse(parse_string, line, xyz, point, &gps_time)) + { + /* init the bounding box */ + VecCopy3dv(xyz_min, xyz); + VecCopy3dv(xyz_max, xyz); + + /* mark that we found the first point */ + number_of_point_records = 1; + + /* create return histogram */ + number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; + + /* compute the quantized x, y, and z values */ + LASPoint_SetX(point, xyz[0]); + LASPoint_SetY(point, xyz[1]); + LASPoint_SetZ(point, xyz[2]); + + /* write the first point */ + err = LASWriter_WritePoint(writer, point); + if (err) { + LASError_Print("could not write point"); + exit(1); + } + + /* we can stop this loop */ + break; + } + else + { + fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", + line, + parse_string); + } + LASPoint_Destroy(point); + point = NULL; + } + + /* did we manage to parse a line? */ + if (number_of_point_records != 1) + { + fprintf(stderr, "ERROR: could not parse any lines with '%s'\n", + parse_less); + exit(1); + } + + /* loop over the remaining lines */ + while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) + { + point = LASPoint_Create(); + if (parse(parse_string, line, xyz, point, &gps_time)) + { + /* update bounding box */ + VecUpdateMinMax3dv(xyz_min, xyz_max, xyz); + + /* count points */ + number_of_point_records++; + + /* create return histogram */ + number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; + + /* compute the quantized x, y, and z values */ + LASPoint_SetX(point, xyz[0]); + LASPoint_SetY(point, xyz[1]); + LASPoint_SetZ(point, xyz[2]); + + /* write the first point */ + err = LASWriter_WritePoint(writer, point); + if (err) { + LASError_Print("could not write point"); + exit(1); + } + + } + else + { + fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", + line, + parse_string); + } + LASPoint_Destroy(point); + point = NULL; + } + + + /* close up stuff */ + fclose(file_in); + LASWriter_Destroy(writer); + if (verbose) + { + fprintf(stderr, "done.\n"); + } + + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/AUTHORS work/libLAS-1.2.1/AUTHORS --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/AUTHORS 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/AUTHORS 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,14 @@ +Mateusz Loskot +mateusz at loskot.net + +Howard Butler +hobu.inc at gmail.com + +Martin Vales +mrodriguez at stereocarto.com + +Phillipe Vachon +philippe at cowpig.ca + +Frank Warmerdam +warmerdam at pobox.com \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/autogen.sh work/libLAS-1.2.1/autogen.sh --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/autogen.sh 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/autogen.sh 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,42 @@ +#!/bin/sh +# $Id$ +# +# Autotools boostrapping script +# +giveup() +{ + echo + echo " Something went wrong, giving up!" + echo + exit 1 +} + +OSTYPE=`uname -s` + +for libtoolize in glibtoolize libtoolize; do + LIBTOOLIZE=`which $libtoolize 2>/dev/null` + if test "$LIBTOOLIZE"; then + break; + fi +done + +#AMFLAGS="--add-missing --copy --force-missing" +AMFLAGS="--add-missing --copy" +if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then + AMFLAGS=$AMFLAGS" --include-deps"; +fi + +echo "Running aclocal" +aclocal || giveup +#echo "Running autoheader" +#autoheader || giveup +echo "Running libtoolize" +$LIBTOOLIZE --force --copy || giveup +echo "Running automake" +automake $AMFLAGS # || giveup +echo "Running autoconf" +autoconf || giveup + +echo "======================================" +echo "Now you are ready to run './configure'" +echo "======================================" diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/cmake/FindGeoTIFF.cmake work/libLAS-1.2.1/build/cmake/FindGeoTIFF.cmake --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/cmake/FindGeoTIFF.cmake 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/cmake/FindGeoTIFF.cmake 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,50 @@ +# CMake module to search for GeoTIFF library +# +# If it's found it sets GEOTIFF_FOUND to TRUE +# and following variables are set: +# GEOTIFF_INCLUDE_DIR +# GEOTIFF_LIBRARY +# +# +# FIND_PATH and FIND_LIBRARY normally search standard locations +# before the specified paths. To search non-standard paths first, +# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH +# and then again with no specified paths to search the default +# locations. When an earlier FIND_* succeeds, subsequent FIND_*s +# searching for the same item do nothing. +FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h + "$ENV{LIB_DIR}/include" + "$ENV{LIB_DIR}/include/geotiff" + #mingw + c:/msys/local/include + NO_DEFAULT_PATH + ) +FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h) + +SET(GEOTIFF_NAMES ${GEOTIFF_NAMES} geotiff geotiff_i) + +FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES} PATHS + "$ENV{LIB_DIR}/lib" + #mingw + c:/msys/local/lib + NO_DEFAULT_PATH + ) +FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES}) + +IF (GEOTIFF_INCLUDE_DIR AND GEOTIFF_LIBRARY) + SET(GEOTIFF_FOUND TRUE) +ENDIF (GEOTIFF_INCLUDE_DIR AND GEOTIFF_LIBRARY) + +IF (GEOTIFF_FOUND) + + IF (NOT GEOTIFF_FIND_QUIETLY) + MESSAGE(STATUS "Found GeoTIFF: ${GEOTIFF_LIBRARY}") + ENDIF (NOT GEOTIFF_FIND_QUIETLY) + +ELSE (GEOTIFF_FOUND) + + IF (GEOTIFF_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find GeoTIFF library") + ENDIF (GEOTIFF_FIND_REQUIRED) + +ENDIF (GEOTIFF_FOUND) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/las.dsw work/libLAS-1.2.1/build/msvc60/las.dsw --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/las.dsw 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/las.dsw 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,113 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "las2las"=.\tools\las2las.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "las2txt"=.\tools\las2txt.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "lasdiff"=.\tools\lasdiff.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "lasinfo"=.\tools\lasinfo.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "lasmerge"=.\tools\lasmerge.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "lasview"=.\tools\lasview.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "laszip"=.\tools\laszip.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "txt2las"=.\tools\txt2las.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/las2las.dsp work/libLAS-1.2.1/build/msvc60/las2las.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/las2las.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/las2las.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,134 @@ +# Microsoft Developer Studio Project File - Name="las2las" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=las2las - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "las2las.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "las2las.mak" CFG="las2las - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "las2las - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "las2las - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "las2las - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\las2las.exe ..\bin\las2las.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "las2las - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\las2las.exe ..\bin\las2las.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "las2las - Win32 Release" +# Name "las2las - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\las2las.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointwriter.h +# End Source File +# Begin Source File + +SOURCE=..\inc\lasreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laswriter.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/las2txt.dsp work/libLAS-1.2.1/build/msvc60/las2txt.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/las2txt.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/las2txt.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,126 @@ +# Microsoft Developer Studio Project File - Name="las2txt" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=las2txt - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "las2txt.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "las2txt.mak" CFG="las2txt - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "las2txt - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "las2txt - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "las2txt - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\las2txt.exe ..\bin\las2txt.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "las2txt - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\las2txt.exe ..\bin\las2txt.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "las2txt - Win32 Release" +# Name "las2txt - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\las2txt.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\lasreader.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasdiff.dsp work/libLAS-1.2.1/build/msvc60/lasdiff.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasdiff.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/lasdiff.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,126 @@ +# Microsoft Developer Studio Project File - Name="lasdiff" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=lasdiff - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "lasdiff.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "lasdiff.mak" CFG="lasdiff - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "lasdiff - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "lasdiff - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "lasdiff - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\lasdiff.exe ..\bin\lasdiff.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "lasdiff - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\lasdiff.exe ..\bin\lasdiff.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "lasdiff - Win32 Release" +# Name "lasdiff - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\lasdiff.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\lasreader.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasinfo.dsp work/libLAS-1.2.1/build/msvc60/lasinfo.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasinfo.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/lasinfo.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,126 @@ +# Microsoft Developer Studio Project File - Name="lasinfo" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=lasinfo - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "lasinfo.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "lasinfo.mak" CFG="lasinfo - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "lasinfo - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "lasinfo - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "lasinfo - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\lasinfo.exe ..\bin\lasinfo.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "lasinfo - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\lasinfo.exe ..\bin\lasinfo.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "lasinfo - Win32 Release" +# Name "lasinfo - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\lasinfo.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\lasreader.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasmerge.dsp work/libLAS-1.2.1/build/msvc60/lasmerge.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasmerge.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/lasmerge.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,126 @@ +# Microsoft Developer Studio Project File - Name="lasmerge" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=lasmerge - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "lasmerge.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "lasmerge.mak" CFG="lasmerge - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "lasmerge - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "lasmerge - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "lasmerge - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\lasmerge.exe ..\bin\lasmerge.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "lasmerge - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\lasmerge.exe ..\bin\lasmerge.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "lasmerge - Win32 Release" +# Name "lasmerge - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\lasmerge.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointwriter.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laswriter.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasview.dsp work/libLAS-1.2.1/build/msvc60/lasview.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/lasview.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/lasview.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,126 @@ +# Microsoft Developer Studio Project File - Name="lasview" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=lasview - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "lasview.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "lasview.mak" CFG="lasview - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "lasview - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "lasview - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "lasview - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\lasview.exe ..\bin\lasview.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "lasview - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\lasview.exe ..\bin\lasview.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "lasview - Win32 Release" +# Name "lasview - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\lasview.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\lasreader.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/laszip.dsp work/libLAS-1.2.1/build/msvc60/laszip.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/laszip.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/laszip.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,134 @@ +# Microsoft Developer Studio Project File - Name="laszip" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=laszip - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "laszip.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "laszip.mak" CFG="laszip - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "laszip - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "laszip - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "laszip - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\laszip.exe ..\bin\laszip.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "laszip - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\laszip.exe ..\bin\laszip.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "laszip - Win32 Release" +# Name "laszip - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\laszip.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointwriter.h +# End Source File +# Begin Source File + +SOURCE=..\inc\lasreader.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laswriter.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/txt2las.dsp work/libLAS-1.2.1/build/msvc60/txt2las.dsp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc60/txt2las.dsp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc60/txt2las.dsp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,126 @@ +# Microsoft Developer Studio Project File - Name="txt2las" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=txt2las - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "txt2las.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "txt2las.mak" CFG="txt2las - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "txt2las - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "txt2las - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "txt2las - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\inc" /I "..\stl" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../src" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ../lib/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release\txt2las.exe ..\bin\txt2las.exe +# End Special Build Tool + +!ELSEIF "$(CFG)" == "txt2las - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\inc" /I "..\stl" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\..\src" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../libD/LASlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug\txt2las.exe ..\bin\txt2las.exe +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "txt2las - Win32 Release" +# Name "txt2las - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\src\fopengzipped.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\txt2las.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\inc\lasdefinitions.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laspointwriter.h +# End Source File +# Begin Source File + +SOURCE=..\inc\laswriter.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/clean.bat work/libLAS-1.2.1/build/msvc80/clean.bat --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/clean.bat 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/clean.bat 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,26 @@ +@ECHO OFF +REM +REM $Id$ +REM +REM This script is used to do fast cleanup of all intermediate files +REM generated by Visual Studio during building process. +REM NOTE: Some files can be erased only if liblas.sln is not loaded in VS IDE. +REM +FOR %%d in (liblas_lib liblas_dll liblas_c_dll lasdiff lasinfo lasmerge liblas_test las2las las2txt txt2las las2ogr) DO ( + IF EXIST %%d\Debug DEL /F /Q %%d\Debug\*.* + IF EXIST %%d\Release DEL /F /Q %%d\Release\*.* + IF EXIST %%d\Debug RD %%d\Debug + IF EXIST %%d\Release RD %%d\Release + IF EXIST %%d\*.vcproj.*.user DEL /F /Q %%d\*.vcproj.*.user +) + +IF EXIST .\Debug DEL /F /Q .\Debug\*.* +IF EXIST .\Release DEL /F /Q .\Release\*.* +IF EXIST .\Debug RD .\Debug +IF EXIST .\Release RD .\Release + +FOR %%f in (liblas.ncb) DO ( + IF EXIST %%f DEL /F /Q %%f +) + +REM EOF diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2las/las2las.vcproj work/libLAS-1.2.1/build/msvc80/las2las/las2las.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2las/las2las.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/las2las/las2las.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vcproj work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vsprops work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vsprops --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vsprops 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/las2ogr/las2ogr.vsprops 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,20 @@ + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2txt/las2txt.vcproj work/libLAS-1.2.1/build/msvc80/las2txt/las2txt.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/las2txt/las2txt.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/las2txt/las2txt.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/lasdiff/lasdiff.vcproj work/libLAS-1.2.1/build/msvc80/lasdiff/lasdiff.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/lasdiff/lasdiff.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/lasdiff/lasdiff.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/lasinfo/lasinfo.vcproj work/libLAS-1.2.1/build/msvc80/lasinfo/lasinfo.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/lasinfo/lasinfo.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/lasinfo/lasinfo.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/lasmerge/lasmerge.vcproj work/libLAS-1.2.1/build/msvc80/lasmerge/lasmerge.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/lasmerge/lasmerge.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/lasmerge/lasmerge.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_c_dll/liblas_c_dll.vcproj work/libLAS-1.2.1/build/msvc80/liblas_c_dll/liblas_c_dll.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_c_dll/liblas_c_dll.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/liblas_c_dll/liblas_c_dll.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_dll/liblas_dll.vcproj work/libLAS-1.2.1/build/msvc80/liblas_dll/liblas_dll.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_dll/liblas_dll.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/liblas_dll/liblas_dll.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_lib/liblas_lib.vcproj work/libLAS-1.2.1/build/msvc80/liblas_lib/liblas_lib.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_lib/liblas_lib.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/liblas_lib/liblas_lib.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_test/liblas_test.vcproj work/libLAS-1.2.1/build/msvc80/liblas_test/liblas_test.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas_test/liblas_test.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/liblas_test/liblas_test.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas.sln work/libLAS-1.2.1/build/msvc80/liblas.sln --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas.sln 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/liblas.sln 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,107 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_lib", "liblas_lib\liblas_lib.vcproj", "{208417AE-D08E-4938-AC26-A16ABD55AA5B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_test", "liblas_test\liblas_test.vcproj", "{EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasinfo", "lasinfo\lasinfo.vcproj", "{83AF175F-01A1-44ED-9DDA-F716A4C6FD21}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_c_dll", "liblas_c_dll\liblas_c_dll.vcproj", "{EC92BE01-CFA3-46C6-998E-810484CC5860}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{711FD426-D0B5-4176-BE24-34560B4E701E}" + ProjectSection(SolutionItems) = preProject + ..\..\AUTHORS = ..\..\AUTHORS + ..\..\ChangeLog = ..\..\ChangeLog + ..\..\CMakeLists.txt = ..\..\CMakeLists.txt + ..\..\COPYING = ..\..\COPYING + ..\..\HOWTORELEASE.txt = ..\..\HOWTORELEASE.txt + ..\..\INSTALL = ..\..\INSTALL + ..\..\LICENSE.txt = ..\..\LICENSE.txt + ..\..\makefile.vc = ..\..\makefile.vc + ..\..\NEWS = ..\..\NEWS + ..\..\nmake.opt = ..\..\nmake.opt + ..\..\README = ..\..\README + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "las2las", "las2las\las2las.vcproj", "{9BE9762E-DF68-4628-81B0-A4192A4BA3A5}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "las2txt", "las2txt\las2txt.vcproj", "{719AD6A1-CD3F-4649-8656-B071CF653E0B}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasdiff", "lasdiff\lasdiff.vcproj", "{A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasmerge", "lasmerge\lasmerge.vcproj", "{90DCFC67-4343-4880-9368-D7EAFB7ABF4F}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt2las", "txt2las\txt2las.vcproj", "{C78B8A0D-12CE-49D6-8615-96B9735564D5}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Debug|Win32.ActiveCfg = Debug|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Debug|Win32.Build.0 = Debug|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Release|Win32.ActiveCfg = Release|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Release|Win32.Build.0 = Release|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Debug|Win32.Build.0 = Debug|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Release|Win32.ActiveCfg = Release|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Release|Win32.Build.0 = Release|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Debug|Win32.ActiveCfg = Debug|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Debug|Win32.Build.0 = Debug|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Release|Win32.ActiveCfg = Release|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Release|Win32.Build.0 = Release|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Debug|Win32.Build.0 = Debug|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Release|Win32.ActiveCfg = Release|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Release|Win32.Build.0 = Release|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Debug|Win32.ActiveCfg = Debug|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Debug|Win32.Build.0 = Debug|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Release|Win32.ActiveCfg = Release|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Release|Win32.Build.0 = Release|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Debug|Win32.ActiveCfg = Debug|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Debug|Win32.Build.0 = Debug|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Release|Win32.ActiveCfg = Release|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Release|Win32.Build.0 = Release|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Debug|Win32.ActiveCfg = Debug|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Debug|Win32.Build.0 = Debug|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Release|Win32.ActiveCfg = Release|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Release|Win32.Build.0 = Release|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Debug|Win32.Build.0 = Debug|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Release|Win32.ActiveCfg = Release|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Release|Win32.Build.0 = Release|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Debug|Win32.Build.0 = Debug|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Release|Win32.ActiveCfg = Release|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas.vsprops work/libLAS-1.2.1/build/msvc80/liblas.vsprops --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/liblas.vsprops 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/liblas.vsprops 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,26 @@ + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/txt2las/txt2las.vcproj work/libLAS-1.2.1/build/msvc80/txt2las/txt2las.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc80/txt2las/txt2las.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc80/txt2las/txt2las.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/clean.bat work/libLAS-1.2.1/build/msvc90/clean.bat --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/clean.bat 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/clean.bat 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,26 @@ +@ECHO OFF +REM +REM $Id: clean.bat 917 2008-10-09 20:07:35Z mloskot $ +REM +REM This script is used to do fast cleanup of all intermediate files +REM generated by Visual Studio during building process. +REM NOTE: Some files can be erased only if liblas.sln is not loaded in VS IDE. +REM +FOR %%d in (liblas_lib liblas_dll liblas_c_dll lasdiff lasinfo lasmerge liblas_test las2las las2txt txt2las las2ogr) DO ( + IF EXIST %%d\Debug DEL /F /Q %%d\Debug\*.* + IF EXIST %%d\Release DEL /F /Q %%d\Release\*.* + IF EXIST %%d\Debug RD %%d\Debug + IF EXIST %%d\Release RD %%d\Release + IF EXIST %%d\*.vcproj.*.user DEL /F /Q %%d\*.vcproj.*.user +) + +IF EXIST .\Debug DEL /F /Q .\Debug\*.* +IF EXIST .\Release DEL /F /Q .\Release\*.* +IF EXIST .\Debug RD .\Debug +IF EXIST .\Release RD .\Release + +FOR %%f in (liblas.ncb) DO ( + IF EXIST %%f DEL /F /Q %%f +) + +REM EOF diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2las/las2las.vcproj work/libLAS-1.2.1/build/msvc90/las2las/las2las.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2las/las2las.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/las2las/las2las.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vcproj work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vsprops work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vsprops --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vsprops 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/las2ogr/las2ogr.vsprops 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,20 @@ + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2txt/las2txt.vcproj work/libLAS-1.2.1/build/msvc90/las2txt/las2txt.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/las2txt/las2txt.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/las2txt/las2txt.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/lasdiff/lasdiff.vcproj work/libLAS-1.2.1/build/msvc90/lasdiff/lasdiff.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/lasdiff/lasdiff.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/lasdiff/lasdiff.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/lasinfo/lasinfo.vcproj work/libLAS-1.2.1/build/msvc90/lasinfo/lasinfo.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/lasinfo/lasinfo.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/lasinfo/lasinfo.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/lasmerge/lasmerge.vcproj work/libLAS-1.2.1/build/msvc90/lasmerge/lasmerge.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/lasmerge/lasmerge.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/lasmerge/lasmerge.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_c_dll/liblas_c_dll.vcproj work/libLAS-1.2.1/build/msvc90/liblas_c_dll/liblas_c_dll.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_c_dll/liblas_c_dll.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/liblas_c_dll/liblas_c_dll.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_dll/liblas_dll.vcproj work/libLAS-1.2.1/build/msvc90/liblas_dll/liblas_dll.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_dll/liblas_dll.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/liblas_dll/liblas_dll.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_lib/liblas_lib.vcproj work/libLAS-1.2.1/build/msvc90/liblas_lib/liblas_lib.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_lib/liblas_lib.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/liblas_lib/liblas_lib.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_test/liblas_test.vcproj work/libLAS-1.2.1/build/msvc90/liblas_test/liblas_test.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas_test/liblas_test.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/liblas_test/liblas_test.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas.sln work/libLAS-1.2.1/build/msvc90/liblas.sln --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas.sln 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/liblas.sln 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,106 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{711FD426-D0B5-4176-BE24-34560B4E701E}" + ProjectSection(SolutionItems) = preProject + ..\..\AUTHORS = ..\..\AUTHORS + ..\..\ChangeLog = ..\..\ChangeLog + ..\..\CMakeLists.txt = ..\..\CMakeLists.txt + ..\..\COPYING = ..\..\COPYING + ..\..\HOWTORELEASE.txt = ..\..\HOWTORELEASE.txt + ..\..\INSTALL = ..\..\INSTALL + ..\..\LICENSE.txt = ..\..\LICENSE.txt + ..\..\makefile.vc = ..\..\makefile.vc + ..\..\NEWS = ..\..\NEWS + ..\..\README = ..\..\README + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_lib", "liblas_lib\liblas_lib.vcproj", "{208417AE-D08E-4938-AC26-A16ABD55AA5B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_test", "liblas_test\liblas_test.vcproj", "{EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasinfo", "lasinfo\lasinfo.vcproj", "{83AF175F-01A1-44ED-9DDA-F716A4C6FD21}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_c_dll", "liblas_c_dll\liblas_c_dll.vcproj", "{EC92BE01-CFA3-46C6-998E-810484CC5860}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "las2las", "las2las\las2las.vcproj", "{9BE9762E-DF68-4628-81B0-A4192A4BA3A5}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "las2txt", "las2txt\las2txt.vcproj", "{719AD6A1-CD3F-4649-8656-B071CF653E0B}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasdiff", "lasdiff\lasdiff.vcproj", "{A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasmerge", "lasmerge\lasmerge.vcproj", "{90DCFC67-4343-4880-9368-D7EAFB7ABF4F}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt2las", "txt2las\txt2las.vcproj", "{C78B8A0D-12CE-49D6-8615-96B9735564D5}" + ProjectSection(ProjectDependencies) = postProject + {EC92BE01-CFA3-46C6-998E-810484CC5860} = {EC92BE01-CFA3-46C6-998E-810484CC5860} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Debug|Win32.ActiveCfg = Debug|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Debug|Win32.Build.0 = Debug|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Release|Win32.ActiveCfg = Release|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Release|Win32.Build.0 = Release|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Debug|Win32.Build.0 = Debug|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Release|Win32.ActiveCfg = Release|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Release|Win32.Build.0 = Release|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Debug|Win32.ActiveCfg = Debug|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Debug|Win32.Build.0 = Debug|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Release|Win32.ActiveCfg = Release|Win32 + {83AF175F-01A1-44ED-9DDA-F716A4C6FD21}.Release|Win32.Build.0 = Release|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Debug|Win32.Build.0 = Debug|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Release|Win32.ActiveCfg = Release|Win32 + {EC92BE01-CFA3-46C6-998E-810484CC5860}.Release|Win32.Build.0 = Release|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Debug|Win32.ActiveCfg = Debug|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Debug|Win32.Build.0 = Debug|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Release|Win32.ActiveCfg = Release|Win32 + {9BE9762E-DF68-4628-81B0-A4192A4BA3A5}.Release|Win32.Build.0 = Release|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Debug|Win32.ActiveCfg = Debug|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Debug|Win32.Build.0 = Debug|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Release|Win32.ActiveCfg = Release|Win32 + {719AD6A1-CD3F-4649-8656-B071CF653E0B}.Release|Win32.Build.0 = Release|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Debug|Win32.ActiveCfg = Debug|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Debug|Win32.Build.0 = Debug|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Release|Win32.ActiveCfg = Release|Win32 + {A40F48F5-CC0E-4FDB-BFF5-EC635AB70DEB}.Release|Win32.Build.0 = Release|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Debug|Win32.Build.0 = Debug|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Release|Win32.ActiveCfg = Release|Win32 + {90DCFC67-4343-4880-9368-D7EAFB7ABF4F}.Release|Win32.Build.0 = Release|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Debug|Win32.Build.0 = Debug|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Release|Win32.ActiveCfg = Release|Win32 + {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas.vsprops work/libLAS-1.2.1/build/msvc90/liblas.vsprops --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/liblas.vsprops 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/liblas.vsprops 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,26 @@ + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/txt2las/txt2las.vcproj work/libLAS-1.2.1/build/msvc90/txt2las/txt2las.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/msvc90/txt2las/txt2las.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/msvc90/txt2las/txt2las.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.mode1v3 work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.mode1v3 --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.mode1v3 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.mode1v3 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1441 @@ + + + + + ActivePerspectiveName + Project + AllowedModules + + + BundleLoadPath + + MaxInstances + n + Module + PBXSmartGroupTreeModule + Name + Groups and Files Outline View + + + BundleLoadPath + + MaxInstances + n + Module + PBXNavigatorGroup + Name + Editor + + + BundleLoadPath + + MaxInstances + n + Module + XCTaskListModule + Name + Task List + + + BundleLoadPath + + MaxInstances + n + Module + XCDetailModule + Name + File and Smart Group Detail Viewer + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXBuildResultsModule + Name + Detailed Build Results Viewer + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXProjectFindModule + Name + Project Batch Find Tool + + + BundleLoadPath + + MaxInstances + n + Module + XCProjectFormatConflictsModule + Name + Project Format Conflicts List + + + BundleLoadPath + + MaxInstances + n + Module + PBXBookmarksModule + Name + Bookmarks Tool + + + BundleLoadPath + + MaxInstances + n + Module + PBXClassBrowserModule + Name + Class Browser + + + BundleLoadPath + + MaxInstances + n + Module + PBXCVSModule + Name + Source Code Control Tool + + + BundleLoadPath + + MaxInstances + n + Module + PBXDebugBreakpointsModule + Name + Debug Breakpoints Tool + + + BundleLoadPath + + MaxInstances + n + Module + XCDockableInspector + Name + Inspector + + + BundleLoadPath + + MaxInstances + n + Module + PBXOpenQuicklyModule + Name + Open Quickly Tool + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXDebugSessionModule + Name + Debugger + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXDebugCLIModule + Name + Debug Console + + + BundleLoadPath + + MaxInstances + n + Module + XCSnapshotModule + Name + Snapshots Tool + + + BundlePath + /Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources + Description + DefaultDescriptionKey + DockingSystemVisible + + Extension + mode1v3 + FavBarConfig + + PBXProjectModuleGUID + C80038FC0F0C60870080C499 + XCBarModuleItemNames + + XCBarModuleItems + + + FirstTimeWindowDisplayed + + Identifier + com.apple.perspectives.project.mode1v3 + MajorVersion + 33 + MinorVersion + 0 + Name + Default + Notifications + + OpenEditors + + + Content + + PBXProjectModuleGUID + C80038FD0F0C60870080C499 + PBXProjectModuleLabel + file.cpp + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + C80038FE0F0C60870080C499 + PBXProjectModuleLabel + file.cpp + _historyCapacity + 0 + bookmark + C892EFC00F1FAAD800655EE0 + history + + C8D9E04D0F13E27D00CD654B + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {1246, 590}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 5 147 1246 631 0 0 1280 778 + + + + PerspectiveWidths + + -1 + -1 + + Perspectives + + + ChosenToolbarItems + + active-target-popup + active-buildstyle-popup + action + NSToolbarFlexibleSpaceItem + buildOrClean + build-and-goOrGo + com.apple.ide.PBXToolbarStopButton + get-info + toggle-editor + NSToolbarFlexibleSpaceItem + com.apple.pbx.toolbar.searchfield + + ControllerClassBaseName + + IconName + WindowOfProjectWithEditor + Identifier + perspective.project + IsVertical + + Layout + + + BecomeActive + + ContentConfiguration + + PBXBottomSmartGroupGIDs + + 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 + 1C08E77C0454961000C914BD + 1C37FABC05509CD000000102 + 1C37FABC05539CD112110102 + E2644B35053B69B200211256 + 1C37FABC04509CD000100104 + 1CC0EA4004350EF90044410B + + PBXProjectModuleGUID + 1CE0B1FE06471DED0097A5F4 + PBXProjectModuleLabel + Files + PBXProjectStructureProvided + yes + PBXSmartGroupTreeModuleColumnData + + PBXSmartGroupTreeModuleColumnWidthsKey + + 259 + + PBXSmartGroupTreeModuleColumnsKey_v4 + + MainColumn + + + PBXSmartGroupTreeModuleOutlineStateKey_v7 + + PBXSmartGroupTreeModuleOutlineStateExpansionKey + + 0867D691FE84028FC02AAC07 + C80037E80F0C3B200080C499 + C80038250F0C3B210080C499 + 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 + 1C37FABC05509CD000000102 + + PBXSmartGroupTreeModuleOutlineStateSelectionKey + + + 28 + 25 + + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey + {{0, 0}, {259, 573}} + + PBXTopSmartGroupGIDs + + XCIncludePerspectivesSwitch + + XCSharingToken + com.apple.Xcode.GFSharingToken + + GeometryConfiguration + + Frame + {{0, 0}, {276, 591}} + GroupTreeTableConfiguration + + MainColumn + 259 + + RubberWindowFrame + 75 146 1440 632 0 0 1280 778 + + Module + PBXSmartGroupTreeModule + Proportion + 276pt + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1CE0B20306471E060097A5F4 + PBXProjectModuleLabel + lascommon.c + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 1CE0B20406471E060097A5F4 + PBXProjectModuleLabel + lascommon.c + _historyCapacity + 0 + bookmark + C892EFBF0F1FAAD800655EE0 + history + + C80038F00F0C60870080C499 + C80038F30F0C60870080C499 + C8D9E04A0F13E27D00CD654B + + prevStack + + C80038F50F0C60870080C499 + C80038F80F0C60870080C499 + + + SplitCount + 1 + + StatusBarVisibility + + + GeometryConfiguration + + Frame + {{0, 0}, {1159, 372}} + RubberWindowFrame + 75 146 1440 632 0 0 1280 778 + + Module + PBXNavigatorGroup + Proportion + 372pt + + + ContentConfiguration + + PBXProjectModuleGUID + 1CE0B20506471E060097A5F4 + PBXProjectModuleLabel + Detail + + GeometryConfiguration + + Frame + {{0, 377}, {1159, 214}} + RubberWindowFrame + 75 146 1440 632 0 0 1280 778 + + Module + XCDetailModule + Proportion + 214pt + + + Proportion + 1159pt + + + Name + Project + ServiceClasses + + XCModuleDock + PBXSmartGroupTreeModule + XCModuleDock + PBXNavigatorGroup + XCDetailModule + + TableOfContents + + C892EFBB0F1FAAD800655EE0 + 1CE0B1FE06471DED0097A5F4 + C892EFBC0F1FAAD800655EE0 + 1CE0B20306471E060097A5F4 + 1CE0B20506471E060097A5F4 + + ToolbarConfiguration + xcode.toolbar.config.defaultV3 + + + ControllerClassBaseName + + IconName + WindowOfProject + Identifier + perspective.morph + IsVertical + 0 + Layout + + + BecomeActive + 1 + ContentConfiguration + + PBXBottomSmartGroupGIDs + + 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 + 1C08E77C0454961000C914BD + 1C37FABC05509CD000000102 + 1C37FABC05539CD112110102 + E2644B35053B69B200211256 + 1C37FABC04509CD000100104 + 1CC0EA4004350EF90044410B + 1CC0EA4004350EF90041110B + + PBXProjectModuleGUID + 11E0B1FE06471DED0097A5F4 + PBXProjectModuleLabel + Files + PBXProjectStructureProvided + yes + PBXSmartGroupTreeModuleColumnData + + PBXSmartGroupTreeModuleColumnWidthsKey + + 186 + + PBXSmartGroupTreeModuleColumnsKey_v4 + + MainColumn + + + PBXSmartGroupTreeModuleOutlineStateKey_v7 + + PBXSmartGroupTreeModuleOutlineStateExpansionKey + + 29B97314FDCFA39411CA2CEA + 1C37FABC05509CD000000102 + + PBXSmartGroupTreeModuleOutlineStateSelectionKey + + + 0 + + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey + {{0, 0}, {186, 337}} + + PBXTopSmartGroupGIDs + + XCIncludePerspectivesSwitch + 1 + XCSharingToken + com.apple.Xcode.GFSharingToken + + GeometryConfiguration + + Frame + {{0, 0}, {203, 355}} + GroupTreeTableConfiguration + + MainColumn + 186 + + RubberWindowFrame + 373 269 690 397 0 0 1440 878 + + Module + PBXSmartGroupTreeModule + Proportion + 100% + + + Name + Morph + PreferredWidth + 300 + ServiceClasses + + XCModuleDock + PBXSmartGroupTreeModule + + TableOfContents + + 11E0B1FE06471DED0097A5F4 + + ToolbarConfiguration + xcode.toolbar.config.default.shortV3 + + + PerspectivesBarVisible + + ShelfIsVisible + + SourceDescription + file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec' + StatusbarIsVisible + + TimeStamp + 0.0 + ToolbarDisplayMode + 1 + ToolbarIsVisible + + ToolbarSizeMode + 1 + Type + Perspectives + UpdateMessage + The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'? + WindowJustification + 5 + WindowOrderList + + C80039000F0C60870080C499 + C80038FD0F0C60870080C499 + /Users/hobu/dev/svn/liblas/trunk/build/xcode/xcode.xcodeproj + + WindowString + 75 146 1440 632 0 0 1280 778 + WindowToolsV3 + + + FirstTimeWindowDisplayed + + Identifier + windowTool.build + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1CD0528F0623707200166675 + PBXProjectModuleLabel + + StatusBarVisibility + + + GeometryConfiguration + + Frame + {{0, 0}, {1033, 99}} + RubberWindowFrame + 56 246 1033 532 0 0 1280 778 + + Module + PBXNavigatorGroup + Proportion + 99pt + + + ContentConfiguration + + PBXBuildLogShowsTranscriptDefaultKey + {{0, 90}, {1033, 297}} + PBXProjectModuleGUID + XCMainBuildResultsModuleGUID + PBXProjectModuleLabel + Build + XCBuildResultsTrigger_Collapse + 1021 + XCBuildResultsTrigger_Open + 1011 + + GeometryConfiguration + + Frame + {{0, 104}, {1033, 387}} + RubberWindowFrame + 56 246 1033 532 0 0 1280 778 + + Module + PBXBuildResultsModule + Proportion + 387pt + + + Proportion + 491pt + + + Name + Build Results + ServiceClasses + + PBXBuildResultsModule + + StatusbarIsVisible + + TableOfContents + + C80039000F0C60870080C499 + C892EFBE0F1FAAD800655EE0 + 1CD0528F0623707200166675 + XCMainBuildResultsModuleGUID + + ToolbarConfiguration + xcode.toolbar.config.buildV3 + WindowString + 56 246 1033 532 0 0 1280 778 + WindowToolGUID + C80039000F0C60870080C499 + WindowToolIsVisible + + + + FirstTimeWindowDisplayed + + Identifier + windowTool.debugger + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + Debugger + + HorizontalSplitView + + _collapsingFrameDimension + 0.0 + _indexOfCollapsedView + 0 + _percentageOfCollapsedView + 0.0 + isCollapsed + yes + sizes + + {{0, 0}, {316, 185}} + {{316, 0}, {378, 185}} + + + VerticalSplitView + + _collapsingFrameDimension + 0.0 + _indexOfCollapsedView + 0 + _percentageOfCollapsedView + 0.0 + isCollapsed + yes + sizes + + {{0, 0}, {694, 185}} + {{0, 185}, {694, 196}} + + + + LauncherConfigVersion + 8 + PBXProjectModuleGUID + 1C162984064C10D400B95A72 + PBXProjectModuleLabel + Debug - GLUTExamples (Underwater) + + GeometryConfiguration + + DebugConsoleVisible + None + DebugConsoleWindowFrame + {{200, 200}, {500, 300}} + DebugSTDIOWindowFrame + {{200, 200}, {500, 300}} + Frame + {{0, 0}, {694, 381}} + PBXDebugSessionStackFrameViewKey + + DebugVariablesTableConfiguration + + Name + 120 + Value + 85 + Summary + 148 + + Frame + {{316, 0}, {378, 185}} + RubberWindowFrame + 274 733 694 422 0 0 1920 1178 + + RubberWindowFrame + 274 733 694 422 0 0 1920 1178 + + Module + PBXDebugSessionModule + Proportion + 381pt + + + Proportion + 381pt + + + Name + Debugger + ServiceClasses + + PBXDebugSessionModule + + StatusbarIsVisible + + TableOfContents + + 1CD10A99069EF8BA00B06720 + C80039020F0C60870080C499 + 1C162984064C10D400B95A72 + C80039030F0C60870080C499 + C80039040F0C60870080C499 + C80039050F0C60870080C499 + C80039060F0C60870080C499 + C80039070F0C60870080C499 + + ToolbarConfiguration + xcode.toolbar.config.debugV3 + WindowString + 274 733 694 422 0 0 1920 1178 + WindowToolGUID + 1CD10A99069EF8BA00B06720 + WindowToolIsVisible + + + + Identifier + windowTool.find + Layout + + + Dock + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1CDD528C0622207200134675 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 1CD0528D0623707200166675 + + SplitCount + 1 + + StatusBarVisibility + 1 + + GeometryConfiguration + + Frame + {{0, 0}, {781, 167}} + RubberWindowFrame + 62 385 781 470 0 0 1440 878 + + Module + PBXNavigatorGroup + Proportion + 781pt + + + Proportion + 50% + + + BecomeActive + 1 + ContentConfiguration + + PBXProjectModuleGUID + 1CD0528E0623707200166675 + PBXProjectModuleLabel + Project Find + + GeometryConfiguration + + Frame + {{8, 0}, {773, 254}} + RubberWindowFrame + 62 385 781 470 0 0 1440 878 + + Module + PBXProjectFindModule + Proportion + 50% + + + Proportion + 428pt + + + Name + Project Find + ServiceClasses + + PBXProjectFindModule + + StatusbarIsVisible + 1 + TableOfContents + + 1C530D57069F1CE1000CFCEE + 1C530D58069F1CE1000CFCEE + 1C530D59069F1CE1000CFCEE + 1CDD528C0622207200134675 + 1C530D5A069F1CE1000CFCEE + 1CE0B1FE06471DED0097A5F4 + 1CD0528E0623707200166675 + + WindowString + 62 385 781 470 0 0 1440 878 + WindowToolGUID + 1C530D57069F1CE1000CFCEE + WindowToolIsVisible + 0 + + + Identifier + MENUSEPARATOR + + + FirstTimeWindowDisplayed + + Identifier + windowTool.debuggerConsole + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1C78EAAC065D492600B07095 + PBXProjectModuleLabel + Debugger Console + + GeometryConfiguration + + Frame + {{0, 0}, {650, 209}} + RubberWindowFrame + 274 905 650 250 0 0 1920 1178 + + Module + PBXDebugCLIModule + Proportion + 209pt + + + Proportion + 209pt + + + Name + Debugger Console + ServiceClasses + + PBXDebugCLIModule + + StatusbarIsVisible + + TableOfContents + + 1C78EAAD065D492600B07095 + C80039080F0C60870080C499 + 1C78EAAC065D492600B07095 + + ToolbarConfiguration + xcode.toolbar.config.consoleV3 + WindowString + 274 905 650 250 0 0 1920 1178 + WindowToolGUID + 1C78EAAD065D492600B07095 + WindowToolIsVisible + + + + Identifier + windowTool.snapshots + Layout + + + Dock + + + Module + XCSnapshotModule + Proportion + 100% + + + Proportion + 100% + + + Name + Snapshots + ServiceClasses + + XCSnapshotModule + + StatusbarIsVisible + Yes + ToolbarConfiguration + xcode.toolbar.config.snapshots + WindowString + 315 824 300 550 0 0 1440 878 + WindowToolIsVisible + Yes + + + Identifier + windowTool.scm + Layout + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1C78EAB2065D492600B07095 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 1C78EAB3065D492600B07095 + + SplitCount + 1 + + StatusBarVisibility + 1 + + GeometryConfiguration + + Frame + {{0, 0}, {452, 0}} + RubberWindowFrame + 743 379 452 308 0 0 1280 1002 + + Module + PBXNavigatorGroup + Proportion + 0pt + + + BecomeActive + 1 + ContentConfiguration + + PBXProjectModuleGUID + 1CD052920623707200166675 + PBXProjectModuleLabel + SCM + + GeometryConfiguration + + ConsoleFrame + {{0, 259}, {452, 0}} + Frame + {{0, 7}, {452, 259}} + RubberWindowFrame + 743 379 452 308 0 0 1280 1002 + TableConfiguration + + Status + 30 + FileName + 199 + Path + 197.0950012207031 + + TableFrame + {{0, 0}, {452, 250}} + + Module + PBXCVSModule + Proportion + 262pt + + + Proportion + 266pt + + + Name + SCM + ServiceClasses + + PBXCVSModule + + StatusbarIsVisible + 1 + TableOfContents + + 1C78EAB4065D492600B07095 + 1C78EAB5065D492600B07095 + 1C78EAB2065D492600B07095 + 1CD052920623707200166675 + + ToolbarConfiguration + xcode.toolbar.config.scm + WindowString + 743 379 452 308 0 0 1280 1002 + + + Identifier + windowTool.breakpoints + IsVertical + 0 + Layout + + + Dock + + + BecomeActive + 1 + ContentConfiguration + + PBXBottomSmartGroupGIDs + + 1C77FABC04509CD000000102 + + PBXProjectModuleGUID + 1CE0B1FE06471DED0097A5F4 + PBXProjectModuleLabel + Files + PBXProjectStructureProvided + no + PBXSmartGroupTreeModuleColumnData + + PBXSmartGroupTreeModuleColumnWidthsKey + + 168 + + PBXSmartGroupTreeModuleColumnsKey_v4 + + MainColumn + + + PBXSmartGroupTreeModuleOutlineStateKey_v7 + + PBXSmartGroupTreeModuleOutlineStateExpansionKey + + 1C77FABC04509CD000000102 + + PBXSmartGroupTreeModuleOutlineStateSelectionKey + + + 0 + + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey + {{0, 0}, {168, 350}} + + PBXTopSmartGroupGIDs + + XCIncludePerspectivesSwitch + 0 + + GeometryConfiguration + + Frame + {{0, 0}, {185, 368}} + GroupTreeTableConfiguration + + MainColumn + 168 + + RubberWindowFrame + 315 424 744 409 0 0 1440 878 + + Module + PBXSmartGroupTreeModule + Proportion + 185pt + + + ContentConfiguration + + PBXProjectModuleGUID + 1CA1AED706398EBD00589147 + PBXProjectModuleLabel + Detail + + GeometryConfiguration + + Frame + {{190, 0}, {554, 368}} + RubberWindowFrame + 315 424 744 409 0 0 1440 878 + + Module + XCDetailModule + Proportion + 554pt + + + Proportion + 368pt + + + MajorVersion + 3 + MinorVersion + 0 + Name + Breakpoints + ServiceClasses + + PBXSmartGroupTreeModule + XCDetailModule + + StatusbarIsVisible + 1 + TableOfContents + + 1CDDB66807F98D9800BB5817 + 1CDDB66907F98D9800BB5817 + 1CE0B1FE06471DED0097A5F4 + 1CA1AED706398EBD00589147 + + ToolbarConfiguration + xcode.toolbar.config.breakpointsV3 + WindowString + 315 424 744 409 0 0 1440 878 + WindowToolGUID + 1CDDB66807F98D9800BB5817 + WindowToolIsVisible + 1 + + + Identifier + windowTool.debugAnimator + Layout + + + Dock + + + Module + PBXNavigatorGroup + Proportion + 100% + + + Proportion + 100% + + + Name + Debug Visualizer + ServiceClasses + + PBXNavigatorGroup + + StatusbarIsVisible + 1 + ToolbarConfiguration + xcode.toolbar.config.debugAnimatorV3 + WindowString + 100 100 700 500 0 0 1280 1002 + + + Identifier + windowTool.bookmarks + Layout + + + Dock + + + Module + PBXBookmarksModule + Proportion + 100% + + + Proportion + 100% + + + Name + Bookmarks + ServiceClasses + + PBXBookmarksModule + + StatusbarIsVisible + 0 + WindowString + 538 42 401 187 0 0 1280 1002 + + + Identifier + windowTool.projectFormatConflicts + Layout + + + Dock + + + Module + XCProjectFormatConflictsModule + Proportion + 100% + + + Proportion + 100% + + + Name + Project Format Conflicts + ServiceClasses + + XCProjectFormatConflictsModule + + StatusbarIsVisible + 0 + WindowContentMinSize + 450 300 + WindowString + 50 850 472 307 0 0 1440 877 + + + FirstTimeWindowDisplayed + + Identifier + windowTool.classBrowser + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + OptionsSetName + Hierarchy, project classes + PBXProjectModuleGUID + 1CA6456E063B45B4001379D8 + PBXProjectModuleLabel + Class Browser - moneypunct + + GeometryConfiguration + + ClassesFrame + {{0, 0}, {1115, 96}} + ClassesTreeTableConfiguration + + PBXClassNameColumnIdentifier + 208 + PBXClassBookColumnIdentifier + 22 + + Frame + {{0, 0}, {1367, 750}} + MembersFrame + {{0, 101}, {1115, 649}} + MembersTreeTableConfiguration + + PBXMemberTypeIconColumnIdentifier + 22 + PBXMemberNameColumnIdentifier + 216 + PBXMemberTypeColumnIdentifier + 838 + PBXMemberBookColumnIdentifier + 22 + + RubberWindowFrame + 273 383 1367 770 0 0 1920 1178 + + Module + PBXClassBrowserModule + Proportion + 750pt + + + Proportion + 750pt + + + Name + Class Browser + ServiceClasses + + PBXClassBrowserModule + + StatusbarIsVisible + + TableOfContents + + 1C0AD2AF069F1E9B00FABCE6 + C800395B0F0C685D0080C499 + 1CA6456E063B45B4001379D8 + + ToolbarConfiguration + xcode.toolbar.config.classbrowser + WindowString + 273 383 1367 770 0 0 1920 1178 + WindowToolGUID + 1C0AD2AF069F1E9B00FABCE6 + WindowToolIsVisible + + + + Identifier + windowTool.refactoring + IncludeInToolsMenu + 0 + Layout + + + Dock + + + BecomeActive + 1 + GeometryConfiguration + + Frame + {0, 0}, {500, 335} + RubberWindowFrame + {0, 0}, {500, 335} + + Module + XCRefactoringModule + Proportion + 100% + + + Proportion + 100% + + + Name + Refactoring + ServiceClasses + + XCRefactoringModule + + WindowString + 200 200 500 356 0 0 1920 1200 + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.pbxuser work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.pbxuser --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.pbxuser 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/hobu.pbxuser 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,363 @@ +// !$*UTF8*$! +{ + 0867D690FE84028FC02AAC07 /* Project object */ = { + activeBuildConfigurationName = Debug; + activeExecutable = C800390F0F0C60D10080C499 /* las2las */; + activeTarget = D2AAC09C05546B4700DB518D /* libLAS.dylib */; + addToTargets = ( + C80039290F0C613F0080C499 /* txt2las */, + ); + codeSenseManager = C80037E70F0C3ADE0080C499 /* Code sense */; + executables = ( + C80038C40F0C5E230080C499 /* lasinfo */, + C80038DD0F0C5FF10080C499 /* lasmerge */, + C800390F0F0C60D10080C499 /* las2las */, + C800391C0F0C60FE0080C499 /* las2txt */, + C800392B0F0C613F0080C499 /* txt2las */, + ); + perUserDictionary = { + PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID; + PBXFileTableDataSourceColumnWidthsKey = ( + 22, + 300, + 889, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXExecutablesDataSource_ActiveFlagID, + PBXExecutablesDataSource_NameID, + PBXExecutablesDataSource_CommentsID, + ); + }; + PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 920, + 20, + 48, + 43, + 43, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + PBXFileDataSource_Target_ColumnID, + ); + }; + PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 880, + 60, + 20, + 48, + 43, + 43, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXTargetDataSource_PrimaryAttribute, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + ); + }; + PBXPerProjectTemplateStateSaveDate = 253733541; + PBXWorkspaceStateSaveDate = 253733541; + }; + perUserProjectItems = { + C80038F00F0C60870080C499 /* PBXTextBookmark */ = C80038F00F0C60870080C499 /* PBXTextBookmark */; + C80038F30F0C60870080C499 /* PBXTextBookmark */ = C80038F30F0C60870080C499 /* PBXTextBookmark */; + C80038F50F0C60870080C499 /* PBXTextBookmark */ = C80038F50F0C60870080C499 /* PBXTextBookmark */; + C80038F80F0C60870080C499 /* PBXTextBookmark */ = C80038F80F0C60870080C499 /* PBXTextBookmark */; + C892EFBF0F1FAAD800655EE0 /* PBXTextBookmark */ = C892EFBF0F1FAAD800655EE0 /* PBXTextBookmark */; + C892EFC00F1FAAD800655EE0 /* PBXTextBookmark */ = C892EFC00F1FAAD800655EE0 /* PBXTextBookmark */; + C8D9E04A0F13E27D00CD654B /* PBXTextBookmark */ = C8D9E04A0F13E27D00CD654B /* PBXTextBookmark */; + C8D9E04D0F13E27D00CD654B /* PBXTextBookmark */ = C8D9E04D0F13E27D00CD654B /* PBXTextBookmark */; + }; + sourceControlManager = C80037E60F0C3ADE0080C499 /* Source Control */; + userBuildSettings = { + }; + }; + C80037E60F0C3ADE0080C499 /* Source Control */ = { + isa = PBXSourceControlManager; + fallbackIsa = XCSourceControlManager; + isSCMEnabled = 0; + scmConfiguration = { + }; + }; + C80037E70F0C3ADE0080C499 /* Code sense */ = { + isa = PBXCodeSenseManager; + indexTemplatePath = ""; + }; + C80038020F0C3B210080C499 /* file.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1187, 2352}}"; + sepNavSelRange = "{2208, 34}"; + sepNavVisRange = "{406, 1957}"; + sepNavWindowFrame = "{{5, 91}, {1246, 687}}"; + }; + }; + C800381B0F0C3B210080C499 /* lasfile.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1179, 1598}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1541}"; + }; + }; + C80038440F0C3B210080C499 /* liblas.hpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1179, 1632}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1609}"; + }; + }; + C80038C20F0C5E230080C499 /* lasinfo */ = { + activeExec = 0; + executables = ( + C80038C40F0C5E230080C499 /* lasinfo */, + ); + }; + C80038C40F0C5E230080C499 /* lasinfo */ = { + isa = PBXExecutable; + activeArgIndices = ( + ); + argumentStrings = ( + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 0; + configStateDict = { + }; + customDataFormattersEnabled = 1; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + dylibVariantSuffix = ""; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + libgmallocEnabled = 0; + name = lasinfo; + sourceDirectories = ( + ); + }; + C80038D10F0C5F2E0080C499 /* lascommon.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1098, 8008}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 535}"; + }; + }; + C80038DB0F0C5FF10080C499 /* lasmerge */ = { + activeExec = 0; + executables = ( + C80038DD0F0C5FF10080C499 /* lasmerge */, + ); + }; + C80038DD0F0C5FF10080C499 /* lasmerge */ = { + isa = PBXExecutable; + activeArgIndices = ( + ); + argumentStrings = ( + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 1; + configStateDict = { + }; + customDataFormattersEnabled = 1; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + libgmallocEnabled = 0; + name = lasmerge; + sourceDirectories = ( + ); + }; + C80038F00F0C60870080C499 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C80038440F0C3B210080C499 /* liblas.hpp */; + name = "liblas.hpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1609; + vrLoc = 0; + }; + C80038F30F0C60870080C499 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C800381B0F0C3B210080C499 /* lasfile.cpp */; + name = "lasfile.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1541; + vrLoc = 0; + }; + C80038F50F0C60870080C499 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C80038440F0C3B210080C499 /* liblas.hpp */; + name = "liblas.hpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1609; + vrLoc = 0; + }; + C80038F80F0C60870080C499 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C800381B0F0C3B210080C499 /* lasfile.cpp */; + name = "lasfile.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1541; + vrLoc = 0; + }; + C800390D0F0C60D10080C499 /* las2las */ = { + activeExec = 0; + executables = ( + C800390F0F0C60D10080C499 /* las2las */, + ); + }; + C800390F0F0C60D10080C499 /* las2las */ = { + isa = PBXExecutable; + activeArgIndices = ( + ); + argumentStrings = ( + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 1; + configStateDict = { + }; + customDataFormattersEnabled = 1; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + libgmallocEnabled = 0; + name = las2las; + sourceDirectories = ( + ); + }; + C800391A0F0C60FE0080C499 /* las2txt */ = { + activeExec = 0; + executables = ( + C800391C0F0C60FE0080C499 /* las2txt */, + ); + }; + C800391C0F0C60FE0080C499 /* las2txt */ = { + isa = PBXExecutable; + activeArgIndices = ( + ); + argumentStrings = ( + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 1; + configStateDict = { + }; + customDataFormattersEnabled = 1; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + libgmallocEnabled = 0; + name = las2txt; + sourceDirectories = ( + ); + }; + C80039290F0C613F0080C499 /* txt2las */ = { + activeExec = 0; + executables = ( + C800392B0F0C613F0080C499 /* txt2las */, + ); + }; + C800392B0F0C613F0080C499 /* txt2las */ = { + isa = PBXExecutable; + activeArgIndices = ( + ); + argumentStrings = ( + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 1; + configStateDict = { + }; + customDataFormattersEnabled = 1; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + libgmallocEnabled = 0; + name = txt2las; + sourceDirectories = ( + ); + }; + C892EFBF0F1FAAD800655EE0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; + name = "lascommon.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 535; + vrLoc = 0; + }; + C892EFC00F1FAAD800655EE0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C80038020F0C3B210080C499 /* file.cpp */; + name = "file.cpp: 43"; + rLen = 34; + rLoc = 2208; + rType = 0; + vrLen = 1957; + vrLoc = 406; + }; + C8D9E04A0F13E27D00CD654B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; + name = "lascommon.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 675; + vrLoc = 0; + }; + C8D9E04D0F13E27D00CD654B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C80038020F0C3B210080C499 /* file.cpp */; + name = "file.cpp: 43"; + rLen = 34; + rLoc = 2208; + rType = 0; + vrLen = 2363; + vrLoc = 0; + }; + D2AAC09C05546B4700DB518D /* libLAS.dylib */ = { + activeExec = 0; + }; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/project.pbxproj work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/project.pbxproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/project.pbxproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/build/xcode/xcode.xcodeproj/project.pbxproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,878 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + C800385E0F0C3B210080C499 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038020F0C3B210080C499 /* file.cpp */; }; + C80038610F0C3B210080C499 /* reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038070F0C3B210080C499 /* reader.cpp */; }; + C80038630F0C3B210080C499 /* reader10.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800380A0F0C3B210080C499 /* reader10.cpp */; }; + C80038650F0C3B210080C499 /* reader11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800380D0F0C3B210080C499 /* reader11.cpp */; }; + C80038670F0C3B210080C499 /* writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038100F0C3B210080C499 /* writer.cpp */; }; + C80038690F0C3B210080C499 /* writer10.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038130F0C3B210080C499 /* writer10.cpp */; }; + C800386B0F0C3B210080C499 /* writer11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038160F0C3B210080C499 /* writer11.cpp */; }; + C800386D0F0C3B210080C499 /* las_c_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038190F0C3B210080C499 /* las_c_api.cpp */; }; + C800386E0F0C3B210080C499 /* laserror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800381A0F0C3B210080C499 /* laserror.cpp */; }; + C800386F0F0C3B210080C499 /* lasfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800381B0F0C3B210080C499 /* lasfile.cpp */; }; + C80038700F0C3B210080C499 /* lasheader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800381C0F0C3B210080C499 /* lasheader.cpp */; }; + C80038710F0C3B210080C499 /* laspoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800381D0F0C3B210080C499 /* laspoint.cpp */; }; + C80038720F0C3B210080C499 /* lasreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800381E0F0C3B210080C499 /* lasreader.cpp */; }; + C80038730F0C3B210080C499 /* lasrecordheader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C800381F0F0C3B210080C499 /* lasrecordheader.cpp */; }; + C80038740F0C3B210080C499 /* laswriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80038200F0C3B210080C499 /* laswriter.cpp */; }; + C80038750F0C3B210080C499 /* las_config.h in Headers */ = {isa = PBXBuildFile; fileRef = C80038280F0C3B210080C499 /* las_config.h */; }; + C80038760F0C3B210080C499 /* las_version.h in Headers */ = {isa = PBXBuildFile; fileRef = C80038290F0C3B210080C499 /* las_version.h */; }; + C80038770F0C3B210080C499 /* liblas.h in Headers */ = {isa = PBXBuildFile; fileRef = C800382A0F0C3B210080C499 /* liblas.h */; }; + C80038780F0C3B210080C499 /* cstdint.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800382B0F0C3B210080C499 /* cstdint.hpp */; }; + C80038790F0C3B210080C499 /* endian.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800382D0F0C3B210080C499 /* endian.hpp */; }; + C800387A0F0C3B210080C499 /* file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800382E0F0C3B210080C499 /* file.hpp */; }; + C800387B0F0C3B210080C499 /* fwd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800382F0F0C3B210080C499 /* fwd.hpp */; }; + C800387C0F0C3B210080C499 /* reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038300F0C3B210080C499 /* reader.hpp */; }; + C800387D0F0C3B210080C499 /* reader10.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038310F0C3B210080C499 /* reader10.hpp */; }; + C800387E0F0C3B210080C499 /* reader11.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038320F0C3B210080C499 /* reader11.hpp */; }; + C800387F0F0C3B210080C499 /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038330F0C3B210080C499 /* sha1.hpp */; }; + C80038800F0C3B210080C499 /* sharedptr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038340F0C3B210080C499 /* sharedptr.hpp */; }; + C80038810F0C3B210080C499 /* timer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038350F0C3B210080C499 /* timer.hpp */; }; + C80038820F0C3B210080C499 /* utility.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038360F0C3B210080C499 /* utility.hpp */; }; + C80038830F0C3B210080C499 /* writer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038370F0C3B210080C499 /* writer.hpp */; }; + C80038840F0C3B210080C499 /* writer10.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038380F0C3B210080C499 /* writer10.hpp */; }; + C80038850F0C3B210080C499 /* writer11.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038390F0C3B210080C499 /* writer11.hpp */; }; + C80038860F0C3B210080C499 /* exception.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800383A0F0C3B210080C499 /* exception.hpp */; }; + C80038870F0C3B210080C499 /* guid.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800383B0F0C3B210080C499 /* guid.hpp */; }; + C80038880F0C3B210080C499 /* iterator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800383C0F0C3B210080C499 /* iterator.hpp */; }; + C80038890F0C3B210080C499 /* laserror.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800383D0F0C3B210080C499 /* laserror.hpp */; }; + C800388A0F0C3B210080C499 /* lasfile.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800383E0F0C3B210080C499 /* lasfile.hpp */; }; + C800388B0F0C3B210080C499 /* lasheader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C800383F0F0C3B210080C499 /* lasheader.hpp */; }; + C800388C0F0C3B210080C499 /* laspoint.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038400F0C3B210080C499 /* laspoint.hpp */; }; + C800388D0F0C3B210080C499 /* lasreader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038410F0C3B210080C499 /* lasreader.hpp */; }; + C800388E0F0C3B210080C499 /* lasrecordheader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038420F0C3B210080C499 /* lasrecordheader.hpp */; }; + C800388F0F0C3B210080C499 /* laswriter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038430F0C3B210080C499 /* laswriter.hpp */; }; + C80038900F0C3B210080C499 /* liblas.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C80038440F0C3B210080C499 /* liblas.hpp */; }; + C80038C90F0C5E5E0080C499 /* lasinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038C80F0C5E5E0080C499 /* lasinfo.c */; }; + C80038CE0F0C5F0B0080C499 /* libLAS.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C80038A00F0C3C2C0080C499 /* libLAS.dylib */; }; + C80038D20F0C5F2E0080C499 /* lascommon.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; }; + C80038E20F0C60300080C499 /* lasmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038E10F0C60300080C499 /* lasmerge.c */; }; + C80038E30F0C60370080C499 /* lascommon.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; }; + C80038E50F0C60470080C499 /* libLAS.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C80038A00F0C3C2C0080C499 /* libLAS.dylib */; }; + C80039120F0C60DF0080C499 /* libLAS.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C80038A00F0C3C2C0080C499 /* libLAS.dylib */; }; + C80039140F0C60F10080C499 /* las2las.c in Sources */ = {isa = PBXBuildFile; fileRef = C80039130F0C60F10080C499 /* las2las.c */; }; + C800391F0F0C610B0080C499 /* libLAS.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C80038A00F0C3C2C0080C499 /* libLAS.dylib */; }; + C80039200F0C61180080C499 /* lascommon.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; }; + C80039210F0C611C0080C499 /* lascommon.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; }; + C80039230F0C612F0080C499 /* las2txt.c in Sources */ = {isa = PBXBuildFile; fileRef = C80039220F0C612F0080C499 /* las2txt.c */; }; + C800392E0F0C614C0080C499 /* lascommon.c in Sources */ = {isa = PBXBuildFile; fileRef = C80038D10F0C5F2E0080C499 /* lascommon.c */; }; + C800392F0F0C614D0080C499 /* libLAS.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C80038A00F0C3C2C0080C499 /* libLAS.dylib */; }; + C80039310F0C61620080C499 /* txt2las.c in Sources */ = {isa = PBXBuildFile; fileRef = C80039300F0C61620080C499 /* txt2las.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + C80039410F0C619C0080C499 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2AAC09C05546B4700DB518D; + remoteInfo = libLAS.dylib; + }; + C80039430F0C61AA0080C499 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2AAC09C05546B4700DB518D; + remoteInfo = libLAS.dylib; + }; + C80039450F0C61B30080C499 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2AAC09C05546B4700DB518D; + remoteInfo = libLAS.dylib; + }; + C80039470F0C61BA0080C499 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2AAC09C05546B4700DB518D; + remoteInfo = libLAS.dylib; + }; + C80039490F0C61C30080C499 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2AAC09C05546B4700DB518D; + remoteInfo = libLAS.dylib; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + C80038020F0C3B210080C499 /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = ""; }; + C80038070F0C3B210080C499 /* reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reader.cpp; sourceTree = ""; }; + C800380A0F0C3B210080C499 /* reader10.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reader10.cpp; sourceTree = ""; }; + C800380D0F0C3B210080C499 /* reader11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reader11.cpp; sourceTree = ""; }; + C80038100F0C3B210080C499 /* writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = writer.cpp; sourceTree = ""; }; + C80038130F0C3B210080C499 /* writer10.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = writer10.cpp; sourceTree = ""; }; + C80038160F0C3B210080C499 /* writer11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = writer11.cpp; sourceTree = ""; }; + C80038190F0C3B210080C499 /* las_c_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = las_c_api.cpp; sourceTree = ""; }; + C800381A0F0C3B210080C499 /* laserror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = laserror.cpp; sourceTree = ""; }; + C800381B0F0C3B210080C499 /* lasfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lasfile.cpp; sourceTree = ""; }; + C800381C0F0C3B210080C499 /* lasheader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lasheader.cpp; sourceTree = ""; }; + C800381D0F0C3B210080C499 /* laspoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = laspoint.cpp; sourceTree = ""; }; + C800381E0F0C3B210080C499 /* lasreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lasreader.cpp; sourceTree = ""; }; + C800381F0F0C3B210080C499 /* lasrecordheader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lasrecordheader.cpp; sourceTree = ""; }; + C80038200F0C3B210080C499 /* laswriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = laswriter.cpp; sourceTree = ""; }; + C80038280F0C3B210080C499 /* las_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = las_config.h; sourceTree = ""; }; + C80038290F0C3B210080C499 /* las_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = las_version.h; sourceTree = ""; }; + C800382A0F0C3B210080C499 /* liblas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = liblas.h; sourceTree = ""; }; + C800382B0F0C3B210080C499 /* cstdint.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cstdint.hpp; sourceTree = ""; }; + C800382D0F0C3B210080C499 /* endian.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = endian.hpp; sourceTree = ""; }; + C800382E0F0C3B210080C499 /* file.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file.hpp; sourceTree = ""; }; + C800382F0F0C3B210080C499 /* fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fwd.hpp; sourceTree = ""; }; + C80038300F0C3B210080C499 /* reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reader.hpp; sourceTree = ""; }; + C80038310F0C3B210080C499 /* reader10.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reader10.hpp; sourceTree = ""; }; + C80038320F0C3B210080C499 /* reader11.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reader11.hpp; sourceTree = ""; }; + C80038330F0C3B210080C499 /* sha1.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sha1.hpp; sourceTree = ""; }; + C80038340F0C3B210080C499 /* sharedptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sharedptr.hpp; sourceTree = ""; }; + C80038350F0C3B210080C499 /* timer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = timer.hpp; sourceTree = ""; }; + C80038360F0C3B210080C499 /* utility.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utility.hpp; sourceTree = ""; }; + C80038370F0C3B210080C499 /* writer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = writer.hpp; sourceTree = ""; }; + C80038380F0C3B210080C499 /* writer10.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = writer10.hpp; sourceTree = ""; }; + C80038390F0C3B210080C499 /* writer11.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = writer11.hpp; sourceTree = ""; }; + C800383A0F0C3B210080C499 /* exception.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = exception.hpp; sourceTree = ""; }; + C800383B0F0C3B210080C499 /* guid.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = guid.hpp; sourceTree = ""; }; + C800383C0F0C3B210080C499 /* iterator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = iterator.hpp; sourceTree = ""; }; + C800383D0F0C3B210080C499 /* laserror.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = laserror.hpp; sourceTree = ""; }; + C800383E0F0C3B210080C499 /* lasfile.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lasfile.hpp; sourceTree = ""; }; + C800383F0F0C3B210080C499 /* lasheader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lasheader.hpp; sourceTree = ""; }; + C80038400F0C3B210080C499 /* laspoint.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = laspoint.hpp; sourceTree = ""; }; + C80038410F0C3B210080C499 /* lasreader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lasreader.hpp; sourceTree = ""; }; + C80038420F0C3B210080C499 /* lasrecordheader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lasrecordheader.hpp; sourceTree = ""; }; + C80038430F0C3B210080C499 /* laswriter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = laswriter.hpp; sourceTree = ""; }; + C80038440F0C3B210080C499 /* liblas.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = liblas.hpp; sourceTree = ""; }; + C80038A00F0C3C2C0080C499 /* libLAS.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libLAS.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + C80038C30F0C5E230080C499 /* lasinfo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lasinfo; sourceTree = BUILT_PRODUCTS_DIR; }; + C80038C80F0C5E5E0080C499 /* lasinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lasinfo.c; path = ../../apps/lasinfo.c; sourceTree = SOURCE_ROOT; }; + C80038D10F0C5F2E0080C499 /* lascommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lascommon.c; path = ../../apps/lascommon.c; sourceTree = SOURCE_ROOT; }; + C80038DC0F0C5FF10080C499 /* lasmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lasmerge; sourceTree = BUILT_PRODUCTS_DIR; }; + C80038E10F0C60300080C499 /* lasmerge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lasmerge.c; path = ../../apps/lasmerge.c; sourceTree = SOURCE_ROOT; }; + C800390E0F0C60D10080C499 /* las2las */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = las2las; sourceTree = BUILT_PRODUCTS_DIR; }; + C80039130F0C60F10080C499 /* las2las.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = las2las.c; path = ../../apps/las2las.c; sourceTree = SOURCE_ROOT; }; + C800391B0F0C60FE0080C499 /* las2txt */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = las2txt; sourceTree = BUILT_PRODUCTS_DIR; }; + C80039220F0C612F0080C499 /* las2txt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = las2txt.c; path = ../../apps/las2txt.c; sourceTree = SOURCE_ROOT; }; + C800392A0F0C613F0080C499 /* txt2las */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = txt2las; sourceTree = BUILT_PRODUCTS_DIR; }; + C80039300F0C61620080C499 /* txt2las.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = txt2las.c; path = ../../apps/txt2las.c; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + C80038C10F0C5E230080C499 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C80038CE0F0C5F0B0080C499 /* libLAS.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C80038DA0F0C5FF10080C499 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C80038E50F0C60470080C499 /* libLAS.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C800390C0F0C60D10080C499 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C80039120F0C60DF0080C499 /* libLAS.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C80039190F0C60FE0080C499 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C800391F0F0C610B0080C499 /* libLAS.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C80039280F0C613F0080C499 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C800392F0F0C614D0080C499 /* libLAS.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2AAC09B05546B4700DB518D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 0867D691FE84028FC02AAC07 /* xcode */ = { + isa = PBXGroup; + children = ( + C80039300F0C61620080C499 /* txt2las.c */, + C80039220F0C612F0080C499 /* las2txt.c */, + C80039130F0C60F10080C499 /* las2las.c */, + C80038E10F0C60300080C499 /* lasmerge.c */, + C80038D10F0C5F2E0080C499 /* lascommon.c */, + C80037E80F0C3B200080C499 /* src */, + C80038250F0C3B210080C499 /* include */, + C80038A00F0C3C2C0080C499 /* libLAS.dylib */, + C80038C30F0C5E230080C499 /* lasinfo */, + C80038C80F0C5E5E0080C499 /* lasinfo.c */, + C80038DC0F0C5FF10080C499 /* lasmerge */, + C800390E0F0C60D10080C499 /* las2las */, + C800391B0F0C60FE0080C499 /* las2txt */, + C800392A0F0C613F0080C499 /* txt2las */, + ); + name = xcode; + sourceTree = ""; + }; + C80037E80F0C3B200080C499 /* src */ = { + isa = PBXGroup; + children = ( + C80037EA0F0C3B210080C499 /* detail */, + C80038190F0C3B210080C499 /* las_c_api.cpp */, + C800381A0F0C3B210080C499 /* laserror.cpp */, + C800381B0F0C3B210080C499 /* lasfile.cpp */, + C800381C0F0C3B210080C499 /* lasheader.cpp */, + C800381D0F0C3B210080C499 /* laspoint.cpp */, + C800381E0F0C3B210080C499 /* lasreader.cpp */, + C800381F0F0C3B210080C499 /* lasrecordheader.cpp */, + C80038200F0C3B210080C499 /* laswriter.cpp */, + ); + name = src; + path = ../../src; + sourceTree = SOURCE_ROOT; + }; + C80037EA0F0C3B210080C499 /* detail */ = { + isa = PBXGroup; + children = ( + C80038020F0C3B210080C499 /* file.cpp */, + C80038070F0C3B210080C499 /* reader.cpp */, + C800380A0F0C3B210080C499 /* reader10.cpp */, + C800380D0F0C3B210080C499 /* reader11.cpp */, + C80038100F0C3B210080C499 /* writer.cpp */, + C80038130F0C3B210080C499 /* writer10.cpp */, + C80038160F0C3B210080C499 /* writer11.cpp */, + ); + path = detail; + sourceTree = ""; + }; + C80038250F0C3B210080C499 /* include */ = { + isa = PBXGroup; + children = ( + C80038260F0C3B210080C499 /* liblas */, + ); + name = include; + path = ../../include; + sourceTree = SOURCE_ROOT; + }; + C80038260F0C3B210080C499 /* liblas */ = { + isa = PBXGroup; + children = ( + C80038270F0C3B210080C499 /* capi */, + C800382B0F0C3B210080C499 /* cstdint.hpp */, + C800382C0F0C3B210080C499 /* detail */, + C800383A0F0C3B210080C499 /* exception.hpp */, + C800383B0F0C3B210080C499 /* guid.hpp */, + C800383C0F0C3B210080C499 /* iterator.hpp */, + C800383D0F0C3B210080C499 /* laserror.hpp */, + C800383E0F0C3B210080C499 /* lasfile.hpp */, + C800383F0F0C3B210080C499 /* lasheader.hpp */, + C80038400F0C3B210080C499 /* laspoint.hpp */, + C80038410F0C3B210080C499 /* lasreader.hpp */, + C80038420F0C3B210080C499 /* lasrecordheader.hpp */, + C80038430F0C3B210080C499 /* laswriter.hpp */, + C80038440F0C3B210080C499 /* liblas.hpp */, + ); + path = liblas; + sourceTree = ""; + }; + C80038270F0C3B210080C499 /* capi */ = { + isa = PBXGroup; + children = ( + C80038280F0C3B210080C499 /* las_config.h */, + C80038290F0C3B210080C499 /* las_version.h */, + C800382A0F0C3B210080C499 /* liblas.h */, + ); + path = capi; + sourceTree = ""; + }; + C800382C0F0C3B210080C499 /* detail */ = { + isa = PBXGroup; + children = ( + C800382D0F0C3B210080C499 /* endian.hpp */, + C800382E0F0C3B210080C499 /* file.hpp */, + C800382F0F0C3B210080C499 /* fwd.hpp */, + C80038300F0C3B210080C499 /* reader.hpp */, + C80038310F0C3B210080C499 /* reader10.hpp */, + C80038320F0C3B210080C499 /* reader11.hpp */, + C80038330F0C3B210080C499 /* sha1.hpp */, + C80038340F0C3B210080C499 /* sharedptr.hpp */, + C80038350F0C3B210080C499 /* timer.hpp */, + C80038360F0C3B210080C499 /* utility.hpp */, + C80038370F0C3B210080C499 /* writer.hpp */, + C80038380F0C3B210080C499 /* writer10.hpp */, + C80038390F0C3B210080C499 /* writer11.hpp */, + ); + path = detail; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + D2AAC09905546B4700DB518D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + C80038750F0C3B210080C499 /* las_config.h in Headers */, + C80038760F0C3B210080C499 /* las_version.h in Headers */, + C80038770F0C3B210080C499 /* liblas.h in Headers */, + C80038780F0C3B210080C499 /* cstdint.hpp in Headers */, + C80038790F0C3B210080C499 /* endian.hpp in Headers */, + C800387A0F0C3B210080C499 /* file.hpp in Headers */, + C800387B0F0C3B210080C499 /* fwd.hpp in Headers */, + C800387C0F0C3B210080C499 /* reader.hpp in Headers */, + C800387D0F0C3B210080C499 /* reader10.hpp in Headers */, + C800387E0F0C3B210080C499 /* reader11.hpp in Headers */, + C800387F0F0C3B210080C499 /* sha1.hpp in Headers */, + C80038800F0C3B210080C499 /* sharedptr.hpp in Headers */, + C80038810F0C3B210080C499 /* timer.hpp in Headers */, + C80038820F0C3B210080C499 /* utility.hpp in Headers */, + C80038830F0C3B210080C499 /* writer.hpp in Headers */, + C80038840F0C3B210080C499 /* writer10.hpp in Headers */, + C80038850F0C3B210080C499 /* writer11.hpp in Headers */, + C80038860F0C3B210080C499 /* exception.hpp in Headers */, + C80038870F0C3B210080C499 /* guid.hpp in Headers */, + C80038880F0C3B210080C499 /* iterator.hpp in Headers */, + C80038890F0C3B210080C499 /* laserror.hpp in Headers */, + C800388A0F0C3B210080C499 /* lasfile.hpp in Headers */, + C800388B0F0C3B210080C499 /* lasheader.hpp in Headers */, + C800388C0F0C3B210080C499 /* laspoint.hpp in Headers */, + C800388D0F0C3B210080C499 /* lasreader.hpp in Headers */, + C800388E0F0C3B210080C499 /* lasrecordheader.hpp in Headers */, + C800388F0F0C3B210080C499 /* laswriter.hpp in Headers */, + C80038900F0C3B210080C499 /* liblas.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + C80038C20F0C5E230080C499 /* lasinfo */ = { + isa = PBXNativeTarget; + buildConfigurationList = C80038C70F0C5E420080C499 /* Build configuration list for PBXNativeTarget "lasinfo" */; + buildPhases = ( + C80038C00F0C5E230080C499 /* Sources */, + C80038C10F0C5E230080C499 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C800394A0F0C61C30080C499 /* PBXTargetDependency */, + ); + name = lasinfo; + productName = lasinfo; + productReference = C80038C30F0C5E230080C499 /* lasinfo */; + productType = "com.apple.product-type.tool"; + }; + C80038DB0F0C5FF10080C499 /* lasmerge */ = { + isa = PBXNativeTarget; + buildConfigurationList = C80038E00F0C601F0080C499 /* Build configuration list for PBXNativeTarget "lasmerge" */; + buildPhases = ( + C80038D90F0C5FF10080C499 /* Sources */, + C80038DA0F0C5FF10080C499 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C80039480F0C61BA0080C499 /* PBXTargetDependency */, + ); + name = lasmerge; + productName = lasmerge; + productReference = C80038DC0F0C5FF10080C499 /* lasmerge */; + productType = "com.apple.product-type.tool"; + }; + C800390D0F0C60D10080C499 /* las2las */ = { + isa = PBXNativeTarget; + buildConfigurationList = C80039150F0C60F20080C499 /* Build configuration list for PBXNativeTarget "las2las" */; + buildPhases = ( + C800390B0F0C60D10080C499 /* Sources */, + C800390C0F0C60D10080C499 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C80039460F0C61B30080C499 /* PBXTargetDependency */, + ); + name = las2las; + productName = las2las; + productReference = C800390E0F0C60D10080C499 /* las2las */; + productType = "com.apple.product-type.tool"; + }; + C800391A0F0C60FE0080C499 /* las2txt */ = { + isa = PBXNativeTarget; + buildConfigurationList = C80039240F0C612F0080C499 /* Build configuration list for PBXNativeTarget "las2txt" */; + buildPhases = ( + C80039180F0C60FE0080C499 /* Sources */, + C80039190F0C60FE0080C499 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C80039440F0C61AA0080C499 /* PBXTargetDependency */, + ); + name = las2txt; + productName = las2txt; + productReference = C800391B0F0C60FE0080C499 /* las2txt */; + productType = "com.apple.product-type.tool"; + }; + C80039290F0C613F0080C499 /* txt2las */ = { + isa = PBXNativeTarget; + buildConfigurationList = C80039320F0C61620080C499 /* Build configuration list for PBXNativeTarget "txt2las" */; + buildPhases = ( + C80039270F0C613F0080C499 /* Sources */, + C80039280F0C613F0080C499 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C80039420F0C619C0080C499 /* PBXTargetDependency */, + ); + name = txt2las; + productName = txt2las; + productReference = C800392A0F0C613F0080C499 /* txt2las */; + productType = "com.apple.product-type.tool"; + }; + D2AAC09C05546B4700DB518D /* libLAS.dylib */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1DEB916008733D950010E9CD /* Build configuration list for PBXNativeTarget "libLAS.dylib" */; + buildPhases = ( + D2AAC09905546B4700DB518D /* Headers */, + D2AAC09B05546B4700DB518D /* Frameworks */, + D2AAC09A05546B4700DB518D /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = libLAS.dylib; + productName = libxcode; + productReference = C80038A00F0C3C2C0080C499 /* libLAS.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 0867D690FE84028FC02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 1DEB916408733D950010E9CD /* Build configuration list for PBXProject "xcode" */; + compatibilityVersion = "Xcode 3.1"; + hasScannedForEncodings = 1; + mainGroup = 0867D691FE84028FC02AAC07 /* xcode */; + productRefGroup = 0867D691FE84028FC02AAC07 /* xcode */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + D2AAC09C05546B4700DB518D /* libLAS.dylib */, + C80038C20F0C5E230080C499 /* lasinfo */, + C80038DB0F0C5FF10080C499 /* lasmerge */, + C800390D0F0C60D10080C499 /* las2las */, + C800391A0F0C60FE0080C499 /* las2txt */, + C80039290F0C613F0080C499 /* txt2las */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + C80038C00F0C5E230080C499 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C80038C90F0C5E5E0080C499 /* lasinfo.c in Sources */, + C80038D20F0C5F2E0080C499 /* lascommon.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C80038D90F0C5FF10080C499 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C80038E20F0C60300080C499 /* lasmerge.c in Sources */, + C80038E30F0C60370080C499 /* lascommon.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C800390B0F0C60D10080C499 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C80039200F0C61180080C499 /* lascommon.c in Sources */, + C80039140F0C60F10080C499 /* las2las.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C80039180F0C60FE0080C499 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C80039210F0C611C0080C499 /* lascommon.c in Sources */, + C80039230F0C612F0080C499 /* las2txt.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C80039270F0C613F0080C499 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C800392E0F0C614C0080C499 /* lascommon.c in Sources */, + C80039310F0C61620080C499 /* txt2las.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2AAC09A05546B4700DB518D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C800385E0F0C3B210080C499 /* file.cpp in Sources */, + C80038610F0C3B210080C499 /* reader.cpp in Sources */, + C80038630F0C3B210080C499 /* reader10.cpp in Sources */, + C80038650F0C3B210080C499 /* reader11.cpp in Sources */, + C80038670F0C3B210080C499 /* writer.cpp in Sources */, + C80038690F0C3B210080C499 /* writer10.cpp in Sources */, + C800386B0F0C3B210080C499 /* writer11.cpp in Sources */, + C800386D0F0C3B210080C499 /* las_c_api.cpp in Sources */, + C800386E0F0C3B210080C499 /* laserror.cpp in Sources */, + C800386F0F0C3B210080C499 /* lasfile.cpp in Sources */, + C80038700F0C3B210080C499 /* lasheader.cpp in Sources */, + C80038710F0C3B210080C499 /* laspoint.cpp in Sources */, + C80038720F0C3B210080C499 /* lasreader.cpp in Sources */, + C80038730F0C3B210080C499 /* lasrecordheader.cpp in Sources */, + C80038740F0C3B210080C499 /* laswriter.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + C80039420F0C619C0080C499 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC09C05546B4700DB518D /* libLAS.dylib */; + targetProxy = C80039410F0C619C0080C499 /* PBXContainerItemProxy */; + }; + C80039440F0C61AA0080C499 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC09C05546B4700DB518D /* libLAS.dylib */; + targetProxy = C80039430F0C61AA0080C499 /* PBXContainerItemProxy */; + }; + C80039460F0C61B30080C499 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC09C05546B4700DB518D /* libLAS.dylib */; + targetProxy = C80039450F0C61B30080C499 /* PBXContainerItemProxy */; + }; + C80039480F0C61BA0080C499 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC09C05546B4700DB518D /* libLAS.dylib */; + targetProxy = C80039470F0C61BA0080C499 /* PBXContainerItemProxy */; + }; + C800394A0F0C61C30080C499 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC09C05546B4700DB518D /* libLAS.dylib */; + targetProxy = C80039490F0C61C30080C499 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 1DEB916108733D950010E9CD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_GLIBCXX_DEBUG=1", + "_GLIBCXX_DEBUG_PEDANTIC=1", + ); + PRODUCT_NAME = libLAS; + }; + name = Debug; + }; + 1DEB916208733D950010E9CD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = xcode_Prefix.pch; + PRODUCT_NAME = libLAS; + STRIP_INSTALLED_PRODUCT = YES; + STRIP_STYLE = "non-global"; + }; + name = Release; + }; + 1DEB916508733D950010E9CD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\"/**"; + ONLY_ACTIVE_ARCH = YES; + PREBINDING = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; + SDKROOT = macosx10.5; + }; + name = Debug; + }; + 1DEB916608733D950010E9CD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\"/**"; + PREBINDING = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; + SDKROOT = macosx10.5; + }; + name = Release; + }; + C80038C50F0C5E230080C499 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = lasinfo; + }; + name = Debug; + }; + C80038C60F0C5E230080C499 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "\"$(SRCROOT)/../../bin\""; + PREBINDING = NO; + PRODUCT_NAME = lasinfo; + ZERO_LINK = NO; + }; + name = Release; + }; + C80038DE0F0C5FF10080C499 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = lasmerge; + }; + name = Debug; + }; + C80038DF0F0C5FF10080C499 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "\"$(SRCROOT)/../../bin\""; + PREBINDING = NO; + PRODUCT_NAME = lasmerge; + ZERO_LINK = NO; + }; + name = Release; + }; + C80039100F0C60D20080C499 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = las2las; + }; + name = Debug; + }; + C80039110F0C60D20080C499 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = las2las; + ZERO_LINK = NO; + }; + name = Release; + }; + C800391D0F0C60FF0080C499 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = las2txt; + }; + name = Debug; + }; + C800391E0F0C60FF0080C499 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = las2txt; + ZERO_LINK = NO; + }; + name = Release; + }; + C800392C0F0C613F0080C499 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = txt2las; + }; + name = Debug; + }; + C800392D0F0C613F0080C499 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = txt2las; + ZERO_LINK = NO; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1DEB916008733D950010E9CD /* Build configuration list for PBXNativeTarget "libLAS.dylib" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB916108733D950010E9CD /* Debug */, + 1DEB916208733D950010E9CD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1DEB916408733D950010E9CD /* Build configuration list for PBXProject "xcode" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB916508733D950010E9CD /* Debug */, + 1DEB916608733D950010E9CD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C80038C70F0C5E420080C499 /* Build configuration list for PBXNativeTarget "lasinfo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C80038C50F0C5E230080C499 /* Debug */, + C80038C60F0C5E230080C499 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C80038E00F0C601F0080C499 /* Build configuration list for PBXNativeTarget "lasmerge" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C80038DE0F0C5FF10080C499 /* Debug */, + C80038DF0F0C5FF10080C499 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C80039150F0C60F20080C499 /* Build configuration list for PBXNativeTarget "las2las" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C80039100F0C60D20080C499 /* Debug */, + C80039110F0C60D20080C499 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C80039240F0C612F0080C499 /* Build configuration list for PBXNativeTarget "las2txt" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C800391D0F0C60FF0080C499 /* Debug */, + C800391E0F0C60FF0080C499 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C80039320F0C61620080C499 /* Build configuration list for PBXNativeTarget "txt2las" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C800392C0F0C613F0080C499 /* Debug */, + C800392D0F0C613F0080C499 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 0867D690FE84028FC02AAC07 /* Project object */; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/ChangeLog work/libLAS-1.2.1/ChangeLog --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/ChangeLog 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/ChangeLog 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1100 @@ +2009-03-25 16:58 hobu + + * trunk/nmake.opt: tweak some comments + +2009-03-25 16:52 hobu + + * trunk/configure.ac: name our dist target to liblas-src and ensure + that the .bz2 file is made with 'make dist' + +2009-03-25 11:22 mloskot + + * trunk: Updated svn:ignore property. + +2009-03-25 11:21 mloskot + + * trunk/build/msvc90, trunk/build/msvc90/las2las, + trunk/build/msvc90/las2txt, trunk/build/msvc90/lasdiff, + trunk/build/msvc90/lasinfo, trunk/build/msvc90/lasmerge, + trunk/build/msvc90/liblas_c_dll, trunk/build/msvc90/liblas_lib, + trunk/build/msvc90/liblas_test, trunk/build/msvc90/txt2las: Updated + svn:ignore property. + +2009-03-25 11:14 mloskot + + * trunk/apps/makefile.vc, trunk/nmake.opt: nmake.opt: Added support of + EXT_NMAKE_OPT for building libLAS with NMAKE (Ticket #117). + Improved detection of GDAL_HOME and GEOTIFF_HOME - check if + directories exist. Added auto-magical determination of version of + Visual C++ compiler based on NMAKE version (see WARNING in + NMAKE). + +2009-03-25 09:56 mloskot + + * trunk/nmake.opt: Fixed LF to CRLF in nmake.opt. + +2009-03-25 09:43 mloskot + + * trunk/src: Updated svn:ignore property for src. + +2009-03-23 09:47 mloskot + + * trunk/build/msvc90/liblas_lib/liblas_lib.vcproj: build/msvc90: + updated project files after renaming classes LASSRS and LASVLR." + +2009-03-22 20:13 hobu + + * trunk/include/liblas/lascolor.hpp, trunk/src/lascolor.cpp: fix #116, + LASColor has no == operation + +2009-03-22 20:12 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: Fix + #115, add Get/SetPointSourceId to C API + +2009-03-20 21:16 mloskot + + * trunk/src/makefile.vc: Renamed class LASVLR to LASVariableRecord in + src/makefile.vc (Ticket #114). + +2009-03-20 20:59 mloskot + + * trunk/src/Makefile.am: Renamed class LASVLR to LASVariableRecord in + src/Makefile.am (Ticket 14). The C API has not been touched. + +2009-03-20 20:55 mloskot + + * trunk/build/msvc80/liblas_dll/liblas_dll.vcproj, + trunk/build/msvc80/liblas_lib/liblas_lib.vcproj, + trunk/build/msvc80/liblas_test/liblas_test.vcproj, + trunk/build/msvc90/liblas_dll/liblas_dll.vcproj, + trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, + trunk/build/msvc90/liblas_test/liblas_test.vcproj, + trunk/include/Makefile.am, trunk/include/liblas/lasheader.hpp, + trunk/include/liblas/lasreader.hpp, + trunk/include/liblas/lasrecordheader.hpp, + trunk/include/liblas/lasspatialreference.hpp, + trunk/include/liblas/lasvariablerecord.hpp, trunk/src/CMakeLists.txt, + trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp, + trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, + trunk/src/detail/writer.cpp, trunk/src/las_c_api.cpp, + trunk/src/lasheader.cpp, trunk/src/lasrecordheader.cpp, + trunk/src/lasspatialreference.cpp, trunk/src/lasvariablerecord.cpp, + trunk/test/unit/CMakeLists.txt, trunk/test/unit/Makefile.am, + trunk/test/unit/lasrecordheader_test.cpp, + trunk/test/unit/lasvariablerecord_test.cpp: Renamed class LASVLR to + LASVariableRecord (Ticket #114). The C API has not been touched. + +2009-03-20 20:42 mloskot + + * trunk/test/unit/Makefile.am: Renamed class LASSRS to + LASSpatialReference in test/unit/Makefile.am (Ticket #113). + +2009-03-20 20:35 mloskot + + * trunk/build/msvc80/liblas_lib/liblas_lib.vcproj, + trunk/build/msvc80/liblas_test/liblas_test.vcproj, + trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, + trunk/include/Makefile.am, trunk/include/liblas/detail/fwd.hpp, + trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/detail/writer.hpp, + trunk/include/liblas/lasheader.hpp, + trunk/include/liblas/lasreader.hpp, + trunk/include/liblas/lasspatialreference.hpp, + trunk/include/liblas/lassrs.hpp, trunk/include/liblas/laswriter.hpp, + trunk/src/CMakeLists.txt, trunk/src/Makefile.am, + trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp, + trunk/src/las_c_api.cpp, trunk/src/lasheader.cpp, + trunk/src/lasreader.cpp, trunk/src/lasspatialreference.cpp, + trunk/src/lassrs.cpp, trunk/src/laswriter.cpp, trunk/src/makefile.vc, + trunk/test/unit/lasheader_test.cpp, + trunk/test/unit/lasspatialreference_test.cpp, + trunk/test/unit/lassrs_test.cpp: Renamed class LASSRS to + LASSpatialReference (Ticket #113). The C API has not been + touched. + +2009-03-20 18:02 hobu + + * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, + trunk/nmake.opt, trunk/python/setup.py: increment versions in prep + for 1.2.0b3 + +2009-03-20 17:19 hobu + + * trunk/python/tests/Header.txt: try to fix date test again + +2009-03-20 16:59 hobu + + * trunk/python/tests/SRS.txt, trunk/python/tests/VLR.txt: Guards for + when we have no HAVE_LIBGEOTIFF + +2009-03-20 16:59 hobu + + * trunk/python/tests/File.txt: Make sure that void functions return + None for ctype or we'll get unexpected jtrunk back + +2009-03-20 16:57 hobu + + * trunk/python/liblas/core.py: Make sure that void functions return + None for ctype or we'll get unexpected jtrunk back + +2009-03-20 16:50 hobu + + * trunk/python/liblas/core.py: don't know where LASReader_Destroy + went + +2009-03-20 16:25 hobu + + * trunk/src/las_c_api.cpp: We use #ifdef _WIN32 instead of #ifdef + WIN32 for strncasecmp + +2009-03-20 01:31 mloskot + + * trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/lasreader.hpp, trunk/src/detail/reader.cpp, + trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp, + trunk/src/detail/reader12.cpp, trunk/src/lasreader.cpp: Fixed + weakness of MakePIMPL by reverting changes applied as r984 and + bringing m_pimpl back to constness. There is no need to re-create + internal reader object and reassign it to m_pimpl, because reader + state can be correctly reset by simple call of LASReader::Init. + This fix is also related to Ticket #85. All 87 test cases pass. + +2009-03-20 01:27 mloskot + + * trunk/test/unit/lasreader_iterator_test.cpp: Fixed LF. + +2009-03-20 00:45 mloskot + + * trunk/build/msvc80/liblas_lib/liblas_lib.vcproj, + trunk/build/msvc80/liblas_test/liblas_test.vcproj: Updated + build/msvc80 adding new files. Use $(SolutionDir) macro in unit + test runner, instead of relative path. + +2009-03-20 00:44 mloskot + + * trunk/test/unit/liblas_test_suite.cpp: Cleanup + +2009-03-20 00:35 mloskot + + * trunk/test/unit/lasreader_iterator_test.cpp: Fixed missing reset + operation on reader when re-using it with iterators (#85). + +2009-03-20 00:31 mloskot + + * trunk/src/lasreader.cpp: Fixed but with incompletely re-initialized + LASReader after reset. The MakePIMPL idea is weak. + +2009-03-19 22:34 hobu + + * trunk/python/liblas/core.py, trunk/python/tests/File.txt: beef up + test for _Destroy being called twice + +2009-03-19 22:11 hobu + + * trunk/src/las_c_api.cpp: strncasecmp doesn't exist on windows + +2009-03-19 18:16 hobu + + * trunk/src/las_c_api.cpp: fix #112, rename VALIDATE_POINTER0 and + VALIDATE_POINTER1 + +2009-03-19 04:20 hobu + + * trunk/include/liblas/lasheader.hpp, trunk/python/liblas/file.py, + trunk/python/tests/File.txt, trunk/src/las_c_api.cpp, + trunk/src/lasheader.cpp: stop tracking open readers/writers in + order to allow multiple readers to operate on a file #111 + +2009-03-18 03:40 hobu + + * trunk/include/liblas/detail/writer.hpp: dummy struct for when we + don't have GDAL + +2009-03-17 17:30 hobu + + * trunk/apps/las2txt.c: fix #109, las2txt doesn't output RGB + +2009-03-17 17:24 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: fix + #110, LASSRS VLR methods for C API + +2009-03-17 17:19 hobu + + * trunk/python/liblas/core.py, trunk/python/liblas/srs.py, + trunk/python/tests/SRS.txt: Add VLR methods to srs object + +2009-03-17 17:12 hobu + + * trunk/src/detail/writer.cpp: oops #108 + +2009-03-17 16:58 hobu + + * trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/detail/writer.hpp, trunk/python/tests/SRS.txt, + trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp: Fix #108, + LASWriter::SetSRS and LASReader::SetSRS don't work + +2009-03-17 16:56 hobu + + * trunk/python/liblas/file.py: clean up __del__ a bit when core is + already deleted + +2009-03-17 16:55 hobu + + * trunk/python/liblas/point.py: complete #106, add descale/scale + convenience methods to liblas.point + +2009-03-17 04:15 hobu + + * trunk/src/lassrs.cpp: clean up a bit + +2009-03-17 04:05 hobu + + * trunk/include/liblas/capi/liblas.h, + trunk/include/liblas/detail/reader.hpp, trunk/python/liblas/core.py, + trunk/python/liblas/file.py, trunk/python/tests/SRS.txt, + trunk/src/detail/reader.cpp, trunk/src/las_c_api.cpp, + trunk/src/lassrs.cpp: start fixing LASReader/LASWriter SetSRS + methods + +2009-03-16 14:57 hobu + + * trunk/test/unit/Makefile.am, trunk/test/unit/common.cpp, + trunk/test/unit/lasheader_test.cpp, + trunk/test/unit/laspoint_test.cpp, trunk/test/unit/lassrs_test.cpp: + making mloskot proud by adding to the tests + +2009-03-13 17:35 hobu + + * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, + trunk/nmake.opt, trunk/python/setup.py: increment versions to 1.2.0b2 + in preparation for release + +2009-03-13 17:34 hobu + + * trunk/apps/makefile.vc: link GEOTIFF_LIB to everything because we + do GTIFPrint when available now. + +2009-03-13 04:35 hobu + + * trunk/configure.ac: try again on r1098 + +2009-03-13 04:30 hobu + + * trunk/configure.ac: try again on r1097 + +2009-03-13 04:04 hobu + + * trunk/configure.ac: don't overwrite GEOTIFF_INC in the GDAL source + tree case with the wrong stuff + +2009-03-12 19:53 hobu + + * trunk/apps/las2las.c: default to writing 1.2 files for las2las, can + be overriden with --format + +2009-03-12 19:53 hobu + + * trunk/apps/txt2las.c: clean up logic for RGB parsing, support + setting the format + +2009-03-12 19:40 hobu + + * trunk/apps/txt2las.c: support setting RGB colors in txt2las #103 + +2009-03-12 17:40 hobu + + * trunk/src/laspoint.cpp: fix #104, copy the LASColor in copy and + assignment constructors of LASPoint + +2009-03-12 02:34 hobu + + * trunk/configure.ac: attempt to fix #100 by pulling in libtiff's + header location + +2009-03-10 20:17 hobu + + * trunk/apps/lascommon.c, trunk/include/liblas/lassrs.hpp, + trunk/src/las_c_api.cpp, trunk/src/lassrs.cpp: there is no such thing + as a TIFF*, clean up cases for when we don't have libgeotiff + +2009-03-09 18:07 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/include/liblas/lassrs.hpp, + trunk/src/las_c_api.cpp, trunk/src/lassrs.cpp: fix #102, add + LASSRS::SetGTIFF + +2009-03-08 20:11 hobu + + * trunk/src/las_c_api.cpp: make sure to only free things that exist + +2009-03-08 20:10 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: fix + #101, LASString_Free + +2009-03-08 20:05 hobu + + * trunk/include/liblas/capi/liblas.h: oops, missing LASSRS_Destroy + +2009-03-08 14:37 hobu + + * trunk/apps/lascommon.c: silence const warning + +2009-03-08 13:34 hobu + + * trunk/apps/lascommon.c: const qualifier for GTIF* + +2009-03-07 19:24 hobu + + * trunk/src/lassrs.cpp, trunk/test/data/1.0_0.las, + trunk/test/data/1.0_1.las, trunk/test/data/1.1_0.las, + trunk/test/data/1.1_1.las, trunk/test/data/1.2_0.las, + trunk/test/data/1.2_1.las, trunk/test/data/1.2_2.las, + trunk/test/data/1.2_3.las: oops we were dumb with ASCII records + +2009-03-07 18:43 hobu + + * trunk/apps/lascommon.c: use GTIFPrint if we can to print geotiff + info + +2009-03-07 18:39 hobu + + * trunk/src/lassrs.cpp: return an empty string if we have nothing + +2009-03-04 19:36 hobu + + * trunk/test/data/make_data.py: add number_of_points parameter + +2009-02-26 02:13 hobu + + * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, + trunk/nmake.opt, trunk/python/setup.py: increment versions in + preparation for 1.2.0b1 + +2009-02-26 02:10 hobu + + * trunk/include/Makefile.am: add 1.2-related headers to dist target + +2009-02-26 00:53 mloskot + + * trunk/include/liblas/detail/reader12.hpp, + trunk/include/liblas/detail/writer12.hpp, + trunk/include/liblas/lascolor.hpp, trunk/src/detail/reader12.cpp, + trunk/src/detail/writer12.cpp: Little refactoring and cleanup, no + fixes applied. + +2009-02-26 00:36 mloskot + + * trunk/include/liblas/lascolor.hpp, trunk/src/lascolor.cpp: Fixed LAS + version and copyright notice and updated doxygen doc in + lascolor.{hpp|cpp} + +2009-02-26 00:24 mloskot + + * trunk/include/liblas/detail/reader12.hpp, + trunk/include/liblas/detail/writer12.hpp, + trunk/src/detail/reader12.cpp, trunk/src/detail/writer12.cpp: Fixed + LAS version and copyright notice in {reader12|writer12}.{hpp|cpp} + +2009-02-25 23:57 mloskot + + * trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp, + trunk/src/lassrs.cpp: Use Zero as nullptr value instead of + 'almost-deprecated' NULL macro. + +2009-02-25 23:51 mloskot + + * trunk/include/liblas/lassrs.hpp, trunk/src/lassrs.cpp: Little + refactoring of LASRSR class. + +2009-02-25 13:02 mloskot + + * trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, + trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp, + trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: * Updated project + files for Visual C++ 2008. + * Cleaned up some warnings. + +2009-02-25 05:41 hobu + + * trunk/src/lassrs.cpp: Fix #98, LASSRS not compiling without geotiff + or GDAL + +2009-02-25 05:34 hobu + + * trunk/nmake.opt: support building against a GDAL source tree + +2009-02-25 05:33 hobu + + * trunk/src/detail/writer.cpp, trunk/src/lassrs.cpp: clean up some + warnings, add a FIXME for projecting while writing PointRecord, + which needs to be descaled + +2009-02-24 04:33 hobu + + * trunk/makefile.vc, trunk/src/makefile.vc: w00t! windows building. + +2009-02-23 23:52 hobu + + * trunk/configure.ac: support building against a GDAL source tree + +2009-02-23 20:04 hobu + + * trunk/configure.ac: add configure logic to use gdal source tree -- + not quite done yet + +2009-02-21 03:11 hobu + + * trunk/include/liblas/lassrs.hpp, trunk/python/tests/Header.txt, + trunk/python/tests/SRS.txt, trunk/src/las_c_api.cpp, + trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: make ResetVLRs + private, clean up SetGeoreference + +2009-02-21 03:11 hobu + + * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, + trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, + trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, + trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, + trunk/test/data/make_data.py: latest version of test data with srs + and guids + +2009-02-21 03:06 hobu + + * trunk/test/data/make_data.py: use a srs object now that + header.proj4 is gone + +2009-02-21 02:52 hobu + + * trunk/python/liblas/header.py, trunk/python/tests/File.txt, + trunk/python/tests/Header.txt, trunk/python/tests/VLR.txt: fix up + tests + +2009-02-20 22:54 hobu + + * trunk/src/lassrs.cpp: oops, we're broken right now + +2009-02-20 22:44 hobu + + * trunk/apps/lascommon.c, trunk/include/liblas/capi/liblas.h, + trunk/include/liblas/lasheader.hpp, trunk/python/liblas/core.py, + trunk/python/liblas/header.py, trunk/python/tests/Header.txt, + trunk/src/detail/reader.cpp, trunk/src/las_c_api.cpp, + trunk/src/lasheader.cpp: remove LASHeader::[G|S]etProj4 #97 + +2009-02-20 22:36 hobu + + * trunk/python/tests/Header.txt, trunk/python/tests/VLR.txt: update + python tests to reflect current oprations + +2009-02-20 21:49 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/include/liblas/liblas.hpp, + trunk/python/liblas/__init__.py, trunk/python/liblas/core.py, + trunk/python/tests/VLR.txt, trunk/src/las_c_api.cpp: add the ability + to check for HAVE_GDAL and HAVE_LIBGEOTIFF at runtime + +2009-02-20 19:42 hobu + + * trunk/src/lassrs.cpp: we should fetch the m_gtiff on Set* methods + to create it + +2009-02-20 19:14 hobu + + * trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/detail/writer.hpp, + trunk/include/liblas/lasreader.hpp, + trunk/include/liblas/laswriter.hpp, trunk/src/detail/reader.cpp, + trunk/src/detail/writer.cpp, trunk/src/lasreader.cpp, + trunk/src/laswriter.cpp: add the ability to have Reader/Writer + project on the way out #93 + +2009-02-20 05:43 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/python/liblas/__init__.py, + trunk/python/liblas/core.py, trunk/python/liblas/header.py, + trunk/python/liblas/srs.py, trunk/python/tests/Header.txt, + trunk/python/tests/SRS.txt, trunk/src/las_c_api.cpp: start on Python + API for SRS + +2009-02-20 04:19 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/include/liblas/lassrs.hpp, + trunk/src/las_c_api.cpp, trunk/src/lassrs.cpp: C API for LASSRS + +2009-02-19 19:34 hobu + + * trunk/include/liblas/lassrs.hpp, trunk/src/Makefile.am, + trunk/src/gt_wkt_srs.cpp, trunk/src/lassrs.cpp: move the GDAL code + into its own file so it can easily be swapped in and out + +2009-02-19 19:20 hobu + + * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, + trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, + trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, + trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, + trunk/test/data/make_data.py: use correct SRS description and + points for the test data + +2009-02-19 19:08 hobu + + * trunk/apps/lascommon.c: don't leak a LASColorH + +2009-02-19 19:04 hobu + + * trunk/apps/lascommon.c: don't leak a LASColorH + +2009-02-19 19:02 hobu + + * trunk/src/lassrs.cpp: don't leak, better error checking + +2009-02-19 05:27 hobu + + * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, + trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, + trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, + trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, + trunk/test/data/make_data.py: make files more rigorous + +2009-02-19 04:17 hobu + + * trunk/src/lasheader.cpp, trunk/src/lassrs.cpp, + trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, + trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, + trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, + trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las: fix up SRS + handling of ASCII keys. libgeotiff's simple keys stuff was at + fault + +2009-02-18 15:29 hobu + + * trunk/src/detail/reader.cpp, trunk/src/lasheader.cpp, + trunk/src/lassrs.cpp, trunk/test/data/1.0_0.las, + trunk/test/data/1.0_1.las, trunk/test/data/1.1_0.las, + trunk/test/data/1.1_1.las, trunk/test/data/1.2_0.las, + trunk/test/data/1.2_1.las, trunk/test/data/1.2_2.las, + trunk/test/data/1.2_3.las, trunk/test/data/make_data.py: a bunch of + debugging lint to fix not supporting geotiff ASCII records + +2009-02-17 22:35 hobu + + * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, + trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, + trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, + trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, + trunk/test/data/make_data.py: add test data array + +2009-02-17 21:00 hobu + + * trunk/python/tests/Header.txt: update test for 1.2 being default + +2009-02-17 21:00 hobu + + * trunk/src/lassrs.cpp: support libgeotiff-only setting of proj4 + +2009-02-17 20:26 hobu + + * trunk/configure.ac: apply Doug's patch for #66 + +2009-02-17 19:19 hobu + + * trunk/include/liblas/lassrs.hpp, trunk/src/lassrs.cpp: allow building + without libgeotiff or GDAL + +2009-02-17 18:55 hobu + + * trunk/test/unit/common.cpp, trunk/test/unit/laswriter_test.cpp: + update tests to reflect that 1.2 is now the default version + +2009-02-17 18:48 hobu + + * trunk/test/data/make_data.py: add make_data script + +2009-02-17 17:57 hobu + + * trunk/include/liblas/lassrs.hpp: docs for LASSRS + +2009-02-17 17:56 hobu + + * trunk/src/lassrs.cpp: remember to clear the vlrs when doing a Reset + +2009-02-17 07:02 hobu + + * trunk/python/liblas/color.py, trunk/python/liblas/header.py, + trunk/src/lasheader.cpp: default to using 1.2 for LASHeader and fix + SetVersionMinor interaction with the data offset that likely + prevented us from ever correctly writing 1.0 data + +2009-02-17 05:21 hobu + + * trunk/include/liblas/lassrs.hpp: don't include private geotiff + stuff + +2009-02-17 04:49 hobu + + * trunk/CMakeLists.txt, trunk/src/CMakeLists.txt: update cmake a bit. + We need to be able to set GDAL though + +2009-02-17 04:13 hobu + + * trunk/python/tests/VLR.txt, trunk/src/detail/reader.cpp, + trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: fix up so tests can + pass + +2009-02-17 02:51 hobu + + * trunk/test/unit/Makefile.am: add geotiff and gdal info to test + automake stuff + +2009-02-17 02:40 hobu + + * trunk/configure.ac: fix #96, check for ST_Create in libgeotiff + instead of XTIFFClientOpen + +2009-02-17 02:33 hobu + + * trunk/include/Makefile.am: fix #95, nobase option for include files + +2009-02-17 02:32 hobu + + * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, + trunk/nmake.opt, trunk/python/setup.py: increment versions to 1.2 + which is where we will be at the next release + +2009-02-16 20:34 hobu + + * trunk/include/liblas/lassrs.hpp, trunk/src/lasheader.cpp, + trunk/src/lassrs.cpp: oh, it seems to work now :) + +2009-02-16 18:50 hobu + + * trunk/include/liblas/lasheader.hpp, trunk/include/liblas/lassrs.hpp, + trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: more updates to + LASSRS. Still broken, but improving :) + +2009-02-16 05:40 hobu + + * trunk/include/liblas/detail/utility.hpp, + trunk/include/liblas/lassrs.hpp, trunk/src/detail/reader.cpp, + trunk/src/lassrs.cpp: some improvement on srs stuff + +2009-02-16 04:19 hobu + + * trunk/include/liblas/detail/utility.hpp, + trunk/include/liblas/lasheader.hpp, trunk/include/liblas/lassrs.hpp, + trunk/src/detail/reader.cpp, trunk/src/lasheader.cpp, + trunk/src/lassrs.cpp: more SRS stuff, quite broken right now unless + you link GDAL in + +2009-02-14 03:07 hobu + + * trunk/Makefile.am, trunk/apps/Makefile.am, trunk/include/Makefile.am, + trunk/include/liblas/lassrs.hpp: more LASSRS stuff + +2009-02-14 02:47 hobu + + * trunk/src/lassrs.cpp: more LASSRS stuff, pull in GDAL's code + +2009-02-13 03:12 hobu + + * trunk/include/liblas/detail/fwd.hpp, + trunk/include/liblas/lasheader.hpp, trunk/include/liblas/lassrs.hpp, + trunk/src/Makefile.am, trunk/src/lassrs.cpp: LASSRS skeleton + +2009-02-12 04:23 hobu + + * trunk/src/Makefile.am: GDAL define support for src/ + +2009-02-11 19:31 hobu + + * trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/detail/reader10.hpp, + trunk/include/liblas/detail/reader11.hpp, + trunk/include/liblas/detail/reader12.hpp, + trunk/include/liblas/detail/writer.hpp, + trunk/include/liblas/detail/writer10.hpp, + trunk/include/liblas/detail/writer11.hpp, + trunk/include/liblas/detail/writer12.hpp, + trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp, + trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, + trunk/src/detail/writer.cpp, trunk/src/detail/writer10.cpp, + trunk/src/detail/writer11.cpp, trunk/src/detail/writer12.cpp: + reorganize reader and writer Impl to put redundant VLR-related + operations in the Reader:: and Writer:: abstract classes instead + of each Impl + +2009-02-11 19:18 hobu + + * trunk/apps/lascommon.c, trunk/include/liblas/capi/liblas.h: report + min/max colors as part of a summary + +2009-02-11 15:55 hobu + + * trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/detail/reader10.hpp, + trunk/include/liblas/detail/reader11.hpp, + trunk/include/liblas/detail/reader12.hpp, + trunk/include/liblas/detail/writer.hpp, trunk/src/detail/reader.cpp, + trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp, + trunk/src/detail/reader12.cpp: remove redundant GetStream and move + istream into abstract Reader:: class + +2009-02-11 15:49 hobu + + * trunk/include/liblas/detail/writer.hpp, + trunk/include/liblas/detail/writer10.hpp, + trunk/include/liblas/detail/writer11.hpp, + trunk/include/liblas/detail/writer12.hpp, + trunk/src/detail/writer.cpp, trunk/src/detail/writer10.cpp, + trunk/src/detail/writer11.cpp, trunk/src/detail/writer12.cpp: remove + redundant GetStream and move ostream into abstract Writer:: class + +2009-02-11 04:34 hobu + + * trunk/apps/las2las.c: allow las2las to write 1.2 format + +2009-02-11 04:33 hobu + + * trunk/src/detail/writer.cpp, trunk/src/detail/writer12.cpp, + trunk/src/laswriter.cpp: actually support writing 1.2 now that + coding is done + +2009-02-11 04:24 hobu + + * trunk/include/liblas/detail/writer.hpp, trunk/src/detail/writer.cpp, + trunk/src/detail/writer10.cpp, trunk/src/detail/writer11.cpp, + trunk/src/detail/writer12.cpp: we have to descale the points as we + write them + +2009-02-11 03:56 hobu + + * trunk/include/liblas/detail/writer.hpp, + trunk/include/liblas/detail/writer10.hpp, + trunk/include/liblas/detail/writer11.hpp, + trunk/include/liblas/detail/writer12.hpp, + trunk/src/detail/reader12.cpp, trunk/src/detail/writer.cpp, + trunk/src/detail/writer10.cpp, trunk/src/detail/writer11.cpp, + trunk/src/detail/writer12.cpp, trunk/src/laswriter.cpp: 1.2 LASWriter + support + +2009-02-10 20:46 hobu + + * trunk/include/liblas/capi/liblas.h, trunk/python/liblas/color.py, + trunk/python/liblas/core.py, trunk/python/liblas/point.py, + trunk/python/tests/Point.txt, trunk/src/las_c_api.cpp: color + implementation for C API and Python API + +2009-02-10 20:15 hobu + + * trunk/include/liblas/detail/fwd.hpp, + trunk/include/liblas/detail/utility.hpp, + trunk/include/liblas/lascolor.hpp, trunk/include/liblas/laspoint.hpp, + trunk/include/liblas/lasreader.hpp, trunk/src/Makefile.am, + trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp, + trunk/src/detail/reader12.cpp, trunk/src/lascolor.cpp, + trunk/src/laspoint.cpp: rework to use public LASColor class, 1.2 + reading now works + +2009-02-10 16:26 hobu + + * trunk/src/detail/reader10.cpp, trunk/src/detail/reader12.cpp, + trunk/src/lasreader.cpp: clean up commented out code + +2009-02-10 15:54 hobu + + * trunk/include/liblas/detail/reader.hpp: make FillPoint protected + instead of public + +2009-02-10 03:34 hobu + + * trunk/include/liblas/detail/fwd.hpp, + trunk/include/liblas/detail/reader.hpp, + trunk/include/liblas/detail/reader10.hpp, + trunk/include/liblas/detail/reader11.hpp, + trunk/include/liblas/detail/reader12.hpp, + trunk/include/liblas/detail/utility.hpp, + trunk/include/liblas/laspoint.hpp, + trunk/include/liblas/lasreader.hpp, trunk/python/tests/File.txt, + trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp, + trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, + trunk/src/laspoint.cpp, trunk/src/lasreader.cpp: reorganize + LASReader. Tests (cppUnit and Python) all still pass + +2009-02-09 01:47 hobu + + * trunk/include/liblas/detail/reader12.hpp, + trunk/include/liblas/detail/writer12.hpp, + trunk/include/liblas/lasheader.hpp, trunk/include/liblas/liblas.hpp, + trunk/src/Makefile.am, trunk/src/detail/reader.cpp, + trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, + trunk/src/detail/writer12.cpp, trunk/src/lasheader.cpp, + trunk/src/laspoint.cpp, trunk/src/lasreader.cpp: start in on 1.2 read + support. Tests pass, but 1.2 reading is not working yet + +2009-02-06 03:01 hobu + + * trunk/python/liblas/__init__.py, trunk/python/liblas/core.py: re-fix + #89 liblas.version + +2009-02-05 02:59 hobu + + * trunk/include/liblas/laspoint.hpp: add Red, Green, and Blue to + LASPoint for 1.2 support #91 + +2009-02-05 02:48 hobu + + * trunk/include/liblas/lasheader.hpp, + trunk/test/unit/lasheader_test.cpp: increment max VersionMinor to 2 + for 1.2 support #91 + +2009-02-05 02:43 hobu + + * trunk/include/liblas/lasheader.hpp: increment the point formats and + point sizes for LAS 1.2 #91 + +2009-02-04 03:31 hobu + + * trunk/README: add a link to the 1.2 specification + +2009-02-04 03:26 hobu + + * trunk/build/xcode, trunk/build/xcode/xcode.xcodeproj/hobu.mode1v3, + trunk/build/xcode/xcode.xcodeproj/hobu.pbxuser, + trunk/build/xcode/xcode.xcodeproj/project.pbxproj: xcode projects + +2009-02-03 16:08 mloskot + + * trunk/include/liblas/laspoint.hpp, + trunk/include/liblas/lasreader.hpp: * Documented libLAS-specific + elements of LASPoint class (no need to repeat LAS specification). + +2009-02-03 15:40 mloskot + + * trunk/build/msvc90/liblas.sln, trunk/include/liblas/laspoint.hpp, + trunk/src/detail/reader11.cpp, trunk/test/unit/laswriter_test.cpp: * + Updated LASWriter test with checks of get/set methods for Point + Source ID attribute. + * Removed unused from laspoint.hpp. + * Include missing in reader11.cpp, std::cerr object is + used. + * build/msvc90 project updated. + +2009-02-03 15:21 hobu + + * trunk/include/liblas/lasreader.hpp, trunk/src/lasreader.cpp: fix up + creation of a local m_pimpl that was masking the LASReader's + +2009-02-03 14:59 mloskot + + * trunk/include/liblas/detail/utility.hpp, + trunk/include/liblas/laspoint.hpp, trunk/src/laspoint.cpp, + trunk/src/lasreader.cpp, trunk/src/laswriter.cpp, + trunk/test/unit/common.cpp: Fixed #87 - implemented support for + reading/writing "Point Source ID" - attribute of point record + defined in LAS 1.0. + The new LASPoint accessors operating on Point Source ID play dual + role, for LAS 1.0 they get/set User Bit Field but for LAS 1.1 - + Point Source ID. + +2009-02-03 14:50 mloskot + + * trunk/test/sample/utility.hpp: Added print_point() function to + sample/utility.hpp header. + +2009-02-03 14:48 mloskot + + * trunk/build/msvc90: Updated svn:ignore property for build/msvc90. + +2009-02-03 05:32 hobu + + * trunk/include/liblas/lasreader.hpp, trunk/src/lasreader.cpp: an + attempt at a Reset() and IsEOF() functions #85 + +2009-01-01 02:56 hobu + + * trunk/build/xcode, trunk/build/xcode/xcode.xcodeproj, + trunk/build/xcode/xcode.xcodeproj/hobu.mode1v3, + trunk/build/xcode/xcode.xcodeproj/hobu.pbxuser, + trunk/build/xcode/xcode.xcodeproj/project.pbxproj: add xcode + project + +2008-12-31 04:50 hobu + + * trunk/apps: ignore liblas-config + +2008-12-26 05:39 hobu + + * trunk/apps/las2txt.c: add index parse option to las2txt #86 + +2008-12-26 05:31 hobu + + * trunk/test/unit/lasreader_iterator_test.cpp: fix test to use + qualified type names + +2008-12-26 05:21 hobu + + * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, + trunk/python/setup.py: bump minor version so we're now 1.1 in trtrunk + +2008-12-26 05:21 hobu + + * trunk/nmake.opt: change to *nix line ending mode + +2008-12-26 05:16 hobu + + * trunk/apps/Makefile.am, trunk/apps/liblas-config.in, + trunk/configure.ac: add a liblas-config script #88 + +2008-12-26 04:00 hobu + + * trunk/python/liblas/core.py: no lint + +2008-12-26 03:59 hobu + + * trunk/python/liblas/core.py: make sure to free heap allocated + strings that were given to us by the C API + +2008-12-25 05:38 hobu + + * trunk/python/liblas/core.py: fix #89, broken liblas.version + +2008-12-15 15:12 mloskot + + * trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp: Unified + type of count value passed to ST_SetKey/ST_GetKey of libgeotiff + API + +2008-12-10 16:05 mloskot + + * trunk/build/msvc90, trunk/build/msvc90/clean.bat, + trunk/build/msvc90/las2las, + trunk/build/msvc90/las2las/las2las.vcproj, + trunk/build/msvc90/las2ogr, + trunk/build/msvc90/las2ogr/las2ogr.vcproj, + trunk/build/msvc90/las2ogr/las2ogr.vsprops, + trunk/build/msvc90/las2txt, + trunk/build/msvc90/las2txt/las2txt.vcproj, + trunk/build/msvc90/lasdiff, + trunk/build/msvc90/lasdiff/lasdiff.vcproj, + trunk/build/msvc90/lasinfo, + trunk/build/msvc90/lasinfo/lasinfo.vcproj, + trunk/build/msvc90/lasmerge, + trunk/build/msvc90/lasmerge/lasmerge.vcproj, + trunk/build/msvc90/liblas.sln, trunk/build/msvc90/liblas.vsprops, + trunk/build/msvc90/liblas_c_dll, + trunk/build/msvc90/liblas_c_dll/liblas_c_dll.vcproj, + trunk/build/msvc90/liblas_dll, + trunk/build/msvc90/liblas_dll/liblas_dll.vcproj, + trunk/build/msvc90/liblas_lib, + trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, + trunk/build/msvc90/liblas_test, + trunk/build/msvc90/liblas_test/liblas_test.vcproj, + trunk/build/msvc90/txt2las, + trunk/build/msvc90/txt2las/txt2las.vcproj: Added solution & + projects for Visual Studio 9.0 + +2008-11-13 22:02 hobu + + * trunk/README: dummy + +2008-11-13 21:59 hobu + + * trunk/README: dummy + +2008-11-13 21:58 hobu + + * trunk/README: dummy + +2008-11-13 21:50 hobu + + * trunk/README: point to new maillist + +2008-11-09 12:41 mloskot + + * trunk/test/unit/lasreader_iterator_test.cpp: + lasreader_iterator_test.cpp: refactored to remove redundant code + and reuse common test group data. + +2008-11-06 16:18 mloskot + + * trunk/test/unit/common.hpp, + trunk/test/unit/lasreader_iterator_test.cpp: + lasreader_iterator_test.cpp: added test cases for number of + standard algorithms: copy, count, equal, find, find_if, for_each. + +2008-11-06 15:51 mloskot + + * trunk/test/unit/common.hpp: test/unit/common.hpp: Added is_xy + predicated and bbox_calculator functor, both used in unit tests. + +2008-11-06 15:48 mloskot + + * trunk/src/laspoint.cpp: liblas::LASPoint: fixed incorrect + logical-or where logical-and is expected (Ticket #84). + +2008-11-06 15:42 mloskot + + * trunk/include/liblas/detail/utility.hpp: liblas::detail::Point: + improved equal-to operation for Point class. + +2008-11-05 20:41 mloskot + + * trunk/build/msvc80/liblas_test/liblas_test.vcproj: Updated Visual + C++ project file liblas_test.vcproj. + +2008-11-05 20:38 mloskot + + * trunk/test/unit/CMakeLists.txt, trunk/test/unit/Makefile.am, + trunk/test/unit/lasreader_iterator_test.cpp: Added unit test of + liblas::lasreader_iterator class. + +2008-11-05 20:33 mloskot + + * trunk/test/unit/common.cpp, trunk/test/unit/common.hpp, + trunk/test/unit/lasreader_test.cpp: Move common test routines from + lasreader_test.cpp to common.hpp|.cpp + +2008-11-05 19:17 mloskot + + * trunk/README: REAME: reordered utilities + +2008-10-30 08:35 mloskot + + * trunk/include/liblas/capi/liblas.h, + trunk/include/liblas/lasheader.hpp, + trunk/include/liblas/laspoint.hpp, + trunk/include/liblas/lasreader.hpp, + trunk/include/liblas/laswriter.hpp, trunk/src/lasreader.cpp, + trunk/src/laswriter.cpp: Expose TODO entries in .c and .cpp files + from doxygen comments in headers, to not to forget about them. + +2008-10-29 11:15 mloskot + + * trunk/doc/las2ogr.txt: doc/las2ogr.txt: Updated svn:mine-type, + svn:eol-style and svn:keywords. + +2008-10-29 11:12 mloskot + + * trunk/doc/las2ogr.txt: Set svn:keywords on las2ogr.txt + +2008-10-29 11:09 mloskot + + * trunk/README, trunk/doc/las2ogr.txt: Added doc/las2ogr.txt file. + Linked las2ogr.txt from main README. + +2008-10-29 10:54 mloskot + + * trunk/apps/makefile.vc: apps/makefile.vc: remove .ilk and .pdb + files from clean target. + +2008-10-14 02:18 hobu + + * trunk/python/liblas/point.py, trunk/python/tests/File.txt, + trunk/python/tests/Header.txt, trunk/python/tests/Point.txt: more + fixups related to #83.. ensure we use GMT and fix microseconds + overflow + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/CMakeLists.txt work/libLAS-1.2.1/CMakeLists.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/CMakeLists.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,249 @@ +# $Id$ +# +# Top-level CMakeList.txt for libLAS +# +# ************************************************************************ +# WARNING (mloskot): A PROTOTYPE - WORK IN PROGRESS - FEEL FREE TO IMPROVE +# ************************************************************************ +# +PROJECT( libLAS ) + +SET( LIBLAS_LIB_NAME liblas ) +SET( LIBLAS_C_LIB_NAME liblas_c ) + +############################################################# +# CMake settings + +CMAKE_MINIMUM_REQUIRED( VERSION 2.4.0 ) + +SET( CMAKE_COLOR_MAKEFILE ON ) + +# set path to additional CMake modules +SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/build/cmake ${CMAKE_MODULE_PATH}) + + +############################################################# +# Building general settings + +IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE Debug CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) +ENDIF(NOT CMAKE_BUILD_TYPE) + +# Enable CTest to run libLas Unit Test Suite +#ENABLE_TESTING() + +############################################################# +# Platform and compiler specific settings + +IF (WIN32) + + ADD_DEFINITIONS( /W4 ) + + IF (MSVC) + IF (MSVC80) + ADD_DEFINITIONS( /D_CRT_SECURE_NO_WARNINGS ) + ADD_DEFINITIONS( /D_CRT_NONSTDC_NO_WARNING ) + ENDIF (MSVC80) + ENDIF (MSVC) +ELSE (WIN32) + + IF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + + ADD_DEFINITIONS( -Wall -Wno-long-long -pedantic -ansi ) + + IF (CMAKE_COMPILER_IS_GNUCXX) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" ) + ENDIF (CMAKE_COMPILER_IS_GNUCXX) + + ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +ENDIF (WIN32) + +############################################################# +# Search for dependencies + +# optinal GeoTIFF support +FIND_PACKAGE(GeoTIFF) + +IF (GEOTIFF_FOUND) + #TODO: Use to generate config.h + #SET (HAVE_LIBGEOTIFF TRUE) + ADD_DEFINITIONS( -D HAVE_LIBGEOTIFF ) +ENDIF (GEOTIFF_FOUND) + +# optinal GeoTIFF support +FIND_PACKAGE(GDAL) + +IF (GDAL_FOUND) + #TODO: Use to generate config.h + #SET (HAVE_GDAL TRUE) + ADD_DEFINITIONS( -D HAVE_GDAL ) +ENDIF (GDAL_FOUND) + +############################################################# +# List of directories to process + +SUBDIRS( + include + src + apps + test +) + + + + + + + +########## THE HUGE BLOCK BELOW IS TO LEARN CMAKE AND WILL BE REMOVED ############### +# ------------------------- Begin Generic CMake Variable Logging ------------------ +MESSAGE( STATUS "=============== BEGIN TEST VARIABLES LOGGING OUTPUT =============" ) + +# if you are building in-source, this is the same as CMAKE_SOURCE_DIR, otherwise +# this is the top level directory of your build tree +MESSAGE( STATUS "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR} ) + +# if you are building in-source, this is the same as CMAKE_CURRENT_SOURCE_DIR, otherwise this +# is the directory where the compiled or generated files from the current CMakeLists.txt will go to +MESSAGE( STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR} ) + +# this is the directory, from which cmake was started, i.e. the top level source directory +MESSAGE( STATUS "CMAKE_SOURCE_DIR: " ${CMAKE_SOURCE_DIR} ) + +# this is the directory where the currently processed CMakeLists.txt is located in +MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} ) + +# contains the full path to the top level directory of your build tree +MESSAGE( STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR} ) + +# contains the full path to the root of your project source directory, +# i.e. to the nearest directory where CMakeLists.txt contains the PROJECT() command +MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) + +# set this variable to specify a common place where CMake should put all executable files +# (instead of CMAKE_CURRENT_BINARY_DIR) +MESSAGE( STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH} ) + +# set this variable to specify a common place where CMake should put all libraries +# (instead of CMAKE_CURRENT_BINARY_DIR) +MESSAGE( STATUS "LIBRARY_OUTPUT_PATH: " ${LIBRARY_OUTPUT_PATH} ) + +# tell CMake to search first in directories listed in CMAKE_MODULE_PATH +# when you use FIND_PACKAGE() or INCLUDE() +MESSAGE( STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH} ) + +# this is the complete path of the cmake which runs currently (e.g. /usr/local/bin/cmake) +MESSAGE( STATUS "CMAKE_COMMAND: " ${CMAKE_COMMAND} ) + +# this is the CMake installation directory +MESSAGE( STATUS "CMAKE_ROOT: " ${CMAKE_ROOT} ) + +# this is the filename including the complete path of the file where this variable is used. +MESSAGE( STATUS "CMAKE_CURRENT_LIST_FILE: " ${CMAKE_CURRENT_LIST_FILE} ) + +# this is linenumber where the variable is used +MESSAGE( STATUS "CMAKE_CURRENT_LIST_LINE: " ${CMAKE_CURRENT_LIST_LINE} ) + +# this is used when searching for include files e.g. using the FIND_PATH() command. +MESSAGE( STATUS "CMAKE_INCLUDE_PATH: " ${CMAKE_INCLUDE_PATH} ) + +# this is used when searching for libraries e.g. using the FIND_LIBRARY() command. +MESSAGE( STATUS "CMAKE_LIBRARY_PATH: " ${CMAKE_LIBRARY_PATH} ) + +# the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or "Windows 5.1" +MESSAGE( STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM} ) + +# the short system name, e.g. "Linux", "FreeBSD" or "Windows" +MESSAGE( STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME} ) + +# only the version part of CMAKE_SYSTEM +MESSAGE( STATUS "CMAKE_SYSTEM_VERSION: " ${CMAKE_SYSTEM_VERSION} ) + +# the processor name (e.g. "Intel(R) Pentium(R) M processor 2.00GHz") +MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR} ) + +# is TRUE on all UNIX-like OS's, including Apple OS X and CygWin +MESSAGE( STATUS "UNIX: " ${UNIX} ) + +# is TRUE on Windows, including CygWin +MESSAGE( STATUS "WIN32: " ${WIN32} ) + +# is TRUE on Apple OS X +MESSAGE( STATUS "APPLE: " ${APPLE} ) + +# is TRUE when using the MinGW compiler in Windows +MESSAGE( STATUS "MINGW: " ${MINGW} ) + +# is TRUE on Windows when using the CygWin version of cmake +MESSAGE( STATUS "CYGWIN: " ${CYGWIN} ) + +# is TRUE on Windows when using a Borland compiler +MESSAGE( STATUS "BORLAND: " ${BORLAND} ) + +# Microsoft compiler +MESSAGE( STATUS "MSVC: " ${MSVC} ) +MESSAGE( STATUS "MSVC_IDE: " ${MSVC_IDE} ) +MESSAGE( STATUS "MSVC60: " ${MSVC60} ) +MESSAGE( STATUS "MSVC70: " ${MSVC70} ) +MESSAGE( STATUS "MSVC71: " ${MSVC71} ) +MESSAGE( STATUS "MSVC80: " ${MSVC80} ) +MESSAGE( STATUS "CMAKE_COMPILER_2005: " ${CMAKE_COMPILER_2005} ) + +# set this to true if you don't want to rebuild the object files if the rules have changed, +# but not the actual source files or headers (e.g. if you changed the some compiler switches) +MESSAGE( STATUS "CMAKE_SKIP_RULE_DEPENDENCY: " ${CMAKE_SKIP_RULE_DEPENDENCY} ) + +# since CMake 2.1 the install rule depends on all, i.e. everything will be built before installing. +# If you don't like this, set this one to true. +MESSAGE( STATUS "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY: " ${CMAKE_SKIP_INSTALL_ALL_DEPENDENCY} ) + +# If set, runtime paths are not added when using shared libraries. Default it is set to OFF +MESSAGE( STATUS "CMAKE_SKIP_RPATH: " ${CMAKE_SKIP_RPATH} ) + +# set this to true if you are using makefiles and want to see the full compile and link +# commands instead of only the shortened ones +MESSAGE( STATUS "CMAKE_VERBOSE_MAKEFILE: " ${CMAKE_VERBOSE_MAKEFILE} ) + +# this will cause CMake to not put in the rules that re-run CMake. This might be useful if +# you want to use the generated build files on another machine. +MESSAGE( STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION} ) + +# Choose the type of build. Example: SET(CMAKE_BUILD_TYPE Debug) +MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} ) + +# A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). +# But there are also two variables exactly for this purpose: + +# the compiler flags for compiling C sources +MESSAGE( STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS} ) +MESSAGE( STATUS "CMAKE_C_FLAGS_RELEASE: " ${CMAKE_C_FLAGS_RELEASE} ) +MESSAGE( STATUS "CMAKE_C_FLAGS_DEBUG: " ${CMAKE_C_FLAGS_DEBUG} ) + +# the compiler flags for compiling C++ sources +MESSAGE( STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS} ) +MESSAGE( STATUS "CMAKE_CXX_FLAGS_RELEASE: " ${CMAKE_CXX_FLAGS_RELEASE} ) +MESSAGE( STATUS "CMAKE_CXX_FLAGS_DEBUG: " ${CMAKE_CXX_FLAGS_DEBUG} ) + +# if this is set to ON, then all libraries are built as shared libraries by default. +MESSAGE( STATUS "BUILD_SHARED_LIBS: " ${BUILD_SHARED_LIBS} ) + +# the compiler used for C files +MESSAGE( STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} ) + +# the compiler used for C++ files +MESSAGE( STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER} ) + +# if the compiler is a variant of gcc, this should be set to 1 +MESSAGE( STATUS "CMAKE_COMPILER_IS_GNUCC: " ${CMAKE_COMPILER_IS_GNUCC} ) + +# if the compiler is a variant of g++, this should be set to 1 +MESSAGE( STATUS "CMAKE_COMPILER_IS_GNUCXX : " ${CMAKE_COMPILER_IS_GNUCXX} ) + +# the tools for creating libraries +MESSAGE( STATUS "CMAKE_AR: " ${CMAKE_AR} ) +MESSAGE( STATUS "CMAKE_RANLIB: " ${CMAKE_RANLIB} ) + +MESSAGE( STATUS "=============== END TEST VARIABLES LOGGING OUTPUT ===============" ) +# ------------------------- End of Generic CMake Variable Logging ------------------ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/configure.ac work/libLAS-1.2.1/configure.ac --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/configure.ac 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/configure.ac 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,288 @@ +dnl $Id$ +dnl +dnl This is main autoconf bootstrap script of libLAS project. +dnl +m4_define([liblas_version_major], [1]) +m4_define([liblas_version_minor], [2]) +m4_define([liblas_version_micro], [1]) +m4_define([liblas_version], + [liblas_version_major.liblas_version_minor.liblas_version_micro]) + +AC_PREREQ([2.59]) +AC_INIT([las], [liblas_version], [hobu.inc@gmail.com],[liblas-src]) +AC_CANONICAL_BUILD + +RELEASE_VERSION=liblas_version +AC_SUBST([RELEASE_VERSION]) + +dnl ######################################################################### +dnl Default compilation flags +dnl ######################################################################### + +m4_define([debug_default],[no]) + +CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS" +CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS" + +dnl ######################################################################### +dnl Checks for programs. +dnl ######################################################################### + +AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PROG_CXX +AC_PROG_CXXCPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AC_PROG_LIBTOOL + +dnl ######################################################################### +dnl Check platform endianness +dnl ######################################################################### + +AC_C_BIGENDIAN + +dnl ######################################################################### +dnl Checks for header files. +dnl ######################################################################### + +AC_CHECK_HEADERS([string.h],, [AC_MSG_ERROR([cannot find string.h, bailing out])]) +AC_CHECK_HEADERS([stdio.h],, [AC_MSG_ERROR([cannot find stdio.h, bailing out])]) +AC_CHECK_HEADERS([stdlib.h],, [AC_MSG_ERROR([cannot find stdlib.h, bailing out])]) + + +LIBS="${LIBS}" + + +dnl ######################################################################### +dnl Build mode configuration (debug/optimized) +dnl ######################################################################### + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug=ARG], [Enable debug compilation mode @<:@yes|no@:>@, default=debug_default]),,) + +AC_MSG_CHECKING([for debug enabled]) + +if test "x$enable_debug" = "xyes"; then + CFLAGS="$CFLAGS -g -DDEBUG" + CXXFLAGS="$CXXFLAGS -g -DDEBUG" + AC_MSG_RESULT(yes) +else + CFLAGS="$CFLAGS -O3 -DNDEBUG" + CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" + AC_MSG_RESULT(no) +fi + +dnl ######################################################################### +dnl Definition of custom Autoconf macros +dnl ######################################################################### + +AC_DEFUN([LOC_MSG],[ +echo "$1" +]) + +AC_DEFUN([AC_HAVE_LONG_LONG], +[ + AC_MSG_CHECKING([for 64bit integer type]) + + echo 'int main() { long long off=0; }' >> conftest.c + if test -z "`${CC} -o conftest conftest.c 2>&1`" ; then + AC_DEFINE(HAVE_LONG_LONG, 1, [Define to 1, if your compiler supports long long data type]) + AC_MSG_RESULT([long long]) + else + AC_MSG_RESULT([no]) + fi + rm -f conftest* +]) + + + +HAVE_GDAL="no" +GDAL_CONFIG="no" +HAVE_GEOTIFF="no" +GEOTIFF_CONFIG="no" + +USE_GDAL_SOURCE_TREE="no" + +dnl ######################################################################### +dnl Determine GDAL Support +dnl ######################################################################### + +AC_ARG_WITH([gdal], + AC_HELP_STRING([--with-gdal=ARG], [Path to gdal-config]),,) +AC_MSG_CHECKING([for GDAL]) + +if test "$with_gdal" = "no" -o "$with_gdal" = "" ; then + AC_MSG_RESULT([no]) +else + + dnl Check if full path to gdal-config provided + if test "`basename xx/$with_gdal`" = "gdal-config" ; then + AC_MSG_RESULT([GDAL enabled with provided gdal-config]) + GDAL_CONFIG="$with_gdal" + elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geotiff.h; then + GDAL_INC="-I$with_gdal/port -I$with_gdal/ogr -I$with_gdal/alg -I$with_gdal/frmts" + GDAL_PREFIX="$with_gdal" + HAVE_GDAL="yes" + HAVE_GEOTIFF="yes" + GEOTIFF_CONFIG="yes" + GDAL_CONFIG="yes" + USE_GDAL_SOURCE_TREE="yes" + LIBS="-L${with_gdal}/.libs -lgdal -L${with_gdal}/ -lgdal $LIBS" + AC_MSG_RESULT([GDAL and GeoTIFF enabled with provided GDAL source tree]) + else + dnl --with-gdal=yes given, so try to find gdal-config in PATH + GDAL_CONFIG_TMP=`which gdal-config` + if test "`basename xx/${GDAL_CONFIG_TMP}`" = "gdal-config" ; then + AC_MSG_RESULT([GDAL enabled with gdal-config found in PATH]) + GDAL_CONFIG=${GDAL_CONFIG_TMP} + else + AC_MSG_ERROR([--with-gdal should be yes, a path to gdal-config, or a path to GDAL's source tree]) + fi + fi +fi + +if test "$GDAL_CONFIG" != "no" ; then + +dnl if we are already yes, we don't need to run gdal-config + if test "$GDAL_CONFIG" != "yes" ; then + + GDAL_VERSION=`$GDAL_CONFIG --version` + AC_MSG_RESULT([$GDAL_CONFIG reports version $GDAL_VERSION]) + LIBS="`$GDAL_CONFIG --libs` $LIBS" + GDAL_INC=`$GDAL_CONFIG --cflags` + GDAL_PREFIX=`$GDAL_CONFIG --prefix` + OGR=`$GDAL_CONFIG --ogr-enabled` + if test "$OGR" != "yes" ; then + AC_MSG_ERROR([$GDAL_CONFIG says OGR is not enabled]) + fi + HAVE_GDAL="yes" + fi +fi + +AC_SUBST([GDAL_INC]) +AC_SUBST([GDAL_PREFIX]) +AM_CONDITIONAL([GDAL_IS_CONFIG], [test ! x$GDAL_CONFIG = xno]) + +dnl ######################################################################### +dnl Determine GeoTIFF Support +dnl ######################################################################### + +AC_ARG_WITH([geotiff], + AC_HELP_STRING([--with-geotiff=ARG], [libgeotiff library to use (no or path)]),,) + +if test "$with_geotiff" != "no" -a "$with_geotiff" != "" -a "${GEOTIFF_CONFIG}" != "yes" ; then + dnl We now require libgeotiff 1.2.5 (for ST_Create the simpletags stuff). + dnl first check if $with_geotiff/lib has the library: + AC_CHECK_LIB([geotiff], [ST_Create], + [GEOTIFF_CONFIG=external], [GEOTIFF_CONFIG=no], + [-L$with_geotiff/lib]) +fi + +if test "${GEOTIFF_CONFIG}" != "no" ; then + dnl libgeotiff 1.2.5, is first version with geo_simpletags.h + AC_MSG_CHECKING([for geo_simpletags.h of libgeotiff >= 1.2.5]) + if test -f ${with_geotiff}/include/geo_simpletags.h ; then + GEOTIFF_INC="-I$with_geotiff/include" + AC_MSG_RESULT([yes]) + elif test -f ${with_geotiff}/include/geotiff/geo_simpletags.h ; then + GEOTIFF_INC="-I$with_geotiff/include/geotiff" + AC_MSG_RESULT([yes]) + elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geo_simpletags.h ; then + GEOTIFF_INC="-I$with_gdal/frmts/gtiff/libgeotiff/ -I$with_gdal/frmts/gtiff/libtiff" + AC_MSG_RESULT([yes, from GDAL]) + else + GEOTIFF_CONFIG="no" + AC_MSG_RESULT([no]) + fi +fi + +AC_MSG_CHECKING([for libgeotiff]) +if test "${GEOTIFF_CONFIG}" = "no" ; then + HAVE_GEOTIFF="no" + AC_MSG_RESULT([no]) +else + if test "${USE_GDAL_SOURCE_TREE}" != "yes" ; then + LIBS="-L$with_geotiff/lib -lgeotiff $LIBS" + HAVE_GEOTIFF="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([use GDAL source]) + fi +fi + +AC_SUBST([GEOTIFF_INC]) +AC_SUBST([GEOTIFF_PREFIX]) +AM_CONDITIONAL([GEOTIFF_IS_CONFIG], [test ! x$GEOTIFF_CONFIG = xno]) + +dnl ######################################################################### +dnl If GDAL was requested, but geotiff is not configured, complain +dnl ######################################################################### + +if test "${HAVE_GDAL}" != "no" ; then + if test "${GEOTIFF_CONFIG}" = "no" -a "${USE_GDAL_SOURCE_TREE}" != "yes"; then + AC_MSG_ERROR([You must configure a libgeotiff if you are using GDAL binaries. You can configure using a GDAL source tree without libgeotiff, but not from binaries.]) + fi +fi + +dnl ######################################################################### +dnl Determine other features of compiler +dnl ######################################################################### + +AC_HAVE_LONG_LONG + +dnl ######################################################################### +dnl Checks for library functions. +dnl ######################################################################### + +AC_CHECK_FUNCS([gettimeofday bzero memset memcpy bcopy]) + +dnl ######################################################################### +dnl Generate makefiles +dnl ######################################################################### + +AC_CONFIG_FILES([ + Makefile + include/Makefile + src/Makefile + apps/Makefile + apps/liblas-config + test/Makefile + test/unit/Makefile +]) + +AC_OUTPUT + +dnl ######################################################################### +dnl Print configuration summary +dnl ######################################################################### + +LOC_MSG() +LOC_MSG([libLAS configuration summary:]) +LOC_MSG() +LOC_MSG([ Version..................: ${RELEASE_VERSION}]) +LOC_MSG([ Installation directory...: ${prefix}]) +LOC_MSG([ C compiler...............: ${CC} ${CFLAGS}]) +LOC_MSG([ C++ compiler.............: ${CXX} ${CXXFLAGS}]) +LOC_MSG([ Debugging support........: ${enable_debug}]) +LOC_MSG([ GDAL support.............: ${HAVE_GDAL}]) +if test "${HAVE_GDAL}" != "no" ; then + LOC_MSG([ - gdal-config...........: ${GDAL_CONFIG}]) + if test -n "${GDAL_INC}" ; then + LOC_MSG([ - INCLUDE directories...: ${GDAL_INC}]) + fi +fi +LOC_MSG([ GeoTIFF SRS support......: ${HAVE_GEOTIFF}]) +if test "${HAVE_GEOTIFF}" != "no" ; then + LOC_MSG([ - libgeotiff............: ${GEOTIFF_CONFIG}]) + if test -n "${GEOTIFF_INC}" ; then + LOC_MSG([ - INCLUDE directories...: ${GEOTIFF_INC}]) + fi +fi +LOC_MSG() +LOC_MSG([ LIBS.....................: ${LIBS}]) +LOC_MSG() +LOC_MSG([ libLAS - http://liblas.org]) +LOC_MSG() + +dnl EOF diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/AssemblyInfo.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/AssemblyInfo.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/AssemblyInfo.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/AssemblyInfo.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("dotnetLibLAS")] +[assembly: AssemblyDescription("Library to read and write the lidar las format")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Martin Vales")] +[assembly: AssemblyProduct("dotnetLibLAS")] +[assembly: AssemblyCopyright("Copyright © 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("74fc1345-228e-4afe-8c3c-00727ed007d0")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("0.3.0.0")] +[assembly: AssemblyFileVersion("0.3.0.0")] diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS_Express.csproj work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS_Express.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS_Express.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS_Express.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,69 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {5652982E-9576-47F1-896A-1B700E6648FA} + Library + Properties + dotnetLibLAS + dotnetLibLAS + true + liblas.snk + + + + + 2.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + dotnetLibLas.xml + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + dotnetLibLas.xml + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.csproj work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,64 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {5652982E-9576-47F1-896A-1B700E6648FA} + Library + Properties + dotnetLibLAS + dotnetLibLAS + true + liblas.snk + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + dotnetLibLas.xml + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + dotnetLibLas.xml + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.dll.config work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.dll.config --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.dll.config 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLAS.dll.config 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,3 @@ + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLas.xml work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLas.xml --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLas.xml 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/dotnetLibLas.xml 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1449 @@ + + + + dotnetLibLAS + + + + + LASException class + + + + + Default constructor + + string to show + + + + TODO + + TODO + the string + + + + LASVariableLengthRecord class + + + + + The object user should call this method when they finished with the object. + + + + + Default constructor. + + + + + Creates a new variable length record uing the LASVLRH opaque pointer + + LASVLRH opaque pointer + + + + Get the LASVLRH opaque pointer. + + LASVLRH opaque pointer + + + + Gets the data stream for the variable length record as an array of bytes + + a empty array of bytes where place the array + + + + Sets the data stream for the variable length record as an array of bytes + + array of bytes + + + + the User Id for the variable length record. + + It will be clipped to fit within 16 characters + + + + the description for the variable length record. + + It will be clipped to fit within 32 characters + + + + the record length of the data stored in the variable length record. + + + + + the record id for the variable length record. + + + + + the reserved value of the variable length record. + + This should be 0 and should always be 0. + + + + LASReadWriteMode enum + + + + + Mode of Read + + + + + Mode of Write + + + + + Mode of ppend + + + + + LASWriter class + + + + + The object user should call this method when they finished with the object. + + + + + Default constructor of the class + + string with the path of the LAS file + LASHeader to add the LAS file + mode to use the file by LASReadWriteMode enumeration + + + + Write a new point in the LAS file + + LASPoint to write in the file + + + + LASReader class + + + + + Creates a LASReaderH object that can be used to read LASHeaderH and LASPointH objects with. + + The LASReaderH must not be created with a filename that is opened for read or write by any other API functions. + filename to open for read + + + + Reads the next available point on the LASReaderH instance. + + true if we have next point + + + + get the current LASPoint. + + current LASPoint object + + + + Reads a LASPointH from the given position in the LAS file represented by the LASReader instance. + + If no point is available at that location, NULL is returned. + the integer position of the point in the file to read. + LASPoint object + + + + Get the header for the file associated with this Reader Class. + + LASHeader representing the header for the file. + + + + The object user should call this method when they finished with the object. In .NET is magaged by the GC. + + + + + LASHeader class + + + + + The object user should call this method when they finished with the object. + In .NET is magaged by the GC. + + + + + gets the opaque pointer to the LASHeaderH instance. + + opaque pointer to the LASHeaderH instance. + + + + LASHeader constructor using the LASHeaderH opaque pointer. + + + + + + Default constructor. + + The default constructed header is configured according + to the ASPRS LAS 1.1 Specification, point data format set to 0. + Other fields filled with 0. + + + + Copy the LASHeader in a new instance + + new LASHeader instance. + + + + Destroy the unmanaged resources to the instance. + + The user could call this method when they finished with the object. + + + + Comparison overload to the LASHeader + + LASHeader instance to be compared + LASHeader instance to be compared + true if lasHeader1==lasHeader2 + + + + Comparison overload to the LASHeader + + LASHeader instance to be compared + LASHeader instance to be compared + + + + + Returns the number of point records by return. + + the return number to fetch the count for + the number of point records for a given return + + + + Sets the number of point records for a given return + + the return number to set the count for + the number of point records for the return + + + + Get scale factor for X coordinate. + + scale factor for X coordinate. + + + + Get scale factor for Y coordinate. + + scale factor for Y coordinate. + + + + Get scale factor for Z coordinate. + + scale factor for Z coordinate. + + + + Set values of scale factor for X, Y and Z coordinates. + + X scale factor of the coordinate + Y scale factor of the coordinate + Z scale factor of the coordinate + + + + Get X coordinate offset. + + X coordinate offset. + + + + Get Y coordinate offset. + + Y coordinate offset. + + + + Get Z coordinate offset. + + Z coordinate offset. + + + + Set values of X, Y and Z coordinates offset. + + X coordinate offset. + Y coordinate offset. + Z coordinate offset. + + + + Get maximum value of extent of X coordinate. + + maximum value of extent of X coordinate. + + + + Get maximum value of extent of Y coordinate. + + maximum value of extent of Y coordinate. + + + + Get maximum value of extent of Z coordinate. + + maximum value of extent of Z coordinate. + + + + Get minimum value of extent of X coordinate. + + minimum value of extent of X coordinate. + + + + Get minimum value of extent of Y coordinate. + + minimum value of extent of Y coordinate. + + + + Get minimum value of extent of Z coordinate. + + minimum value of extent of Z coordinate. + + + + Set maximum values of extent of X, Y and Z coordinates. + + maximum value of extent of X coordinate. + maximum value of extent of Y coordinate. + maximum value of extent of Z coordinate. + + + + Set minimum values of extent of X, Y and Z coordinates. + + Set minimum value of extent of X coordinate. + Set minimum value of extent of Y coordinate. + Set minimum value of extent of Z coordinate. + + + + Adds a variable length record instance to the header. + + variable Length record instance to add + + + + Returns the variable length record for the given index. + + the index starting from 0 of the variable length record to fetch + a new variable length record instance + Use VariableLengthRecordsCount property to determine the number of + variable length records available on the header. + + + + Deletes a variable length record from the header for the given index. + + the index starting from 0 of the variable length record to delete + + + + Get ASPRS LAS file signature. + + The only value allowed as file signature is "LASF", + + + + file source identifier. + + should be set to a value between 1 and 65535. + + + + Get value field reserved by the ASPRS LAS Specification. + + This field is always filled with 0. + + + + Get project identifier. + + return Global Unique Identifier. + + + + major component of version of LAS format. + + Always 1 as the only valid value. value between + eVersionMajorMin and eVersionMajorMax (always 1). + + + + minor component of version of LAS format. + + Valid values are 1 or 0. value between + eVersionMinorMin and eVersionMinorMax. + + + + system identifier + + Default value is "libLAS" specified as the SystemIdentifier constant. + string is padded right with spaces and its length is 32 bytes. + + + + software identifier + + Default value is "libLAS 1.0", specified as the SoftwareIdentifier constant. + String is padded right with spaces and its length is 32 bytes. + + + + day of year of file creation date. + + Use full date structure instead of Julian date number. + value is lower than number 366. + + + + year of file creation date. + + value is lower than number 9999. + + + + number of bytes of generic verion of public header block storage. + + Standard version of the public header block is 227 bytes long. + + + + number of bytes from the beginning to the first point record. + + + + + Returns the number of variable length records in the header + + + + + the data format id for the file. + + The value should be 1 or 0, with 1 being points that contain + time values and 0 being points that do not. + + + + return the record length for the points based on their data format id in bytes. + + + + + number of point records in the file. + + This value may not reflect the actual number of point + records in the file. + + + + GUID value for the header. + + sets and gets the LASGuid instance of the header. + + + + sets and gets the Proj4 in the header. + + + + Minimum of major component + + + Maximum of major component + + + Minimum of minor component + + + Maximum of minor component + + + Versions of point record format. + + + Point Data Format \e 0 + + + Point Data Format \e 1 + + + Number of bytes of point record storage in particular format. + + + Size of point record in data format \e 0 + + + Size of point record in data format \e 1 + + + + LASGuid class + + + + + The object user should call this method when they finished with the object. + + + + + + Create a new random GUID. + + + + + Creates a new GUID using a opaque pointer. + + LASGuidH opaque pointer + + + + Creates a new GUID opaque pointer using the given string. + + An example GUID might be something like '8388F1B8-AA1B-4108-BCA3-6BC68E7B062E' + string A GUID string in the form "00000000-0000-0000-0000-000000000000" + + + + Gets the String value of the Guid + + the String value of the Guid + + + + Gets the GUID opaque pointer + + the GUID opaque pointer + + + + test if is equal to other object. + + object to compare + true if both are equal + + + + + + + + + + test if is equal to other LASGuid. + + LASGuid to compare + true if both are equal + + + Returns the version string for this library. + @return the version string for this library. + + If libLAS is built using solution from trunk/build/msvc80/liblas.sln + then C API DLL is called liblas_c_dll.dll, so value of the constant below + should be updated to "liblas_c_dll.dll". + + + Resets the error stack for the libLAS C API. + + + Pops the top error off of the error stack for the libLAS C API. + + + Returns the error number of the last error on the error stack. + @return the error number of the last error on the error stack. + + + Returns the name of the method the last error message happened in. + @return the name of the method the last error message happened in. + + + Returns the name of the method the last error message happened in. + @return the name of the method the last error message happened in. + + + Returns the number of error messages on the error stack. + @return the number of error messages on the error stack. + + + Prints the last error message in the error stack to stderr. If + there is no error on the error stack, only the message is printed. + The function does not alter the error stack in any way. + @param message Message to include in the stderr output + + + Creates a LASReaderH object that can be used to read LASHeaderH and + LASPointH objects with. The LASReaderH must not be created with a + filename that is opened for read or write by any other API functions. + @return opaque pointer to a LASReaderH instance. + @param filename Filename to open for read + + + Reads the next available point on the LASReaderH instance. If no point + is available to read, NULL is returned. If an error happens during + the reading of the next available point, an error will be added to the + error stack and can be returned with the LASError_GetLastError* methods. + @param hReader the opaque handle to the LASReaderH + @return an opaque handle to a LASPointH object, or NULL if no point is + available to read or an error occured. Use the + LASError_GetLastError* methods to confirm the existence of an error + if NULL is returned. + + + Reads a LASPointH from the given position in the LAS file represented + by the LASReaderH instance. If no point is available at that location, + NULL is returned. If an error happens during the reading of the point, + an error will be added to the error stack and can be returned with the + LASError_GetLastError* methods. + @param hReader the opaque handle to the LASReaderH + @param position the integer position of the point in the file to read. + @return an opaque handle to a LASPointH object, or NULL if no point is + available at the given location or an error occured. Use the + LASError_GetLastError* methods to confirm the existence of an error + if NULL is returned. + + + Closes the file for reading operations represented by the LASReaderH instance. + @param hReader the opqaue handle to the LASReaderH + + + Returns a LASHeaderH representing the header for the file + @param hReader the LASReaderH instance + @return a LASHeaderH representing the header for the file. NULL is returned + in the event of an error. Use the LASError_GetLastError* methods to check + in the event of a NULL return. + + + Returns the X value for the point. This value is not scaled or offset + by any header values and stands on its own. If you need points to have + a scale and/or offset applied, this must be done in conjunction with the + header values after the value is read. + @param hPoint the opaque pointer to the LASPointH instance + @return the X value for the LASPointH + + + Sets the X value for the point. This value must be scaled or offset + by any header values before being set. + @param hPoint the opaque pointer to the LASPointH instance + @param value the double value to set for the X value of the point + @return an error number if an error occured during the setting of the point. + + + Returns the Y value for the point. This value is not scaled or offset + by any header values and stands on its own. If you need points to have + a scale and/or offset applied, this must be done in conjunction with the + header values after the value is read. + @param hPoint the opaque pointer to the LASPointH instance + @return the Y value for the LASPointH + + + Sets the Y value for the point. This value must be scaled or offset + by any header values before being set. + @param hPoint the opaque pointer to the LASPointH instance + @param value the double value to set for the Y value of the point + @return an error number if an error occured during the setting of the point. + + + Returns the Z value for the point. This value is not scaled or offset + by any header values and stands on its own. If you need points to have + a scale and/or offset applied, this must be done in conjunction with the + header values after the value is read. + @param hPoint the opaque pointer to the LASPointH instance + @return the Z value for the LASPointH + + + Sets the Z value for the point. This value must be scaled or offset + by any header values before being set. + @param hPoint the opaque pointer to the LASPointH instance + @param value the double value to set for the Z value of the point + @return an error number if an error occured during the setting of the point. + + + Returns the intensity value for the point. This value is the pulse return + magnitude, it is optional, and it is LiDAR system specific. + @return the intensity value for the point. + + + Sets the intensity value for the point. + @param hPoint the opaque pointer to the LASPointH instance + @param value the value to set the intensity to + @return an error number if an error occured. + + + Returns the return number for the point. The return number is "the pulse + return number for a given output pulse." The first return number starts with + the value 1. + @param hPoint LASPointH instance + @return a return number, valid from 1-6, for the point. Use the LASError + methods to determine if an error occurred during this operation if 0 + is returned. + + + Sets the return number for the point. Valid values are from 1-6. + @param hPoint LASPointH instance + @param value the value to set for the return number + @return LASError value determine success or failure. + + + Returns the total number of returns for a given pulse. + @param hPoint LASPointH instance + @return total number of returns for this pulse. + + + Sets the number of returns for the point. Valid values are from 1-5. + @param hPoint LASPointH instance + @param value the value to set for the number of returns + @return LASError value determine success or failure. + + + Returns the scan direction for a given pulse. + @param hPoint LASPointH instance + @return the scan direction for a given pulse. + + + Sets the scan direction for a given pulse. Valid values are 0 or 1, with + 1 being a positive scan direction and 0 being a negative scan direction. + @param hPoint LASPointH instance + @param value the value to set for scan direction + @return LASError value determine success or failure. + + + Returns whether or not a given pulse is an edge point + @param hPoint LASPointH instance + @return whether or not a given pulse is an edge point. + + + Sets the edge marker for a given pulse. Valid values are 0 or 1, with + 1 being an edge point and 0 being interior. + @param hPoint LASPointH instance + @param value the value to set for flightline edge + @return LASError value determine success or failure. + + + Returns all of the scan flags for the point -- Return number, number of + returns, flightline edge, scan direction, and scan angle rank. + @param hPoint LASPointH instance + @return all of the scan flags for the point + + + Sets all of the scan flags for the point. No validation is done. + @param hPoint LASPointH instance + @param value the value to set for the flags + @return LASError value determine success or failure. + + + Returns the classification for the point + @param hPoint LASPointH instance + @return the classification for the point + + + Sets the classification for the point. No validation is done. + @param hPoint LASPointH instance + @param value the value to set for the classification + @return LASError value determine success or failure. + + + Returns the time for the point + @param hPoint LASPointH instance + @return the time for the point + + + Sets the time for the point. No validation is done. + @param hPoint LASPointH instance + @param value the value to set for the time + @return LASError value determine success or failure. + + + Returns the scan angle for the point + @param hPoint LASPointH instance + @return the scan angle for the point + + + Sets the scan angle for the point. No validation is done. + @param hPoint LASPointH instance + @param value the value to set for the scan angle + @return LASError value determine success or failure. + + + Returns the arbitrary user data for the point + @param hPoint LASPointH instance + @return the arbitrary user data for the point + + + Sets the arbitrary user data for the point. No validation is done. + @param hPoint LASPointH instance + @param value the value to set for the arbitrary user data + @return LASError value determine success or failure. + + + Returns a bitfield representing the validity of various members + * enum DataMemberFlag + { + eReturnNumber = 1, + eNumberOfReturns = 2, + eScanDirection = 4, + eFlightLineEdge = 8, + eClassification = 16, + eScanAngleRank = 32, + eTime = 64 + }; + * @param hPoint LASPointH instance + * @return bitfield representing the validity of various members. + + + Returns a boolean whether or not the point is valid + @param hPoint LASPointH instance + @return a boolean (1 or 0) whether or not the point is valid. + + + Creates a new empty LASPointH instance + @return LASPointH instance. If the value is NULL use the + LASError_GetLastError* methods to determine the problem + + + Creates a copy of a LASPointH instance + @param hPoint the LASPointH instance to copy + @return new LASPointH instance. If the value is NULL use the + LASError_GetLastError* methods to determine the problem + + + Destroys/deletes a LASPointH instance + + + Copies a LASHeaderH instance + @param hHeader the LASHeaderH to copy + @return a LASHeaderH instance or NULL on error + + + Creates an empty LASHeaderH with default values + + + Destroys/deletes a LASHeader instance + + + Returns the file signature the the file. This should always be 'LASF' + @param hHeader LASHeaderH instance + @return the file signature the the file. This should always be 'LASF' + + + Returns the file source id for the file. It is a number from 1-65535 + @param hHeader LASHeaderH instance + @return the file source id for the file. + + + Returns the project id for the header as a GUID string + @return the project id for the header as a GUID string + + + Sets the project id/GUID for the header + @param hHeader LASHeaderH instance + @param hId LASGuidH instance to set the GUID for the header to + @return LASError enum + + + Returns the major version number for the header. This value is expected + to always be 1. + @param hHeader LASHeaderH instance + @return major version number for the header. + + + Sets the major version number for the header. All values other than 1 + are invalid. + @param hHeader LASHeaderH instance + @param value integer value to set the major version to (only the value 1 is valid) + @return LASError enum + + + Returns the min version number for the header. This value is expected + to be 1 or 0 representing LAS 1.1 or LAS 1.0 + @param hHeader LASHeaderH instance + @return minor version number for the header. + + + Sets the minor version number for the header. All values other than 1 or 0 + are invalid. + @param hHeader LASHeaderH instance + @param value integer value to set the minor version to (only the values 1 or 0 are valid) + @return LASError enum + + + Returns the System ID for the header. The caller assumes ownership of the returned string + @return the system id for the header as a character array + + + Sets the System ID for the header. By default, this value is "libLAS" if it + is not explicitly set. See the LAS specification for details on what this + value should logically be set to. + @param hHeader LASHeaderH instance + @param value the value to set as the System ID for the header + @return LASError enum + + + Returns the Software ID for the header. The caller assumes ownership of the returned string + @return the software id for the header as a character array + + + Sets the Software ID for the header. By default, this value is "libLAS 1.0" if it + is not explicitly set. See the LAS specification for details on what this + value should logically be set to. + @param hHeader LASHeaderH instance + @param value the value to set as the Software ID for the header + @return LASError enum + + + Returns the reserved value for the header. This should aways be 0. + @return the reserved value for the header. + + + Returns the file creation day of the year. The values start from 1, being January 1st, + and end at 365 or 366 being December 31st, depending on leap year. + @return the day of the year as an integer starting from 1 for the file creation. + + + Sets the file creation day of the year. The values start from 1, being January 1st. No + date validation is done + @param hHeader LASHeaderH instance + @param value the value to set as the creation day + @return LASError enum + + + Returns the file creation year. This is a four digit number representing the + year for the file, ie 2003, 2008, etc. + @return the creation year for the file or 0 if none is set + + + Sets the file creation year. This should be a four digit number representing + the year for the file, ie 2003, 2008, etc. No validation on the value is done + @param hHeader LASHeaderH instance + @param value the value to set for the creation year + @return LASError enum + + + Returns the size of the header for the file in bytes. + @return the size of the header for the file in bytes. + + + Returns the byte offset to the start of actual point data for the file + @param hHeader LASHeaderH instance + @return the type offset to the start of actual point data for the file + + + Returns the number of variable length records in the header + @param hHeader LASHeaderH instance + @return the number of variable length records in the header + + + Returns the record length for the points based on their data format id in bytes + @param hHeader LASHeaderH instance + @return the record length for the points based on their data format id in bytes + + + Returns the data format id. If this value is 1, the point data have time values + associated with them. If it is 0, the point data do not have time values. + @param hHeader LASHeaderH instance + @return the data format id for the file. + + + Sets the data format id for the file. The value should be 1 or 0, with 1 being + points that contain time values and 0 being points that do not. + @param hHeader LASHeaderH instance + @param value the value for the data format id, 1 or 0 are valid values. + @return LASError enum + + + Returns the number of point records in the file. This value may not reflect the actual + number of point records in the file. + @param hHeader LASHeaderH instance + @return the number of point records in the file + + + Sets the number of point records for the file. + @param hHeader LASHeaderH instance + @param value the long integer to set for the number of point records in the file + @return LASError enum + + + Returns the number of point records by return. + @param hHeader LASHeaderH instance + @param index the return number to fetch the count for + @return the number of point records for a given return + + + Sets the number of point records for a given return + @param hHeader LASHeaderH instance + @param index the return number to set the count for + @param value the number of point records for the return + @return LASError enum + + + Return the X scale factor + @param hHeader LASHeaderH instance + @return the X scale factor + + + Return the Y scale factor + @param hHeader LASHeaderH instance + @return the Y scale factor + + + Return the Z scale factor + @param hHeader LASHeaderH instance + @return the Z scale factor + + + Sets the scale factors + @param hHeader LASHeaderH instance + @param x the x scale factor + @param y the y scale factor + @param z the z scale factor + @return LASError enum + + + Return the X offset + @param hHeader LASHeaderH instance + @return the X offset + + + Return the Y offset + @param hHeader LASHeaderH instance + @return the Y offset + + + Return the Z offset + @param hHeader LASHeaderH instance + @return the Z offset + + + Sets the offset values + @param hHeader LASHeaderH instance + @param x the x offset + @param y the y offset + @param z the z offset + @return LASError enum + + + Return the minimum x value + @param hHeader LASHeaderH instance + @return the minimum x value + + + Return the minimum y value + @param hHeader LASHeaderH instance + @return the minimum y value + + + Return the minimum z value + @param hHeader LASHeaderH instance + @return the minimum z value + + + Sets the minimum values + @param hHeader LASHeaderH instance + @param x the x minimum + @param y the y minimum + @param z the z minimum + @return LASError enum + + + Return the maximum x value + @param hHeader LASHeaderH instance + @return the maximum x value + + + Return the maximum y value + @param hHeader LASHeaderH instance + @return the maximum y value + + + Return the maximum z value + @param hHeader LASHeaderH instance + @return the maximum z value + + + Sets the maximum values + @param hHeader LASHeaderH instance + @param x the x maximum + @param y the y maximum + @param z the z maximum + @return LASError enum + + + Returns the proj.4 string describing the spatial reference of the + header if it is available + @param hHeader LASHeaderH instance + @return the proj.4 string or NULL if none is available. The caller + owns the string. + + + Sets the proj4 stirng describing the spatial reference of the header. + @param hHeader LASHeaderH instance + @param value the proj4 string to set for the header + @return LASError enum + + + Returns the VLR record for the given index. Use LASHeader_GetRecordsCount to + determine the number of VLR records available on the header. + @param hHeader the LASHeaderH instance + @param i the index starting from 0 of the VLR to fetch + @return LASVLRH instance that models the Variable Length Record + + + Deletes a VLR record from the header for the given index. + @param hHeader the LASHeaderH instance + @param index the index starting from 0 of the VLR to delete + @return LASErrorEnum + + + Adds a VLR record to the header. + @param hHeader the LASHeaderH instance + @param hVLR the VLR to add to the header + @return LASErrorEnum + + + Creates a new LASWriterH for write operations on LAS files. The file may + be opened in either LAS_MODE_APPEND or LAS_MODE_WRITE, but the file cannot + be open by another other operations (another LASReaderH or LASWriterH). + @param filename The filename to open to write + @param hHeader an opaque pointer to a LASHeaderH that will be written to + the file as part of the opening for write operation. + @param mode a mode value to denote whether to open for write or append + operations. Valid values are LAS_MODE_APPEND and LAS_MODE_WRITE. + + + Writes a point to the file. The location of where the point is writen is + determined by the mode the file is opened in, and what the last operation was. + For example, if the file was opened for append, the next point would be written + at the end of the file. Likewise, if the file is opened in write mode, even + if the file already existed, the next WritePoint operation will happen at the + end of the header and all of the existing points in the file will be overwritten. + @param hWriter opaque pointer to the LASWriterH instance + @param hPoint the opaque LASPointH pointer to write + @return LE_None if no error occurred during the write operation. + + + Overwrites the header for the file represented by the LASWriterH. It does + not matter if the file is opened for append or for write. + @param hWriter opaque pointer to the LASWriterH instance + @param hHeader LASHeaderH instance to write into the file + @return LE_None if no error occurred during the operation. + + + Destroys the LASWriterH instance, effectively closing the file and performing + housekeeping operations. + @param hWriter LASWriterH instance to close + + + Returns the GUID value for the header as an opaque LASGuidH pointer. + @param hHeader the opaque pointer to the LASHeaderH + @return the GUID value for the header as an opaque LASGuidH pointer. + + + Returns a new random GUID. + @return a new random GUID + + + Creates a new GUID opaque pointer using the given string. + @param string A GUID string in the form "00000000-0000-0000-0000-000000000000" + An example GUID might be something like '8388F1B8-AA1B-4108-BCA3-6BC68E7B062E' + @return the GUID value as an opaque LASGuidH pointer. + + + Destroys a GUID opaque pointer and removes it from the heap + @param hId the GUID value to destroy as an opaque LASGuidH pointer. + + + Determines if two GUIDs are equal. + @param hId1 the first GUID + @param hId2 the second GUID + @return 0 if false, 1 if true. Use the LASError_GetLastError* methods to + determine if an error occured during the operation of this function. + + + Returns a string representation of the GUID opqaue pointer. The caller + owns the string. + @param hId the LASGuidH pointer + @return a string representation of the GUID opaque pointer. + + + Creates a new VLR record + @return a new VLR record + + + Destroys a VLR record and removes it from the heap + + + Returns the User Id for the VLR + @param hVLR the LASVLRH instance + @return the User Id for the VLR + + + Sets the User Id for the VLR + @param hVLR the LASVLRH instance + @param value the value to set for the User Id. It will be clipped to fit + within 16 characters + @return LASErrorEnum + + + Gets the description for the VLR + @param hVLR the LASVLRH instance + @return the description for the VLR + + + Sets the description for the VLR + @param hVLR the LASVLRH instance + @param value the value to set for the description. It will be clipped to fit + within 32 characters + @return LASErrorEnum + + + Returns the record length of the data stored in the VLR + @param hVLR the LASVLRH instance + @return the record length of the data stored in the VLR + + + Sets the record length of the data stored in the VLR + @param hVLR the LASVLRH instance + @param value the length to set for the VLR data length + @return LASErrorEnum + + + Gets the record id for the VLR + @param hVLR the LASVLRH instance + @return the record id for the VLR + + + Sets the record id for the VLR + @param hVLR the LASVLRH instance + @param value the record id to set + @return LASErrorEnum + + + Gets the reserved value of the VLR. This should be 0 and should aways be 0. + @param hVLR the LASVLRH instance + @return the reserved value of the VLR. + + + Sets the reserved value of the VLR. This should be 0 and you should not + have to ever monkey with this value according to the spec. + @param hVLR the LASVLRH instance + @param value the value to set for the reserved value + @return LASErrorEnum + + + Gets the data stream for the VLR as an array of bytes + @param hVLR the LASVLRH instance + @param data a pointer to where place the array + @param length a pointer to where to place the length of the array + @return LASErrorEnum + + + + LASPoint class + + + + + Create a new LASPoint from the LASPointH opaque structure + + LASPointH opaque structure + + + + Create a generic LASPoint + + + + + Compare 2 LASPoint to be equal + + LASPoint object + true if lasPoint is equals to the instance. + + + + test is the LASPoint is Valid + + true is is valid + + + + The object user should call this method when they finished with the object. In .NET is magaged by the GC. + + + + + gets the opaque pointer to the LASPointH instance. + + the opaque pointer to the LASPointH instance + + + + Copy a LASPoint object creating a new one. + + a new LASPoint instance copied. + + + + + + + + + + X value for the point. + + This value must be scaled or offset by any header values before being set. + + + + Y value for the point. + + This value must be scaled or offset by any header values before being set. + + + + Z value for the point. + + This value must be scaled or offset by any header values before being set. + + + + + intensity value for the point. + + This value is the pulse return magnitude, it is optional, and it is LiDAR system specific. + + + + + scan flags for the point -- Return number, number of returns, flightline edge, scan direction, and scan angle rank. + + + + + + return number for the point. + + The return number is "the pulse return number for a given output pulse." The first return number starts with the value 1. valid from 1 to 6. + + + + total number of returns for a given pulse. + + Valid values are from 1-5. + + + + scan direction for a given pulse. + + Valid values are 0 or 1, with 1 being a positive scan direction and 0 being a negative scan direction. + + + + whether or not a given pulse is an edge point. + + Valid values are 0 or 1, with 1 being an edge point and 0 being interior. + + + + classification for the point. + + + + + the scan angle for the point. + + + + + arbitrary user data for the point. + + + + + time for the point. + + + + + Returns a bitfield representing the validity of various members. + + + + + ReturnNumber property flag. + + + + + NumberOfReturns property flag. + + + + + ScanDirection property flag. + + + + + FlightLineEdge property flag. + + + + + Classification property flag. + + + + + ScanAngleRank property flag. + + + + + Time property flag. + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASException.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASException.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASException.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASException.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,91 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + enum LASError + { + LENone = 0, + LEDebug = 1, + LEWarning = 2, + LEFailure = 3, + LEFatal = 4 + }; + + /// + /// LASException class + /// + public class LASException : + System.ApplicationException + { + /// + /// Default constructor + /// + /// string to show + public LASException(string message) + : + base(message) + { + } + + /// + /// TODO + /// + /// TODO + /// the string + public static string GetString(Int32 value) + { + //to do. Implementent enum errors + return "LibLAS exception"; + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASGuid.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASGuid.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASGuid.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASGuid.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,181 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + /// + /// LASGuid class + /// + public class LASGuid : IDisposable + { + private LASGuidH hguid; + + /// + /// The object user should call this method when they finished with the object. + /// + /// + public void Dispose() + { + CAPI.LASGuid_Destroy(hguid); + // Clean up unmanaged resources here. + // Dispose other contained disposable objects. + } + + /// + /// Create a new random GUID. + /// + public LASGuid() + { + hguid = CAPI.LASGuid_Create(); + } + + /// + /// Creates a new GUID using a opaque pointer. + /// + /// LASGuidH opaque pointer + public LASGuid(LASGuidH hGuid) + { + hguid = hGuid; + } + + /// + /// Creates a new GUID opaque pointer using the given string. + /// + /// An example GUID might be something like '8388F1B8-AA1B-4108-BCA3-6BC68E7B062E' + /// string A GUID string in the form "00000000-0000-0000-0000-000000000000" + public LASGuid(String guidString) + { + hguid = CAPI.LASGuid_CreateFromString(guidString); + } + + /// + /// Gets the String value of the Guid + /// + /// the String value of the Guid + public override string ToString() + { + return CAPI.LASGuid_AsString(hguid); + } + + /// + /// Gets the GUID opaque pointer + /// + /// the GUID opaque pointer + internal LASGuidH GetPointer() + { + return hguid; + } + + /// + /// test if is equal to other object. + /// + /// object to compare + /// true if both are equal + public override bool Equals(object obj) + { + //if parameter is null return false + if (obj == null) + { + return false; + } + + //if parameter cannot be cast to Guid return false + LASGuid guidd = obj as LASGuid; + if ((object)guidd == null) + { + return false; + } + + if (CAPI.LASGuid_Equals(hguid, guidd.GetPointer()) == 1) + { + return true; + } + else + { + return false; + } + } + + /// + /// + /// + /// + public override int GetHashCode() + { + return base.GetHashCode(); + } + + /// + /// test if is equal to other LASGuid. + /// + /// LASGuid to compare + /// true if both are equal + public bool Equals(LASGuid obj) + { + //if parameter cannot be cast to Guid return false + + if ((object)obj == null) + { + return false; + } + + if (CAPI.LASGuid_Equals(hguid, obj.GetPointer()) == 1) + { + return true; + } + else + { + return false; + } + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASHeader.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASHeader.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASHeader.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASHeader.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,751 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + /// + /// LASHeader class + /// + public class LASHeader : IDisposable + { + + /// + /// The object user should call this method when they finished with the object. + /// In .NET is magaged by the GC. + /// + public void Dispose() + { + + CAPI.LASHeader_Destroy(hHeader); + // Clean up unmanaged resources here. + // Dispose other contained disposable objects. + } + + enum FormatVersion + { + /// Minimum of major component + eVersionMajorMin = 1, + ///Maximum of major component + eVersionMajorMax = 1, + /// Minimum of minor component + eVersionMinorMin = 0, + /// Maximum of minor component + eVersionMinorMax = 1 + }; + + /// Versions of point record format. + public enum PointFormat + { + ///Point Data Format \e 0 + ePointFormat0 = 0, + /// Point Data Format \e 1 + ePointFormat1 = 1 + }; + + /// Number of bytes of point record storage in particular format. + public enum PointSize + { + ///Size of point record in data format \e 0 + ePointSize0 = 20, + /// Size of point record in data format \e 1 + ePointSize1 = 28 + }; + + //// Official signature of ASPRS LAS file format, always \b "LASF". + //public static readonly string FileSignature_; + + //// Default system identifier used by libLAS, always \b "libLAS". + //public static readonly string SystemIdentifier; + + ////Default software identifier used by libLAS, always \b "libLAS X.Y". + //public static readonly string SoftwareIdentifier; + + private LASHeaderH hHeader; + + /// + /// gets the opaque pointer to the LASHeaderH instance. + /// + /// opaque pointer to the LASHeaderH instance. + internal LASHeaderH GetPointer() + { + return hHeader; + } + + /// + /// LASHeader constructor using the LASHeaderH opaque pointer. + /// + /// + public LASHeader(LASHeaderH hLASHeader) + { + hHeader = hLASHeader; + } + + /// + /// Default constructor. + /// + /// The default constructed header is configured according + /// to the ASPRS LAS 1.1 Specification, point data format set to 0. + /// Other fields filled with 0. + public LASHeader() + { + hHeader = CAPI.LASHeader_Create(); + } + + /// + /// Copy the LASHeader in a new instance + /// + /// new LASHeader instance. + public LASHeader Copy() + { + return new LASHeader(CAPI.LASHeader_Copy(hHeader)); + } + + /// + /// Destroy the unmanaged resources to the instance. + /// + /// The user could call this method when they finished with the object. + public void Destroy() + { + CAPI.LASHeader_Destroy(hHeader); + } + + /// + /// Comparison overload to the LASHeader + /// + /// LASHeader instance to be compared + /// LASHeader instance to be compared + /// true if lasHeader1==lasHeader2 + public static bool operator ==(LASHeader lasHeader1, LASHeader lasHeader2) + { + return lasHeader1.Equals(lasHeader2); + } + + /// + /// Comparison overload to the LASHeader + /// + /// LASHeader instance to be compared + /// LASHeader instance to be compared + /// + public static bool operator !=(LASHeader lasHeader1, LASHeader lasHeader2) + { + return !(lasHeader1 == lasHeader2); + } + + /// + /// Get ASPRS LAS file signature. + /// + /// The only value allowed as file signature is "LASF", + public string FileSignature + { + get + { + return CAPI.LASHeader_GetFileSignature(hHeader); + } + } + + /// + /// file source identifier. + /// + /// should be set to a value between 1 and 65535. + public UInt16 FileSourceId + { + get + { + return CAPI.LASHeader_GetFileSourceId(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetFileSourceId(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SetFileSourceId."); + throw e; + } + } + } + + /// + /// Get value field reserved by the ASPRS LAS Specification. + /// + /// This field is always filled with 0. + public Int16 Reserved + { + get + { + return CAPI.LASHeader_GetReserved(hHeader); + } + } + + /// + /// Get project identifier. + /// + /// return Global Unique Identifier. + public String ProjectId + { + get + { + return CAPI.LASHeader_GetProjectId(hHeader); + } + } + + /// + /// major component of version of LAS format. + /// + /// Always 1 as the only valid value. value between + /// eVersionMajorMin and eVersionMajorMax (always 1). + public byte VersionMajor + { + get + { + return CAPI.LASHeader_GetVersionMajor(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetVersionMajor(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header VersionMajor."); + throw e; + } + } + } + + /// + /// minor component of version of LAS format. + /// + /// Valid values are 1 or 0. value between + /// eVersionMinorMin and eVersionMinorMax. + public byte VersionMinor + { + get + { + + return CAPI.LASHeader_GetVersionMinor(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetVersionMinor(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header VersionMinor."); + throw e; + } + } + } + + /// + /// system identifier + /// + /// Default value is "libLAS" specified as the SystemIdentifier constant. + /// string is padded right with spaces and its length is 32 bytes. + public String SystemId + { + get + { + return CAPI.LASHeader_GetSystemId(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetSystemId(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SystemId."); + throw e; + } + } + } + + /// + /// software identifier + /// + /// Default value is "libLAS 1.0", specified as the SoftwareIdentifier constant. + /// String is padded right with spaces and its length is 32 bytes. + public String SoftwareId + { + get + { + + return CAPI.LASHeader_GetSoftwareId(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetSoftwareId(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SoftwareId."); + throw e; + } + } + } + + /// + /// day of year of file creation date. + /// + /// Use full date structure instead of Julian date number. + /// value is lower than number 366. + public UInt16 CreationDOY + { + get + { + return CAPI.LASHeader_GetCreationDOY(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetCreationDOY(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header CreationDOY."); + throw e; + } + } + } + + /// + /// year of file creation date. + /// + /// value is lower than number 9999. + public UInt16 CreationYear + { + get + { + return CAPI.LASHeader_GetCreationYear(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetCreationYear(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header CreationYear."); + throw e; + } + } + } + + /// + /// number of bytes of generic verion of public header block storage. + /// + /// Standard version of the public header block is 227 bytes long. + public UInt16 HeaderSize + { + get + { + return CAPI.LASHeader_GetHeaderSize(hHeader); + } + } + + /// + /// number of bytes from the beginning to the first point record. + /// + public UInt32 DataOffset + { + get + { + return CAPI.LASHeader_GetDataOffset(hHeader); + } + } + + /// + /// Returns the number of variable length records in the header + /// + public UInt32 VariableLengthRecordsCount + { + get + { + return CAPI.LASHeader_GetRecordsCount(hHeader); + } + } + + /// + /// the data format id for the file. + /// + /// The value should be 1 or 0, with 1 being points that contain + /// time values and 0 being points that do not. + public byte DataFormatId + { + get + { + return CAPI.LASHeader_GetDataFormatId(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetDataFormatId(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header DataFormatId."); + throw e; + } + } + } + + /// + /// return the record length for the points based on their data format id in bytes. + /// + public UInt16 DataRecordLength + { + get + { + return CAPI.LASHeader_GetDataRecordLength(hHeader); + } + } + + /// + /// number of point records in the file. + /// + /// This value may not reflect the actual number of point + /// records in the file. + public UInt32 PointRecordsCount + { + get + { + //Get total number of point records stored in the LAS file. + return CAPI.LASHeader_GetPointRecordsCount(hHeader); + } + set + { + //Set number of point records that will be stored in a new LAS file. + LASError error = CAPI.LASHeader_SetPointRecordsCount(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header PointRecordsCount."); + throw e; + } + } + } + + /// + /// Returns the number of point records by return. + /// + /// the return number to fetch the count for + /// the number of point records for a given return + public UInt32 GetPointRecordsByReturnCount(int index) + { + // Get array of the total point records per return. + return CAPI.LASHeader_GetPointRecordsByReturnCount(hHeader, index); + } + + // /// Set values of 5-elements array of total point records per return. + // /// \exception std::out_of_range - if index is bigger than 4. + // /// \param index - subscript (0-4) of array element being updated. + // /// \param v - new value to assign to array element identified by index. + /// + /// Sets the number of point records for a given return + /// + /// the return number to set the count for + /// the number of point records for the return + public void SetPointRecordsByReturnCount(int index, UInt32 value) + { + LASError error = CAPI.LASHeader_SetPointRecordsByReturnCount(hHeader, index, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SetPointRecordsByReturnCount."); + throw e; + } + } + + /// + /// Get scale factor for X coordinate. + /// + /// scale factor for X coordinate. + public double GetScaleX() + { + return CAPI.LASHeader_GetScaleX(hHeader); + } + + /// + /// Get scale factor for Y coordinate. + /// + /// scale factor for Y coordinate. + public double GetScaleY() + { + return CAPI.LASHeader_GetScaleY(hHeader); + } + + /// + /// Get scale factor for Z coordinate. + /// + /// scale factor for Z coordinate. + public double GetScaleZ() + { + return CAPI.LASHeader_GetScaleZ(hHeader); + } + + /// + /// Set values of scale factor for X, Y and Z coordinates. + /// + /// X scale factor of the coordinate + /// Y scale factor of the coordinate + /// Z scale factor of the coordinate + public void SetScale(double x, double y, double z) + { + LASError error = CAPI.LASHeader_SetScale(hHeader, x, y, z); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SetScale."); + throw e; + } + } + + /// + /// Get X coordinate offset. + /// + /// X coordinate offset. + public double GetOffsetX() + { + return CAPI.LASHeader_GetOffsetX(hHeader); + } + + /// + /// Get Y coordinate offset. + /// + /// Y coordinate offset. + public double GetOffsetY() + { + return CAPI.LASHeader_GetOffsetY(hHeader); + } + + /// + /// Get Z coordinate offset. + /// + /// Z coordinate offset. + public double GetOffsetZ() + { + return CAPI.LASHeader_GetOffsetZ(hHeader); + } + + //Set values of X, Y and Z coordinates offset. + /// + /// Set values of X, Y and Z coordinates offset. + /// + /// X coordinate offset. + /// Y coordinate offset. + /// Z coordinate offset. + public void SetOffset(double x, double y, double z) + { + LASError error = CAPI.LASHeader_SetOffset(hHeader, x, y, z); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SetOffset."); + throw e; + } + } + + /// + /// Get maximum value of extent of X coordinate. + /// + /// maximum value of extent of X coordinate. + public double MaxX() + { + return CAPI.LASHeader_GetMaxX(hHeader); + } + + /// + /// Get maximum value of extent of Y coordinate. + /// + /// maximum value of extent of Y coordinate. + public double GetMaxY() + { + return CAPI.LASHeader_GetMaxY(hHeader); + } + + /// + /// Get maximum value of extent of Z coordinate. + /// + /// maximum value of extent of Z coordinate. + public double GetMaxZ() + { + return CAPI.LASHeader_GetMaxZ(hHeader); + } + + /// + /// Get minimum value of extent of X coordinate. + /// + /// minimum value of extent of X coordinate. + public double GetMinX() + { + return CAPI.LASHeader_GetMinX(hHeader); + } + + /// + /// Get minimum value of extent of Y coordinate. + /// + /// minimum value of extent of Y coordinate. + public double GetMinY() + { + return CAPI.LASHeader_GetMinY(hHeader); + } + + /// + /// Get minimum value of extent of Z coordinate. + /// + /// minimum value of extent of Z coordinate. + public double GetMinZ() + { + return CAPI.LASHeader_GetMinZ(hHeader); + } + + /// + /// Set maximum values of extent of X, Y and Z coordinates. + /// + /// maximum value of extent of X coordinate. + /// maximum value of extent of Y coordinate. + /// maximum value of extent of Z coordinate. + public void SetMax(double x, double y, double z) + { + LASError error = CAPI.LASHeader_SetMax(hHeader, x, y, z); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SetMax."); + throw e; + } + } + + /// + /// Set minimum values of extent of X, Y and Z coordinates. + /// + /// Set minimum value of extent of X coordinate. + /// Set minimum value of extent of Y coordinate. + /// Set minimum value of extent of Z coordinate. + public void SetMin(double x, double y, double z) + { + LASError error = CAPI.LASHeader_SetMin(hHeader, x, y, z); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header SetMin."); + throw e; + } + } + + /// + /// Adds a variable length record instance to the header. + /// + /// variable Length record instance to add + public void AddVariableLengthRecord(LASVariableLengthRecord variableLengthRecord) + { + LASError error = CAPI.LASHeader_AddVLR(hHeader, variableLengthRecord.GetPointer()); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Header AddVariableLengthRecord."); + throw e; + } + } + + /// + /// Returns the variable length record for the given index. + /// + /// the index starting from 0 of the variable length record to fetch + /// a new variable length record instance + /// Use VariableLengthRecordsCount property to determine the number of + /// variable length records available on the header. + public LASVariableLengthRecord GetVariableLengthRecord(UInt32 i) + { + LASVLRH vlrh = CAPI.LASHeader_GetVLR(hHeader, i); + return new LASVariableLengthRecord(vlrh); + } + + /// + /// Deletes a variable length record from the header for the given index. + /// + /// the index starting from 0 of the variable length record to delete + public void DeleteVariableLengthRecord(UInt32 index) + { + LASError error = CAPI.LASHeader_DeleteVLR(hHeader, index); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Header DeleteVariableLengthRecord."); + throw e; + } + } + + /// + /// GUID value for the header. + /// + /// sets and gets the LASGuid instance of the header. + public LASGuid GUID + { + get + { + LASGuidH guidh = CAPI.LASHeader_GetGUID(hHeader); + return new LASGuid(guidh); + } + set + { + + LASError error = CAPI.LASHeader_SetGUID(hHeader, value.GetPointer()); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header GUID."); + throw e; + } + } + } + + /// + /// sets and gets the Proj4 in the header. + /// + public string Proj4 + { + get + { + return CAPI.LASHeader_GetProj4(hHeader); + } + set + { + LASError error = CAPI.LASHeader_SetProj4(hHeader, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Header Proj4."); + throw e; + } + } + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASPoint.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASPoint.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASPoint.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASPoint.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,491 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + /// + /// LASPoint class + /// + public class LASPoint : IDisposable + { + /// + /// Returns a bitfield representing the validity of various members. + /// + public enum DataMemberFlag + { + /// + /// ReturnNumber property flag. + /// + eReturnNumber = 1, + /// + /// NumberOfReturns property flag. + /// + eNumberOfReturns = 2, + /// + /// ScanDirection property flag. + /// + eScanDirection = 4, + /// + /// FlightLineEdge property flag. + /// + eFlightLineEdge = 8, + /// + /// Classification property flag. + /// + eClassification = 16, + /// + /// ScanAngleRank property flag. + /// + eScanAngleRank = 32, + /// + /// Time property flag. + /// + eTime = 64 + }; + + private LASPointH hPoint; + + /// + /// Create a new LASPoint from the LASPointH opaque structure + /// + /// LASPointH opaque structure + public LASPoint(LASPointH hLASPoint) + { + hPoint = hLASPoint; + } + + /// + /// Create a generic LASPoint + /// + public LASPoint() + { + hPoint = CAPI.LASPoint_Create(); + } + + /// + /// Compare 2 LASPoint to be equal + /// + /// LASPoint object + /// true if lasPoint is equals to the instance. + public bool Equals(LASPoint lasPoint) + { + if (X == lasPoint.X && Y == lasPoint.Y && Z == lasPoint.Z) + { + return true; + } + else + { + return false; + } + } + + /// + /// test is the LASPoint is Valid + /// + /// true is is valid + public bool IsValid() + { + if (CAPI.LASPoint_IsValid(hPoint) == 1) + { + return true; + } + else + { + return false; + } + } + + /// + /// The object user should call this method when they finished with the object. In .NET is magaged by the GC. + /// + public void Dispose() + { + CAPI.LASPoint_Destroy(hPoint); + // Clean up unmanaged resources here. + // Dispose other contained disposable objects. + } + + enum ClassificationType + { + eCreated = 0, + eUnclassified, + eGround, + eLowVegetation, + eMediumVegetation, + eHighVegetation, + eBuilding, + eLowPoint, + eModelKeyPoint, + eWater = 9, + // = 10 // reserved for ASPRS Definition + // = 11 // reserved for ASPRS Definition + eOverlapPoints = 12 + // = 13-31 // reserved for ASPRS Definition + }; + + enum ScanAngleRankRange + { + eScanAngleRankMin = -90, + eScanAngleRankMax = 90 + }; + + /// + /// gets the opaque pointer to the LASPointH instance. + /// + /// the opaque pointer to the LASPointH instance + internal LASPointH GetPointer() + { + return hPoint; + } + + /// + /// Copy a LASPoint object creating a new one. + /// + /// a new LASPoint instance copied. + public LASPoint Copy() + { + LASPointH laspointhTemp = CAPI.LASPoint_Copy(hPoint); + return new LASPoint(laspointhTemp); + } + + /// + /// + /// + /// + public bool Validate() + { + int error = CAPI.LASPoint_Validate(hPoint); + + if (error != 0) + { + LASException e = new LASException("Point data members out of range."); + e.Data.Add("DataMemberFlag", error); + throw e; + } + + return true; + } + + /// + /// X value for the point. + /// + /// This value must be scaled or offset by any header values before being set. + public double X + { + get + { + return CAPI.LASPoint_GetX(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetX(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point X."); + throw e; + } + } + } + + /// + /// Y value for the point. + /// + /// This value must be scaled or offset by any header values before being set. + public double Y + { + get + { + return CAPI.LASPoint_GetY(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetY(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point Y."); + throw e; + } + } + } + + /// + /// Z value for the point. + /// + /// This value must be scaled or offset by any header values before being set. + /// + public double Z + { + get + { + return CAPI.LASPoint_GetZ(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetZ(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point Z."); + throw e; + } + } + } + + /// + /// intensity value for the point. + /// + /// This value is the pulse return magnitude, it is optional, and it is LiDAR system specific. + /// + public UInt16 Intensity + { + get + { + return CAPI.LASPoint_GetIntensity(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetIntensity(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point Intensity."); + throw e; + } + } + } + + /// + /// scan flags for the point -- Return number, number of returns, flightline edge, scan direction, and scan angle rank. + /// + /// + public byte ScanFlags + { + get + { + return CAPI.LASPoint_GetScanFlags(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetScanFlags(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point ScanFlags."); + throw e; + } + + } + } + + /// + /// return number for the point. + /// + /// The return number is "the pulse return number for a given output pulse." The first return number starts with the value 1. valid from 1 to 6. + public UInt16 ReturnNumber + { + get + { + return CAPI.LASPoint_GetReturnNumber(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetReturnNumber(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point ReturnNumber."); + throw e; + } + } + } + + /// + /// total number of returns for a given pulse. + /// + /// Valid values are from 1-5. + public UInt16 NumberOfReturns + { + get + { + return CAPI.LASPoint_GetNumberOfReturns(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetNumberOfReturns(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point NumberOfReturns."); + throw e; + } + } + } + + /// + /// scan direction for a given pulse. + /// + /// Valid values are 0 or 1, with 1 being a positive scan direction and 0 being a negative scan direction. + public UInt16 ScanDirection + { + get + { + return CAPI.LASPoint_GetScanDirection(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetScanDirection(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point ScanDirection."); + throw e; + } + } + } + + /// + /// whether or not a given pulse is an edge point. + /// + /// Valid values are 0 or 1, with 1 being an edge point and 0 being interior. + public UInt16 FlightLineEdge + { + get + { + return CAPI.LASPoint_GetFlightLineEdge(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetFlightLineEdge(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point FlightLineEdge."); + throw e; + } + } + } + + /// + /// classification for the point. + /// + public byte Classification + { + get + { + return CAPI.LASPoint_GetClassification(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetClassification(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point Classification."); + throw e; + } + } + } + + /// + /// the scan angle for the point. + /// + public SByte ScanAngleRank + { + get + { + return CAPI.LASPoint_GetScanAngleRank(hPoint); + } + set + { + + LASError error = CAPI.LASPoint_SetScanAngleRank(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point ScanAngleRank."); + throw e; + } + } + } + + /// + /// arbitrary user data for the point. + /// + public byte UserData + { + get + { + return CAPI.LASPoint_GetUserData(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetUserData(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point UserData."); + throw e; + } + } + } + + /// + /// time for the point. + /// + public double Time + { + get + { + return CAPI.LASPoint_GetTime(hPoint); + } + set + { + LASError error = CAPI.LASPoint_SetTime(hPoint, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Point Time."); + throw e; + } + } + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASReader.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASReader.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASReader.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASReader.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,140 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + /// + /// LASReader class + /// + public class LASReader : IDisposable + { + private LASReaderH hReader; + private LASPoint laspoint; + + /// + /// Creates a LASReaderH object that can be used to read LASHeaderH and LASPointH objects with. + /// + /// The LASReaderH must not be created with a filename that is opened for read or write by any other API functions. + /// filename to open for read + public LASReader(String filename) + { + hReader = CAPI.LASReader_Create(filename); + } + + /// + /// Reads the next available point on the LASReaderH instance. + /// + /// true if we have next point + public bool GetNextPoint() + { + IntPtr pointer = CAPI.LASReader_GetNextPoint(hReader); + + if (IntPtr.Zero != pointer) + { + laspoint = new LASPoint(pointer); + return true; + } + else + { + return false; + } + } + + /// + /// + /// + /// + public string GetVersion() + { + return CAPI.LAS_GetVersion(); + } + + /// + /// get the current LASPoint. + /// + /// current LASPoint object + public LASPoint GetPoint() + { + return laspoint; + } + + /// + /// Reads a LASPointH from the given position in the LAS file represented by the LASReader instance. + /// + /// If no point is available at that location, NULL is returned. + /// the integer position of the point in the file to read. + /// LASPoint object + public LASPoint GetPointAt(UInt32 position) + { + return new LASPoint(CAPI.LASReader_GetPointAt(hReader, position)); + } + + /// + /// Get the header for the file associated with this Reader Class. + /// + /// LASHeader representing the header for the file. + public LASHeader GetHeader() + { + return new LASHeader(CAPI.LASReader_GetHeader(hReader)); + } + + /// + /// The object user should call this method when they finished with the object. In .NET is magaged by the GC. + /// + public void Dispose() + { + CAPI.LASReader_Destroy(hReader); + // Clean up unmanaged resources here. + // Dispose other contained disposable objects. + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASVariableLengthRecord.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASVariableLengthRecord.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASVariableLengthRecord.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASVariableLengthRecord.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,240 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + /// + /// LASVariableLengthRecord class + /// + public class LASVariableLengthRecord : IDisposable + { + private LASVLRH hvlrh; + + /// + /// The object user should call this method when they finished with the object. + /// + public void Dispose() + { + CAPI.LASVLR_Destroy(hvlrh); + // Clean up unmanaged resources here. + // Dispose other contained disposable objects. + } + + /// + /// Default constructor. + /// + public LASVariableLengthRecord() + { + hvlrh = CAPI.LASVLR_Create(); + } + + /// + /// Creates a new variable length record uing the LASVLRH opaque pointer + /// + /// LASVLRH opaque pointer + public LASVariableLengthRecord(LASVLRH hVlrh) + { + hvlrh = hVlrh; + } + + //public override string ToString() + //{ + // return CAPI.LASGuid_AsString(hguid); + //} + + /// + /// Get the LASVLRH opaque pointer. + /// + /// LASVLRH opaque pointer + public LASVLRH GetPointer() + { + return hvlrh; + } + + /// + /// the User Id for the variable length record. + /// + /// It will be clipped to fit within 16 characters + public string UserId + { + get + { + return CAPI.LASVLR_GetUserId(hvlrh); + } + + set + { + LASError error = CAPI.LASVLR_SetUserId(hvlrh, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set VLR UserId."); + throw e; + } + } + } + + /// + /// the description for the variable length record. + /// + /// It will be clipped to fit within 32 characters + public string Description + { + get + { + return CAPI.LASVLR_GetDescription(hvlrh); + } + + set + { + LASError error = CAPI.LASVLR_SetDescription(hvlrh, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set VLR Description."); + throw e; + } + } + } + + /// + /// the record length of the data stored in the variable length record. + /// + public UInt16 RecordLength + { + get + { + return CAPI.LASVLR_GetRecordLength(hvlrh); + } + + set + { + LASError error = CAPI.LASVLR_SetRecordLength(hvlrh, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set VLR RecordLength."); + throw e; + } + } + } + + /// + /// the record id for the variable length record. + /// + public UInt16 RecordId + { + get + { + return CAPI.LASVLR_GetRecordId(hvlrh); + } + + set + { + LASError error = CAPI.LASVLR_SetRecordId(hvlrh, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set VLR RecordId."); + throw e; + } + } + } + + /// + /// the reserved value of the variable length record. + /// + /// This should be 0 and should always be 0. + public UInt16 Reserved + { + get + { + return CAPI.LASVLR_GetReserved(hvlrh); + } + + set + { + LASError error = CAPI.LASVLR_SetReserved(hvlrh, value); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set VLR Reserved."); + throw e; + } + } + } + + /// + /// Gets the data stream for the variable length record as an array of bytes + /// + /// a empty array of bytes where place the array + public void GetData(out byte[] data) + { + LASError error = CAPI.LASVLR_GetData(hvlrh, out data); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in VLR GetData."); + throw e; + } + } + + /// + /// Sets the data stream for the variable length record as an array of bytes + /// + /// array of bytes + public void SetData(ref byte[] data) + { + UInt16 lenght = (UInt16)data.Length; + LASError error = CAPI.LASVLR_SetData(hvlrh, ref data, lenght); + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in VLR SetData."); + throw e; + } + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASWriter.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LASWriter.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LASWriter.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LASWriter.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,117 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + /// + /// LASReadWriteMode enum + /// + public enum LASReadWriteMode + { + /// + /// Mode of Read + /// + LASModeRead = 0, + /// + /// Mode of Write + /// + LASModeWrite = 1, + /// + /// Mode of ppend + /// + LASModeAppend = 2 + } + + /// + /// LASWriter class + /// + public class LASWriter : IDisposable + { + private LASWriterH hwriter; + + /// + /// The object user should call this method when they finished with the object. + /// + public void Dispose() + { + CAPI.LASWriter_Destroy(hwriter); + // Clean up unmanaged resources here. + // Dispose other contained disposable objects. + } + + /// + /// Default constructor of the class + /// + /// string with the path of the LAS file + /// LASHeader to add the LAS file + /// mode to use the file by LASReadWriteMode enumeration + public LASWriter(String filename, LASHeader hHeader, LASReadWriteMode mode) + { + hwriter = CAPI.LASWriter_Create(filename, hHeader.GetPointer(), (int)mode); + } + + /// + /// Write a new point in the LAS file + /// + /// LASPoint to write in the file + public void WritePoint(LASPoint point) + { + LASError error = CAPI.LASWriter_WritePoint(hwriter, point.GetPointer()); + + if ((Int32)error != 0) + { + LASException e = new LASException("Exception in Set Writer WritePoint."); + throw e; + } + } + } +} Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/liblas.snk and work/libLAS-1.2.1/csharp/dotnetLibLAS/liblas.snk differ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LibLASCAPI.cs work/libLAS-1.2.1/csharp/dotnetLibLAS/LibLASCAPI.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS/LibLASCAPI.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS/LibLASCAPI.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1033 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using System.Runtime.InteropServices; +using LASError = System.Int32; +using LASWriterH = System.IntPtr; +using LASReaderH = System.IntPtr; +using LASPointH = System.IntPtr; +using LASGuidH = System.IntPtr; +using LASVLRH = System.IntPtr; +using LASHeaderH = System.IntPtr; + +namespace LibLAS +{ + internal class CAPI + { + /** Returns the version string for this library. + * @return the version string for this library. + * + * Name liblas1.dll is considered as unified across all builders on Windows platform. + * When building libLAS on Windows using NMAKE and makefile.vc, C API DLL is + * called liblas1.dll. The same name is used by Visual Studio solution liblas.sln. + */ + public const string DLL_LAS_VERSION = "liblas1.dll"; + + [DllImport(DLL_LAS_VERSION)] + public static extern String LAS_GetVersion(); + + /****************************************************************************/ + /* Error handling */ + /****************************************************************************/ + + /** Resets the error stack for the libLAS C API. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASError_Reset(); + + /** Pops the top error off of the error stack for the libLAS C API. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASError_Pop(); + + /** Returns the error number of the last error on the error stack. + * @return the error number of the last error on the error stack. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASError_GetLastErrorNum(); + + /** Returns the name of the method the last error message happened in. + * @return the name of the method the last error message happened in. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASError_GetLastErrorMsg(); + + /** Returns the name of the method the last error message happened in. + * @return the name of the method the last error message happened in. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASError_GetLastErrorMethod(); + + /** Returns the number of error messages on the error stack. + * @return the number of error messages on the error stack. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern int LASError_GetErrorCount(); + + /** Prints the last error message in the error stack to stderr. If + * there is no error on the error stack, only the message is printed. + * The function does not alter the error stack in any way. + * @param message Message to include in the stderr output + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASError_Print(String message); + + /****************************************************************************/ + /* Reader operations */ + /****************************************************************************/ + + /** Creates a LASReaderH object that can be used to read LASHeaderH and + * LASPointH objects with. The LASReaderH must not be created with a + * filename that is opened for read or write by any other API functions. + * @return opaque pointer to a LASReaderH instance. + * @param filename Filename to open for read + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASReaderH LASReader_Create(String filename); + + /** Reads the next available point on the LASReaderH instance. If no point + * is available to read, NULL is returned. If an error happens during + * the reading of the next available point, an error will be added to the + * error stack and can be returned with the LASError_GetLastError* methods. + * @param hReader the opaque handle to the LASReaderH + * @return an opaque handle to a LASPointH object, or NULL if no point is + * available to read or an error occured. Use the + * LASError_GetLastError* methods to confirm the existence of an error + * if NULL is returned. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASPointH LASReader_GetNextPoint(LASReaderH hReader); + + /** Reads a LASPointH from the given position in the LAS file represented + * by the LASReaderH instance. If no point is available at that location, + * NULL is returned. If an error happens during the reading of the point, + * an error will be added to the error stack and can be returned with the + * LASError_GetLastError* methods. + * @param hReader the opaque handle to the LASReaderH + * @param position the integer position of the point in the file to read. + * @return an opaque handle to a LASPointH object, or NULL if no point is + * available at the given location or an error occured. Use the + * LASError_GetLastError* methods to confirm the existence of an error + * if NULL is returned. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASPointH LASReader_GetPointAt(LASReaderH hReader, UInt32 position); + + /** Closes the file for reading operations represented by the LASReaderH instance. + * @param hReader the opqaue handle to the LASReaderH + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASReader_Destroy(LASReaderH hReader); + + /** Returns a LASHeaderH representing the header for the file + * @param hReader the LASReaderH instance + * @return a LASHeaderH representing the header for the file. NULL is returned + * in the event of an error. Use the LASError_GetLastError* methods to check + * in the event of a NULL return. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASHeaderH LASReader_GetHeader(LASReaderH hReader); + + /****************************************************************************/ + /* Point operations */ + /****************************************************************************/ + + + /** Returns the X value for the point. This value is not scaled or offset + * by any header values and stands on its own. If you need points to have + * a scale and/or offset applied, this must be done in conjunction with the + * header values after the value is read. + * @param hPoint the opaque pointer to the LASPointH instance + * @return the X value for the LASPointH + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASPoint_GetX(LASPointH hPoint); + + /** Sets the X value for the point. This value must be scaled or offset + * by any header values before being set. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the double value to set for the X value of the point + * @return an error number if an error occured during the setting of the point. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetX(LASPointH hPoint, double value); + + /** Returns the Y value for the point. This value is not scaled or offset + * by any header values and stands on its own. If you need points to have + * a scale and/or offset applied, this must be done in conjunction with the + * header values after the value is read. + * @param hPoint the opaque pointer to the LASPointH instance + * @return the Y value for the LASPointH + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASPoint_GetY(LASPointH hPoint); + + /** Sets the Y value for the point. This value must be scaled or offset + * by any header values before being set. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the double value to set for the Y value of the point + * @return an error number if an error occured during the setting of the point. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetY(LASPointH hPoint, double value); + + /** Returns the Z value for the point. This value is not scaled or offset + * by any header values and stands on its own. If you need points to have + * a scale and/or offset applied, this must be done in conjunction with the + * header values after the value is read. + * @param hPoint the opaque pointer to the LASPointH instance + * @return the Z value for the LASPointH + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASPoint_GetZ(LASPointH hPoint); + + /** Sets the Z value for the point. This value must be scaled or offset + * by any header values before being set. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the double value to set for the Z value of the point + * @return an error number if an error occured during the setting of the point. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetZ(LASPointH hPoint, double value); + + /** Returns the intensity value for the point. This value is the pulse return + * magnitude, it is optional, and it is LiDAR system specific. + * @return the intensity value for the point. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASPoint_GetIntensity(LASPointH hPoint); + + /** Sets the intensity value for the point. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the value to set the intensity to + * @return an error number if an error occured. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetIntensity(LASPointH hPoint, UInt16 value); + + /** Returns the return number for the point. The return number is "the pulse + * return number for a given output pulse." The first return number starts with + * the value 1. + * @param hPoint LASPointH instance + * @return a return number, valid from 1-6, for the point. Use the LASError + * methods to determine if an error occurred during this operation if 0 + * is returned. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASPoint_GetReturnNumber(LASPointH hPoint); + + /** Sets the return number for the point. Valid values are from 1-6. + * @param hPoint LASPointH instance + * @param value the value to set for the return number + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetReturnNumber(LASPointH hPoint, UInt16 value); + + /** Returns the total number of returns for a given pulse. + * @param hPoint LASPointH instance + * @return total number of returns for this pulse. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASPoint_GetNumberOfReturns(LASPointH hPoint); + + /** Sets the number of returns for the point. Valid values are from 1-5. + * @param hPoint LASPointH instance + * @param value the value to set for the number of returns + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetNumberOfReturns(LASPointH hPoint, UInt16 value); + + /** Returns the scan direction for a given pulse. + * @param hPoint LASPointH instance + * @return the scan direction for a given pulse. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASPoint_GetScanDirection(LASPointH hPoint); + + /** Sets the scan direction for a given pulse. Valid values are 0 or 1, with + * 1 being a positive scan direction and 0 being a negative scan direction. + * @param hPoint LASPointH instance + * @param value the value to set for scan direction + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetScanDirection(LASPointH hPoint, UInt16 value); + + /** Returns whether or not a given pulse is an edge point + * @param hPoint LASPointH instance + * @return whether or not a given pulse is an edge point. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASPoint_GetFlightLineEdge(LASPointH hPoint); + + /** Sets the edge marker for a given pulse. Valid values are 0 or 1, with + * 1 being an edge point and 0 being interior. + * @param hPoint LASPointH instance + * @param value the value to set for flightline edge + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetFlightLineEdge(LASPointH hPoint, UInt16 value); + + /** Returns all of the scan flags for the point -- Return number, number of + * returns, flightline edge, scan direction, and scan angle rank. + * @param hPoint LASPointH instance + * @return all of the scan flags for the point + */ + [DllImport(DLL_LAS_VERSION)] + public static extern byte LASPoint_GetScanFlags(LASPointH hPoint); + + /** Sets all of the scan flags for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the flags + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetScanFlags(LASPointH hPoint, byte value); + + /** Returns the classification for the point + * @param hPoint LASPointH instance + * @return the classification for the point + */ + [DllImport(DLL_LAS_VERSION)] + public static extern byte LASPoint_GetClassification(LASPointH hPoint); + + /** Sets the classification for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the classification + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetClassification(LASPointH hPoint, byte value); + + /** Returns the time for the point + * @param hPoint LASPointH instance + * @return the time for the point + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASPoint_GetTime(LASPointH hPoint); + + /** Sets the time for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the time + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetTime(LASPointH hPoint, double value); + + /** Returns the scan angle for the point + * @param hPoint LASPointH instance + * @return the scan angle for the point + */ + [DllImport(DLL_LAS_VERSION)] + public static extern SByte LASPoint_GetScanAngleRank(LASPointH hPoint); + + /** Sets the scan angle for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the scan angle + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetScanAngleRank(LASPointH hPoint, SByte value); + + /** Returns the arbitrary user data for the point + * @param hPoint LASPointH instance + * @return the arbitrary user data for the point + */ + [DllImport(DLL_LAS_VERSION)] + public static extern byte LASPoint_GetUserData(LASPointH hPoint); + + /** Sets the arbitrary user data for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the arbitrary user data + * @return LASError value determine success or failure. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASPoint_SetUserData(LASPointH hPoint, byte value); + + /** Returns a bitfield representing the validity of various members + * enum DataMemberFlag + { + eReturnNumber = 1, + eNumberOfReturns = 2, + eScanDirection = 4, + eFlightLineEdge = 8, + eClassification = 16, + eScanAngleRank = 32, + eTime = 64 + }; + * @param hPoint LASPointH instance + * @return bitfield representing the validity of various members. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern int LASPoint_Validate(LASPointH hPoint); + + /** Returns a boolean whether or not the point is valid + * @param hPoint LASPointH instance + * @return a boolean (1 or 0) whether or not the point is valid. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern int LASPoint_IsValid(LASPointH hPoint); + + /** Creates a new empty LASPointH instance + * @return LASPointH instance. If the value is NULL use the + * LASError_GetLastError* methods to determine the problem + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASPointH LASPoint_Create(); + + /** Creates a copy of a LASPointH instance + * @param hPoint the LASPointH instance to copy + * @return new LASPointH instance. If the value is NULL use the + * LASError_GetLastError* methods to determine the problem + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASPointH LASPoint_Copy(LASPointH hPoint); + + /** Destroys/deletes a LASPointH instance + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASPoint_Destroy(LASPointH hPoint); + + /****************************************************************************/ + /* Header operations */ + /****************************************************************************/ + + /** Copies a LASHeaderH instance + * @param hHeader the LASHeaderH to copy + * @return a LASHeaderH instance or NULL on error + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASHeaderH LASHeader_Copy(LASHeaderH hHeader); + + /** Creates an empty LASHeaderH with default values + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASHeaderH LASHeader_Create(); + + /** Destroys/deletes a LASHeader instance + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASHeader_Destroy(LASHeaderH hHeader); + + /** Returns the file signature the the file. This should always be 'LASF' + * @param hHeader LASHeaderH instance + * @return the file signature the the file. This should always be 'LASF' + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASHeader_GetFileSignature(LASHeaderH hHeader); + + /** Returns the file source id for the file. It is a number from 1-65535 + * @param hHeader LASHeaderH instance + * @return the file source id for the file. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASHeader_GetFileSourceId(LASHeaderH hHeader); + + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetFileSourceId(LASHeaderH hHeader, UInt16 value); + + /** Returns the project id for the header as a GUID string + * @return the project id for the header as a GUID string + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASHeader_GetProjectId(LASHeaderH hHeader); + + /** Sets the project id/GUID for the header + * @param hHeader LASHeaderH instance + * @param hId LASGuidH instance to set the GUID for the header to + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId); + + /** Returns the major version number for the header. This value is expected + * to always be 1. + * @param hHeader LASHeaderH instance + * @return major version number for the header. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern byte LASHeader_GetVersionMajor(LASHeaderH hHeader); + + /** Sets the major version number for the header. All values other than 1 + * are invalid. + * @param hHeader LASHeaderH instance + * @param value integer value to set the major version to (only the value 1 is valid) + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetVersionMajor(LASHeaderH hHeader, byte value); + + /** Returns the min version number for the header. This value is expected + * to be 1 or 0 representing LAS 1.1 or LAS 1.0 + * @param hHeader LASHeaderH instance + * @return minor version number for the header. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern byte LASHeader_GetVersionMinor(LASHeaderH hHeader); + + /** Sets the minor version number for the header. All values other than 1 or 0 + * are invalid. + * @param hHeader LASHeaderH instance + * @param value integer value to set the minor version to (only the values 1 or 0 are valid) + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetVersionMinor(LASHeaderH hHeader, byte value); + + /** Returns the System ID for the header. The caller assumes ownership of the returned string + * @return the system id for the header as a character array + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASHeader_GetSystemId(LASHeaderH hHeader); + + /** Sets the System ID for the header. By default, this value is "libLAS" if it + * is not explicitly set. See the LAS specification for details on what this + * value should logically be set to. + * @param hHeader LASHeaderH instance + * @param value the value to set as the System ID for the header + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetSystemId(LASHeaderH hHeader, String value); + + /** Returns the Software ID for the header. The caller assumes ownership of the returned string + * @return the software id for the header as a character array + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASHeader_GetSoftwareId(LASHeaderH hHeader); + + /** Sets the Software ID for the header. By default, this value is "libLAS 1.0" if it + * is not explicitly set. See the LAS specification for details on what this + * value should logically be set to. + * @param hHeader LASHeaderH instance + * @param value the value to set as the Software ID for the header + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetSoftwareId(LASHeaderH hHeader, String value); + + /** Returns the reserved value for the header. This should aways be 0. + * @return the reserved value for the header. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern Int16 LASHeader_GetReserved(LASHeaderH hHeader); + + /** Returns the file creation day of the year. The values start from 1, being January 1st, + * and end at 365 or 366 being December 31st, depending on leap year. + * @return the day of the year as an integer starting from 1 for the file creation. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASHeader_GetCreationDOY(LASHeaderH hHeader); + + /** Sets the file creation day of the year. The values start from 1, being January 1st. No + * date validation is done + * @param hHeader LASHeaderH instance + * @param value the value to set as the creation day + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetCreationDOY(LASHeaderH hHeader, UInt16 value); + + /** Returns the file creation year. This is a four digit number representing the + * year for the file, ie 2003, 2008, etc. + * @return the creation year for the file or 0 if none is set + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASHeader_GetCreationYear(LASHeaderH hHeader); + + /** Sets the file creation year. This should be a four digit number representing + * the year for the file, ie 2003, 2008, etc. No validation on the value is done + * @param hHeader LASHeaderH instance + * @param value the value to set for the creation year + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetCreationYear(LASHeaderH hHeader, UInt16 value); + + /** Returns the size of the header for the file in bytes. + * @return the size of the header for the file in bytes. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASHeader_GetHeaderSize(LASHeaderH hHeader); + + /** Returns the byte offset to the start of actual point data for the file + * @param hHeader LASHeaderH instance + * @return the type offset to the start of actual point data for the file + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt32 LASHeader_GetDataOffset(LASHeaderH hHeader); + + /** Returns the number of variable length records in the header + * @param hHeader LASHeaderH instance + * @return the number of variable length records in the header + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt32 LASHeader_GetRecordsCount(LASHeaderH hHeader); + + /** Returns the record length for the points based on their data format id in bytes + * @param hHeader LASHeaderH instance + * @return the record length for the points based on their data format id in bytes + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASHeader_GetDataRecordLength(LASHeaderH hHeader); + + /** Returns the data format id. If this value is 1, the point data have time values + * associated with them. If it is 0, the point data do not have time values. + * @param hHeader LASHeaderH instance + * @return the data format id for the file. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern byte LASHeader_GetDataFormatId(LASHeaderH hHeader); + + /** Sets the data format id for the file. The value should be 1 or 0, with 1 being + * points that contain time values and 0 being points that do not. + * @param hHeader LASHeaderH instance + * @param value the value for the data format id, 1 or 0 are valid values. + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetDataFormatId(LASHeaderH hHeader, byte value); + + /** Returns the number of point records in the file. This value may not reflect the actual + * number of point records in the file. + * @param hHeader LASHeaderH instance + * @return the number of point records in the file + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt32 LASHeader_GetPointRecordsCount(LASHeaderH hHeader); + + /** Sets the number of point records for the file. + * @param hHeader LASHeaderH instance + * @param value the long integer to set for the number of point records in the file + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetPointRecordsCount(LASHeaderH hHeader, UInt32 value); + + /** Returns the number of point records by return. + * @param hHeader LASHeaderH instance + * @param index the return number to fetch the count for + * @return the number of point records for a given return + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt32 LASHeader_GetPointRecordsByReturnCount(LASHeaderH hHeader, int index); + + /** Sets the number of point records for a given return + * @param hHeader LASHeaderH instance + * @param index the return number to set the count for + * @param value the number of point records for the return + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetPointRecordsByReturnCount(LASHeaderH hHeader, int index, UInt32 value); + + /** Return the X scale factor + * @param hHeader LASHeaderH instance + * @return the X scale factor + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetScaleX(LASHeaderH hHeader); + + /** Return the Y scale factor + * @param hHeader LASHeaderH instance + * @return the Y scale factor + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetScaleY(LASHeaderH hHeader); + + /** Return the Z scale factor + * @param hHeader LASHeaderH instance + * @return the Z scale factor + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetScaleZ(LASHeaderH hHeader); + + /** Sets the scale factors + * @param hHeader LASHeaderH instance + * @param x the x scale factor + * @param y the y scale factor + * @param z the z scale factor + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetScale(LASHeaderH hHeader, double x, double y, double z); + + /** Return the X offset + * @param hHeader LASHeaderH instance + * @return the X offset + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetOffsetX(LASHeaderH hHeader); + + /** Return the Y offset + * @param hHeader LASHeaderH instance + * @return the Y offset + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetOffsetY(LASHeaderH hHeader); + + /** Return the Z offset + * @param hHeader LASHeaderH instance + * @return the Z offset + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetOffsetZ(LASHeaderH hHeader); + + /** Sets the offset values + * @param hHeader LASHeaderH instance + * @param x the x offset + * @param y the y offset + * @param z the z offset + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetOffset(LASHeaderH hHeader, double x, double y, double z); + + /** Return the minimum x value + * @param hHeader LASHeaderH instance + * @return the minimum x value + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetMinX(LASHeaderH hHeader); + + /** Return the minimum y value + * @param hHeader LASHeaderH instance + * @return the minimum y value + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetMinY(LASHeaderH hHeader); + + /** Return the minimum z value + * @param hHeader LASHeaderH instance + * @return the minimum z value + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetMinZ(LASHeaderH hHeader); + + /** Sets the minimum values + * @param hHeader LASHeaderH instance + * @param x the x minimum + * @param y the y minimum + * @param z the z minimum + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetMin(LASHeaderH hHeader, double x, double y, double z); + + /** Return the maximum x value + * @param hHeader LASHeaderH instance + * @return the maximum x value + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetMaxX(LASHeaderH hHeader); + + /** Return the maximum y value + * @param hHeader LASHeaderH instance + * @return the maximum y value + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetMaxY(LASHeaderH hHeader); + + /** Return the maximum z value + * @param hHeader LASHeaderH instance + * @return the maximum z value + */ + [DllImport(DLL_LAS_VERSION)] + public static extern double LASHeader_GetMaxZ(LASHeaderH hHeader); + + /** Sets the maximum values + * @param hHeader LASHeaderH instance + * @param x the x maximum + * @param y the y maximum + * @param z the z maximum + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetMax(LASHeaderH hHeader, double x, double y, double z); + + /** Returns the proj.4 string describing the spatial reference of the + * header if it is available + * @param hHeader LASHeaderH instance + * @return the proj.4 string or NULL if none is available. The caller + * owns the string. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASHeader_GetProj4(LASHeaderH hHeader); + + /** Sets the proj4 stirng describing the spatial reference of the header. + * @param hHeader LASHeaderH instance + * @param value the proj4 string to set for the header + * @return LASError enum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_SetProj4(LASHeaderH hHeader, String value); + + /** Returns the VLR record for the given index. Use LASHeader_GetRecordsCount to + * determine the number of VLR records available on the header. + * @param hHeader the LASHeaderH instance + * @param i the index starting from 0 of the VLR to fetch + * @return LASVLRH instance that models the Variable Length Record + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASVLRH LASHeader_GetVLR(LASHeaderH hHeader, UInt32 i); + + /** Deletes a VLR record from the header for the given index. + * @param hHeader the LASHeaderH instance + * @param index the index starting from 0 of the VLR to delete + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_DeleteVLR(LASHeaderH hHeader, UInt32 index); + + /** Adds a VLR record to the header. + * @param hHeader the LASHeaderH instance + * @param hVLR the VLR to add to the header + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASHeader_AddVLR(LASHeaderH hHeader, LASVLRH hVLR); + + /****************************************************************************/ + /* Writer Operations */ + /****************************************************************************/ + + /** Creates a new LASWriterH for write operations on LAS files. The file may + * be opened in either LAS_MODE_APPEND or LAS_MODE_WRITE, but the file cannot + * be open by another other operations (another LASReaderH or LASWriterH). + * @param filename The filename to open to write + * @param hHeader an opaque pointer to a LASHeaderH that will be written to + * the file as part of the opening for write operation. + * @param mode a mode value to denote whether to open for write or append + * operations. Valid values are LAS_MODE_APPEND and LAS_MODE_WRITE. + */ + + [DllImport(DLL_LAS_VERSION)] + public static extern LASWriterH LASWriter_Create(String filename, LASHeaderH hHeader, int mode); + + /** Writes a point to the file. The location of where the point is writen is + * determined by the mode the file is opened in, and what the last operation was. + * For example, if the file was opened for append, the next point would be written + * at the end of the file. Likewise, if the file is opened in write mode, even + * if the file already existed, the next WritePoint operation will happen at the + * end of the header and all of the existing points in the file will be overwritten. + * @param hWriter opaque pointer to the LASWriterH instance + * @param hPoint the opaque LASPointH pointer to write + * @return LE_None if no error occurred during the write operation. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASWriter_WritePoint(LASWriterH hWriter, LASPointH hPoint); + + /** Overwrites the header for the file represented by the LASWriterH. It does + * not matter if the file is opened for append or for write. + * @param hWriter opaque pointer to the LASWriterH instance + * @param hHeader LASHeaderH instance to write into the file + * @return LE_None if no error occurred during the operation. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASWriter_WriteHeader(LASWriterH hWriter, LASHeaderH hHeader); + + /** Destroys the LASWriterH instance, effectively closing the file and performing + * housekeeping operations. + * @param hWriter LASWriterH instance to close + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASWriter_Destroy(LASWriterH hWriter); + + /****************************************************************************/ + /* GUID Operations */ + /****************************************************************************/ + + /** Returns the GUID value for the header as an opaque LASGuidH pointer. + * @param hHeader the opaque pointer to the LASHeaderH + * @return the GUID value for the header as an opaque LASGuidH pointer. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASGuidH LASHeader_GetGUID(LASHeaderH hHeader); + + /** Returns a new random GUID. + * @return a new random GUID + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASGuidH LASGuid_Create(); + + /** Creates a new GUID opaque pointer using the given string. + * @param string A GUID string in the form "00000000-0000-0000-0000-000000000000" + * An example GUID might be something like '8388F1B8-AA1B-4108-BCA3-6BC68E7B062E' + * @return the GUID value as an opaque LASGuidH pointer. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASGuidH LASGuid_CreateFromString(String string_); + + /** Destroys a GUID opaque pointer and removes it from the heap + * @param hId the GUID value to destroy as an opaque LASGuidH pointer. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASGuid_Destroy(LASGuidH hId); + + /** Determines if two GUIDs are equal. + * @param hId1 the first GUID + * @param hId2 the second GUID + * @return 0 if false, 1 if true. Use the LASError_GetLastError* methods to + * determine if an error occured during the operation of this function. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern int LASGuid_Equals(LASGuidH hId1, LASGuidH hId2); + + /** Returns a string representation of the GUID opqaue pointer. The caller + * owns the string. + * @param hId the LASGuidH pointer + * @return a string representation of the GUID opaque pointer. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASGuid_AsString(LASGuidH hId); + + /****************************************************************************/ + /* VLR Operations */ + /****************************************************************************/ + + /** Creates a new VLR record + * @return a new VLR record + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASVLRH LASVLR_Create(); + + /** Destroys a VLR record and removes it from the heap + */ + [DllImport(DLL_LAS_VERSION)] + public static extern void LASVLR_Destroy(LASVLRH hVLR); + + /** Returns the User Id for the VLR + * @param hVLR the LASVLRH instance + * @return the User Id for the VLR + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASVLR_GetUserId(LASVLRH hVLR); + + /** Sets the User Id for the VLR + * @param hVLR the LASVLRH instance + * @param value the value to set for the User Id. It will be clipped to fit + * within 16 characters + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_SetUserId(LASVLRH hVLR, String value); + + /** Gets the description for the VLR + * @param hVLR the LASVLRH instance + * @return the description for the VLR + */ + [DllImport(DLL_LAS_VERSION)] + public static extern String LASVLR_GetDescription(LASVLRH hVLR); + + /** Sets the description for the VLR + * @param hVLR the LASVLRH instance + * @param value the value to set for the description. It will be clipped to fit + * within 32 characters + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_SetDescription(LASVLRH hVLR, String value); + + /** Returns the record length of the data stored in the VLR + * @param hVLR the LASVLRH instance + * @return the record length of the data stored in the VLR + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASVLR_GetRecordLength(LASVLRH hVLR); + + /** Sets the record length of the data stored in the VLR + * @param hVLR the LASVLRH instance + * @param value the length to set for the VLR data length + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_SetRecordLength(LASVLRH hVLR, UInt16 value); + + /** Gets the record id for the VLR + * @param hVLR the LASVLRH instance + * @return the record id for the VLR + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASVLR_GetRecordId(LASVLRH hVLR); + + /** Sets the record id for the VLR + * @param hVLR the LASVLRH instance + * @param value the record id to set + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_SetRecordId(LASVLRH hVLR, UInt16 value); + + /** Gets the reserved value of the VLR. This should be 0 and should aways be 0. + * @param hVLR the LASVLRH instance + * @return the reserved value of the VLR. + */ + [DllImport(DLL_LAS_VERSION)] + public static extern UInt16 LASVLR_GetReserved(LASVLRH hVLR); + + /** Sets the reserved value of the VLR. This should be 0 and you should not + * have to ever monkey with this value according to the spec. + * @param hVLR the LASVLRH instance + * @param value the value to set for the reserved value + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_SetReserved(LASVLRH hVLR, UInt16 value); + + /** Gets the data stream for the VLR as an array of bytes + * @param hVLR the LASVLRH instance + * @param data a pointer to where place the array + * @param length a pointer to where to place the length of the array + * @return LASErrorEnum + */ + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_GetData(LASVLRH hVLR, out byte[] data);//, ref int length); + + [DllImport(DLL_LAS_VERSION)] + public static extern LASError LASVLR_SetData(LASVLRH hVLR, ref byte[] data, int length); + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS_xpress.sln work/libLAS-1.2.1/csharp/dotnetLibLAS_xpress.sln --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS_xpress.sln 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS_xpress.sln 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,53 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C# Express 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetLibLAS_Express", "dotnetLibLAS\dotnetLibLAS_Express.csproj", "{5652982E-9576-47F1-896A-1B700E6648FA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitTest_Express", "NUnitTest\NUnitTest_Express.csproj", "{E019C630-508C-4F2C-9743-F66423C216F2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldLAS_Express", "HelloWorldLAS\HelloWorldLAS_Express.csproj", "{85856BBA-7888-4196-9602-740986C7FA98}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Read_Express", "Samples\Read_Express\Read_Express.csproj", "{545BB2BA-CE19-474B-AB86-5BC2373658CB}" + ProjectSection(ProjectDependencies) = postProject + {5652982E-9576-47F1-896A-1B700E6648FA} = {5652982E-9576-47F1-896A-1B700E6648FA} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Read", "Samples\Read\Read.csproj", "{D2CFF726-B11D-4C01-B8CD-5FFC250302A2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Write_Express", "Samples\WriteLAS\Write_Express.csproj", "{51ACDC75-D5FA-445C-9E04-E7BF07AAFAD5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5652982E-9576-47F1-896A-1B700E6648FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5652982E-9576-47F1-896A-1B700E6648FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5652982E-9576-47F1-896A-1B700E6648FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5652982E-9576-47F1-896A-1B700E6648FA}.Release|Any CPU.Build.0 = Release|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Release|Any CPU.Build.0 = Release|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Release|Any CPU.Build.0 = Release|Any CPU + {545BB2BA-CE19-474B-AB86-5BC2373658CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {545BB2BA-CE19-474B-AB86-5BC2373658CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {545BB2BA-CE19-474B-AB86-5BC2373658CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {545BB2BA-CE19-474B-AB86-5BC2373658CB}.Release|Any CPU.Build.0 = Release|Any CPU + {D2CFF726-B11D-4C01-B8CD-5FFC250302A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2CFF726-B11D-4C01-B8CD-5FFC250302A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2CFF726-B11D-4C01-B8CD-5FFC250302A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2CFF726-B11D-4C01-B8CD-5FFC250302A2}.Release|Any CPU.Build.0 = Release|Any CPU + {51ACDC75-D5FA-445C-9E04-E7BF07AAFAD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51ACDC75-D5FA-445C-9E04-E7BF07AAFAD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51ACDC75-D5FA-445C-9E04-E7BF07AAFAD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51ACDC75-D5FA-445C-9E04-E7BF07AAFAD5}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS.sln work/libLAS-1.2.1/csharp/dotnetLibLAS.sln --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/dotnetLibLAS.sln 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/dotnetLibLAS.sln 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetLibLAS", "dotnetLibLAS\dotnetLibLAS.csproj", "{5652982E-9576-47F1-896A-1B700E6648FA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitTest", "NUnitTest\NUnitTest.csproj", "{E019C630-508C-4F2C-9743-F66423C216F2}" + ProjectSection(ProjectDependencies) = postProject + {5652982E-9576-47F1-896A-1B700E6648FA} = {5652982E-9576-47F1-896A-1B700E6648FA} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldLAS", "HelloWorldLAS\HelloWorldLAS.csproj", "{85856BBA-7888-4196-9602-740986C7FA98}" + ProjectSection(ProjectDependencies) = postProject + {5652982E-9576-47F1-896A-1B700E6648FA} = {5652982E-9576-47F1-896A-1B700E6648FA} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5652982E-9576-47F1-896A-1B700E6648FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5652982E-9576-47F1-896A-1B700E6648FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5652982E-9576-47F1-896A-1B700E6648FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5652982E-9576-47F1-896A-1B700E6648FA}.Release|Any CPU.Build.0 = Release|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E019C630-508C-4F2C-9743-F66423C216F2}.Release|Any CPU.Build.0 = Release|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85856BBA-7888-4196-9602-740986C7FA98}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS_Express.csproj work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS_Express.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS_Express.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS_Express.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,56 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {85856BBA-7888-4196-9602-740986C7FA98} + Exe + Properties + HelloWordLAS + HelloWordLAS + + + + + 2.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\dotnetLibLAS\bin\Release\dotnetLibLAS.dll + + + + + + + + + + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS.csproj work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/HelloWorldLAS/HelloWorldLAS.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,59 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {85856BBA-7888-4196-9602-740986C7FA98} + Exe + Properties + HelloWordLAS + HelloWordLAS + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + False + ..\dotnetLibLAS\bin\Debug\dotnetLibLAS.dll + + + + + False + ..\dotnetLibLAS\bin\Release\dotnetLibLAS.dll + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/Program.cs work/libLAS-1.2.1/csharp/HelloWorldLAS/Program.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/Program.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/HelloWorldLAS/Program.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,92 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Sample program demonstrating use of libLAS for .NET/Mono + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Text; +using LibLAS; + +class Program +{ + static void Main(string[] args) + { + try + { + LASReader lasreader = new LASReader(@"c:\las\sample_our2.las"); + + LASPoint laspoint; + + LASHeader lasheader = lasreader.GetHeader(); + Console.WriteLine(lasheader.SoftwareId);// + lasheader.VersionMinor = 0; + LASWriter laswriter = new LASWriter(@"c:\las\sample_our.las", lasheader, LASReadWriteMode.LASModeWrite); + + Console.WriteLine("Number of points in file= {0}", lasheader.PointRecordsCount); + + while (lasreader.GetNextPoint()) + { + laspoint = lasreader.GetPoint(); + laspoint.X = laspoint.X + 3; + + //Console.WriteLine(laspoint.X + "," + laspoint.Y + "," + laspoint.Z); + + laswriter.WritePoint(laspoint); + } + } + catch (LASException e) + { + Console.WriteLine("\nLASException! Msg: {0}", e.Message); + } + catch (SystemException e) + { + Console.WriteLine("\nException! Msg: {0}", e.Message); + } + catch + { + Console.WriteLine("Unknown exception caught"); + } + finally + { + Console.WriteLine("Do i need something to do?"); + } + Console.WriteLine("End of file"); + Console.Read(); + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/Properties/AssemblyInfo.cs work/libLAS-1.2.1/csharp/HelloWorldLAS/Properties/AssemblyInfo.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/HelloWorldLAS/Properties/AssemblyInfo.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/HelloWorldLAS/Properties/AssemblyInfo.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("HelloWorldLAS")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Martin Vales")] +[assembly: AssemblyProduct("HelloWorldLAS")] +[assembly: AssemblyCopyright("Copyright © 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c988e4fe-9eb1-4333-bb7e-e978fb08af7a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/makefile.vc work/libLAS-1.2.1/csharp/makefile.vc --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/makefile.vc 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/makefile.vc 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,27 @@ +# $Id$ +# +# A proxy makefile on MSBuild command to build .NET bindings using NMAKE. +# Defines three targets: build, rebuild and clean. +# +# TODO: Define install and package targets +# +!INCLUDE ..\nmake.opt + +BUILDACTION="Build" +BUILDPLATFORM="Any CPU" + +!IF "$(BUILD_DEBUG)" == "YES" +BUILDCONFIG=Debug +!ELSE +BUILDCONFIG=Release +!ENDIF + +default: build + +rebuild: clean build + +build: + msbuild dotnetLibLAS.sln /t:$(BUILDACTION) /p:Configuration=$(BUILDCONFIG) /p:Platform=$(BUILDPLATFORM) + +clean: + msbuild dotnetLibLAS.sln /t:Clean /p:Configuration=$(BUILDCONFIG) /p:Platform=$(BUILDPLATFORM) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASFilesClass.cs work/libLAS-1.2.1/csharp/NUnitTest/LASFilesClass.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASFilesClass.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASFilesClass.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,60 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASFile class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; + +namespace NUnitTest +{ + static public class LASFilesClass + { + static public string folder = @"C:\las\data"; + static public string Folder + { + get + { + return folder; + } + //static public string TO_core_last_zoom = "TO_core_last_zoom"; + } + } +} \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASGuidTest.cs work/libLAS-1.2.1/csharp/NUnitTest/LASGuidTest.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASGuidTest.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASGuidTest.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,83 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASGuid class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; +using LibLAS; + +namespace NUnitTest +{ + [TestFixture] + public class LASGuidTest + { + // LASPoint. + + [SetUp] + protected void SetUp() + { + } + + [Test] + public void ConstructionfromString() + { + LASGuid guid1 = new LASGuid("00000000-0000-0000-0000-000000000000"); + + LASGuid guid2 = new LASGuid("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + + Assert.AreNotSame(guid1, guid2); + Assert.AreEqual(guid1.ToString(), "00000000-0000-0000-0000-000000000000"); + Assert.AreEqual(guid2.ToString().ToUpper(), "3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + Assert.IsNotNull(guid1); + Assert.IsNotNull(guid2); + } + + [Test] + public void Equals() + { + LASGuid guid1 = new LASGuid("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + LASGuid guid2 = new LASGuid("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + + Assert.IsTrue(guid1.Equals(guid2)); + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASHeaderTest.cs work/libLAS-1.2.1/csharp/NUnitTest/LASHeaderTest.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASHeaderTest.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASHeaderTest.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,236 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASHeader class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; +using LibLAS; + +namespace NUnitTest +{ + [TestFixture] + public class LASHeaderTest + { + [SetUp] + protected void SetUp() + { + } + + [Test] + public void CopyConstructor() + { + LASHeader header = new LASHeader(); + // string sig = "LASF and garbage"; + // header.FileSignature = sig; + // Assert.AreEqual(header.FileSignature.Length,4); + // LASHeader h1; + Assert.AreEqual(1, 1); + //h1.SetFileSignature(sig); + //ensure_not(h1.GetFileSignature() == sig); + //ensure_equals(h1.GetFileSignature().size(), 4); + //ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); + + //LASHeader h2(h1); + + //ensure_not(h2.GetFileSignature() == sig); + //ensure_equals(h2.GetFileSignature().size(), 4); + //ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); + } + + [Test] + public void FileSignature() + { + LASHeader header = new LASHeader(); + // string sig = "LASF and garbage"; + + Assert.AreEqual(header.FileSignature.Length, 4); + Assert.AreEqual(header.FileSignature, "LASF"); + + // I can not set FileSignature from c# API because i am a bad guy. + //header.FileSignature = "LASF"; + } + + [Test] + public void FileSourceId() + { + LASHeader h1 = new LASHeader(); + + UInt16 id1 = 1; + UInt16 id2 = 65535; + UInt16 overflowed = 0; + + h1.FileSourceId = id1; + Assert.AreEqual(h1.FileSourceId, id1); + h1.FileSourceId = id2; + Assert.AreEqual(h1.FileSourceId, id2); + + // Unsigned overflow + // Likely compiler warning: truncation from int to liblas::uint16_t + h1.FileSourceId = (ushort)(id2 + 1); + Assert.AreEqual(h1.FileSourceId, overflowed); + } + + [Test] + public void Reserved() + { + LASHeader h = new LASHeader(); + + Assert.AreEqual(h.Reserved, 0); + } + + [Test] + public void ProjectId() + { + LASHeader h = new LASHeader(); + + //string strid="030B4A82-1B7C-11CF-9D53-00AA003C9CB6"; + // Assert.AreEqual(h.Reserved, 0); + // liblas::guid id(strid.c_str()); + // h.ProjectId=; + // std::string strid("030B4A82-1B7C-11CF-9D53-00AA003C9CB6"); + //liblas::guid id(strid.c_str()); + + //liblas::LASHeader h; + //h.SetProjectId(id); + + //ensure_not(h.GetProjectId().is_null()); + //ensure_equals(h.GetProjectId(), id); + } + + [Test] + public void MinorMajorVersion() + { + LASHeader h = new LASHeader(); + h.VersionMinor = 0; + h.VersionMajor = 1; + Assert.AreEqual(h.VersionMinor, 0); + Assert.AreEqual(h.VersionMajor, 1); + + h.VersionMinor = 1; + h.VersionMajor = 1; + Assert.AreEqual(h.VersionMinor, 1); + Assert.AreEqual(h.VersionMajor, 1); + + try + { + h.VersionMajor = 2; + //don´t get the next line... + Assert.AreEqual(2, 5); + } + catch (LASException e) + { + Assert.AreEqual(e.Message, "Exception in Set Header VersionMajor."); + } + + try + { + h.VersionMinor = 2; + //don´t get the next line... + Assert.AreEqual(2, 5); + } + catch (LASException e) + { + Assert.AreEqual(e.Message, "Exception in Set Header VersionMinor."); + } + } + + [Test] + public void SoftwareId() + { + LASHeader h = new LASHeader(); + + string softid1 = "Short Soft Id"; // 13 bytes + int len1 = softid1.Length; + string softid2 = "Long Software Identifier - XX YY"; // 32 bytes + int len2 = softid2.Length; + + h.SoftwareId = softid1; + Assert.AreEqual(h.SoftwareId, softid1); + Assert.AreEqual(h.SoftwareId.Length, len1); + // Assert.AreEqual(h.GetSoftwareId(true).size(), 32); + + h.SoftwareId = softid2; + Assert.AreEqual(h.SoftwareId, softid2); + Assert.AreEqual(h.SoftwareId.Length, len2); + // Assert.AreEqual(h.GetSoftwareId(true).size(), 32); + } + + [Test] + public void PointRecordsByReturnCount() + { + LASHeader h = new LASHeader(); + // Assert.AreEqual(h.GetPointRecordsByReturnCount(5),5); + + h.SetPointRecordsByReturnCount(0, 100); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(0), 100); + + h.SetPointRecordsByReturnCount(1, 101); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(1), 101); + + h.SetPointRecordsByReturnCount(2, 102); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(2), 102); + + h.SetPointRecordsByReturnCount(3, 103); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(3), 103); + + h.SetPointRecordsByReturnCount(4, 104); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(4), 104); + + try + { + // 5 is out of range + h.SetPointRecordsByReturnCount(5, 500); + //don´t get the next line... + Assert.AreEqual(2, 5); + } + catch (LASException e) + { + Assert.AreEqual(e.Message, "Exception in Set Header SetPointRecordsByReturnCount."); + } + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASPointTest.cs work/libLAS-1.2.1/csharp/NUnitTest/LASPointTest.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASPointTest.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASPointTest.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,281 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASPoint class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; +using LibLAS; + +namespace NUnitTest +{ + [TestFixture] + public class LASPointTest + { + LASPoint point = new LASPoint(); + + [SetUp] + protected void SetUp() + { + } + + [Test] + public void SetPointCoordinates() + { + LASPoint pointB = new LASPoint(); + pointB.X = 23.0; + + Assert.AreEqual(pointB.X, 23.0); + + Assert.IsFalse(point.Equals(pointB)); + pointB.X = 0.0; + point.X = 0.0; + Assert.IsTrue(point.Equals(point)); + + pointB.X = 1.123; + pointB.Y = 2.456; + pointB.Z = 3.789; + LASPoint pointC = new LASPoint(); + pointC.X = 1.123; + pointC.Y = 2.456; + pointC.Z = 3.789; + Assert.IsTrue(pointC.Equals(pointB)); + } + + [Test] + public void PointValid() + { + LASPoint pointB = new LASPoint(); + pointB.X = 23.0; + + Assert.IsTrue(point.IsValid()); + Assert.IsTrue(pointB.IsValid()); + } + + [Test] + public void ReturnNumber() + { + Assert.AreEqual(point.ReturnNumber, 0); + + UInt16 num1 = 7; + point.ReturnNumber = num1; + Assert.AreEqual(point.ReturnNumber, num1); + + UInt16 num2 = 3; + point.ReturnNumber = num2; + Assert.AreEqual(point.ReturnNumber, num2); + + try + { + //out of range + point.ReturnNumber = 8; + Assert.IsTrue(point.Validate()); + } + catch (LASException e) + { + Assert.AreEqual((int)e.Data["DataMemberFlag"] & (int)LASPoint.DataMemberFlag.eReturnNumber, + (int)LASPoint.DataMemberFlag.eReturnNumber); + } + } + + [Test] + public void NumberOfReturns() + { + Assert.AreEqual(point.NumberOfReturns, 0); + + UInt16 num1 = 7; + point.NumberOfReturns = num1; + Assert.AreEqual(point.NumberOfReturns, num1); + + UInt16 num2 = 3; + point.NumberOfReturns = num2; + Assert.AreEqual(point.NumberOfReturns, num2); + + try + { + //out of range + point.NumberOfReturns = 8; + Assert.IsTrue(point.Validate()); + } + catch (LASException e) + { + Assert.AreEqual((int)e.Data["DataMemberFlag"] & (int)LASPoint.DataMemberFlag.eNumberOfReturns, + (int)LASPoint.DataMemberFlag.eNumberOfReturns); + } + } + + [Test] + public void ScanDirection() + { + //Assert.AreEqual(point.ScanDirection, 0); + + //UInt16 num1 = 0; + //point.ScanDirection = num1; + //Assert.AreEqual(point.ScanDirection, num1); + //UInt16 num2 = 1; + //point.ScanDirection = num2; + //Assert.AreEqual(point.ScanDirection, num2); + + //try + //{ + // //out of range + // point.ScanDirection = 2; + // Assert.IsTrue(point.Validate()); + //} + //catch (LASException e) + //{ + // Assert.AreEqual((int)e.Data["DataMemberFlag"] & (int)LASPoint.DataMemberFlag.eScanDirection, + // (int)LASPoint.DataMemberFlag.eScanDirection); + //} + } + + [Test] + public void FlightLineEdge() + { + Assert.AreEqual(point.FlightLineEdge, 0); + + UInt16 num1 = 0; + point.FlightLineEdge = num1; + Assert.AreEqual(point.FlightLineEdge, num1); + + UInt16 num2 = 1; + point.FlightLineEdge = num2; + Assert.AreEqual(point.FlightLineEdge, num2); + + try + { + //out of range + point.FlightLineEdge = 2; + + Assert.IsTrue(point.Validate()); + } + catch (LASException e) + { + Assert.AreEqual((int)e.Data["DataMemberFlag"] & (int)LASPoint.DataMemberFlag.eFlightLineEdge, + (int)LASPoint.DataMemberFlag.eFlightLineEdge); + } + } + + [Test] + public void ScanFlags() + { + byte zeros = 0; + LASPoint pointS = new LASPoint(); + Assert.AreEqual(pointS.ScanFlags, zeros); + pointS.ReturnNumber = 3; + pointS.NumberOfReturns = 7; + pointS.ScanDirection = 0; + pointS.FlightLineEdge = 1; + string expected = "10111011"; + byte bits = pointS.ScanFlags; + Assert.AreEqual(Convert.ToString(pointS.ScanFlags, 2), (expected)); + + LASPoint pointN; + pointN = pointS.Copy(); + + Assert.AreEqual(pointN.ScanFlags, pointS.ScanFlags); + } + + [Test] + public void Classification() + { + Assert.AreEqual(point.Classification, 0); + + byte num1 = 0; + point.Classification = num1; + Assert.AreEqual(point.Classification, num1); + + byte num2 = 31; + point.Classification = num2; + Assert.AreEqual(point.Classification, num2); + + //try + //{ + // //out of range + // point.Classification = 2; + + // Assert.IsTrue(point.Validate()); + //} + //catch (LASException e) + //{ + // Assert.AreEqual((int)e.Data["DataMemberFlag"] & (int)LASPoint.DataMemberFlag.eClassification, + // (int)LASPoint.DataMemberFlag.eClassification); + //} + } + + [Test] + public void ScanAngleRank() + { + Assert.AreEqual(point.ScanAngleRank, 0); + + SByte num1 = 90; + point.ScanAngleRank = num1; + Assert.AreEqual(point.ScanAngleRank, num1); + + SByte num2 = -90; + point.ScanAngleRank = num2; + Assert.AreEqual(point.ScanAngleRank, num2); + + try + { + //out of range + point.ScanAngleRank = 91; + + Assert.IsTrue(point.Validate()); + } + catch (LASException e) + { + Assert.AreEqual((int)e.Data["DataMemberFlag"] & (int)LASPoint.DataMemberFlag.eScanAngleRank, + (int)LASPoint.DataMemberFlag.eScanAngleRank); + } + } + + [Test] + public void UserData() + { + Assert.AreEqual(point.UserData, 0); + + byte num1 = 7; + point.UserData = num1; + Assert.AreEqual(point.UserData, num1); + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASReaderTest.cs work/libLAS-1.2.1/csharp/NUnitTest/LASReaderTest.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASReaderTest.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASReaderTest.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,121 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASReader class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; +using LibLAS; + +namespace NUnitTest +{ + [TestFixture] + public class LASReaderTest + { + private string folder = @"C:\las\data"; + + private string TO_core_last_zoom; + + [SetUp] + protected void SetUp() + { + TO_core_last_zoom = folder + "\\TO_core_last_zoom.las"; + } + + [Test] + public void hhhhh() + { + // LASReader lasreader = new LASReader(@"c:\las\sample_our2.las"); + LASReader lasreader = new LASReader(@"C:\las\data\TO_core_last_clip.las"); + + LASPoint laspoint; + + //laspoint = lasreader.GetPointAt(0); + //Console.WriteLine(laspoint.X + "," + laspoint.Y + "," + laspoint.Z + " " + laspoint.Intensity ); + + LASHeader lasheader = lasreader.GetHeader(); + + LASWriter laswriter = new LASWriter(@"c:\las\sample_our.las", lasheader, LASReadWriteMode.LASModeWrite); + + //LASReader lasreader = new LASReader(@"C:\las\data\TO_core_last_clip.las"); + //LASPoint laspoint = new LASPoint(); + + laspoint = lasreader.GetPointAt(0); + //laspoint.X = 23.0; + //Assert.AreEqual(laspoint.X, 23.0); + //byte gg = laspoint.Classification; + //bool d = lasreader.GetNextPoint(); + ////d = lasreader.GetNextPoint(); + //LASPoint point = lasreader.GetPointAt(1); + //Assert.LessOrEqual(Math.Abs(point.X - 630262.30), 0.0001); + //Assert.LessOrEqual(Math.Abs(point.Y - 4834500.0), 0.0001); + //Assert.LessOrEqual(Math.Abs(point.Z - 51.53), 0.0001); + Assert.AreEqual(laspoint.Intensity, 670); + // Assert.AreEqual(laspoint.Classification,(byte) 1); + + //Assert.AreEqual(point.ScanAngleRank, 0); + //Assert.AreEqual(point.UserData, 3); + //Assert.AreEqual(point.ScanFlags, 9); + //Assert.LessOrEqual(Math.Abs(point.Time - 413665.23360000004), 0.0001); + } + + //[Test] + //public void Point2() + //{ + // LASReader lasreader = new LASReader(@"C:\las\data\TO_core_last_clip.las"); + // // LASHeader lasheader = lasreader.GetHeader(); + // if (lasreader.GetNextPoint()) + // { + // LASPoint point = lasreader.GetPointAt(2); + // Assert.LessOrEqual(Math.Abs(point.X - 630282.45), 0.0001); + // Assert.LessOrEqual(Math.Abs(point.Y - 4834500.0), 0.0001); + // Assert.LessOrEqual(Math.Abs(point.Z - 51.63), 0.0001); + // Assert.AreEqual(point.Intensity, 350); + // Assert.AreEqual(point.Classification, 1); + // Assert.AreEqual(point.ScanAngleRank, 0); + // Assert.AreEqual(point.UserData, 3); + // Assert.AreEqual(point.ScanFlags, 9); + // Assert.LessOrEqual(Math.Abs(point.Time - 413665.52880000003), 0.0001); + // } + //} + + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASVariableLengthRecordTest.cs work/libLAS-1.2.1/csharp/NUnitTest/LASVariableLengthRecordTest.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASVariableLengthRecordTest.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASVariableLengthRecordTest.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,75 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASVariableLengthRecord class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; +using LibLAS; + +namespace NUnitTest +{ + [TestFixture] + public class LASVariableLengthRecordTest + { + [SetUp] + protected void SetUp() + { + } + + [Test] + public void TestDefault() + { + LASVariableLengthRecord vlr = new LASVariableLengthRecord(); + + Assert.AreEqual(vlr.RecordId, 0); + Assert.AreEqual(vlr.RecordLength, 0); + Assert.AreEqual(vlr.Reserved, 0); + Assert.AreEqual(vlr.UserId, ""); + Assert.AreEqual(vlr.Description, ""); + } + + [Test] + public void Equals() + { + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASWriterTest.cs work/libLAS-1.2.1/csharp/NUnitTest/LASWriterTest.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/LASWriterTest.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/LASWriterTest.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,235 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Test cases of LASWriter class, .NET/Mono bindings + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; +using LibLAS; + +namespace NUnitTest +{ + [TestFixture] + public class LASWriterTest + { + [SetUp] + protected void SetUp() + { + } + + [Test] + public void CopyConstructor() + { + LASHeader header = new LASHeader(); + //string sig = "LASF and garbage"; + + // header.FileSignature = sig; + // Assert.AreEqual(header.FileSignature.Length,4); + // LASHeader h1; + Assert.AreEqual(1, 1); + //h1.SetFileSignature(sig); + //ensure_not(h1.GetFileSignature() == sig); + //ensure_equals(h1.GetFileSignature().size(), 4); + //ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); + + //LASHeader h2(h1); + //ensure_not(h2.GetFileSignature() == sig); + //ensure_equals(h2.GetFileSignature().size(), 4); + //ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); + } + + [Test] + public void FileSignature() + { + LASHeader header = new LASHeader(); + // string sig = "LASF and garbage"; + + Assert.AreEqual(header.FileSignature.Length, 4); + Assert.AreEqual(header.FileSignature, "LASF"); + + // I can not set FileSignature from c# API because i am a bad guy. + //header.FileSignature = "LASF"; + } + + [Test] + public void FileSourceId() + { + LASHeader h1 = new LASHeader(); + + UInt16 id1 = 1; + UInt16 id2 = 65535; + UInt16 overflowed = 0; + + h1.FileSourceId = id1; + Assert.AreEqual(h1.FileSourceId, id1); + h1.FileSourceId = id2; + Assert.AreEqual(h1.FileSourceId, id2); + + // Unsigned overflow + // Likely compiler warning: truncation from int to liblas::uint16_t + h1.FileSourceId = (ushort)(id2 + 1); + Assert.AreEqual(h1.FileSourceId, overflowed); + } + + [Test] + public void Reserved() + { + LASHeader h = new LASHeader(); + + Assert.AreEqual(h.Reserved, 0); + } + + [Test] + public void ProjectId() + { + LASHeader h = new LASHeader(); + + //string strid="030B4A82-1B7C-11CF-9D53-00AA003C9CB6"; + // Assert.AreEqual(h.Reserved, 0); + // liblas::guid id(strid.c_str()); + // h.ProjectId=; + // std::string strid("030B4A82-1B7C-11CF-9D53-00AA003C9CB6"); + //liblas::guid id(strid.c_str()); + + //liblas::LASHeader h; + //h.SetProjectId(id); + //ensure_not(h.GetProjectId().is_null()); + //ensure_equals(h.GetProjectId(), id); + } + + [Test] + public void MinorMajorVersion() + { + LASHeader h = new LASHeader(); + h.VersionMinor = 0; + h.VersionMajor = 1; + Assert.AreEqual(h.VersionMinor, 0); + Assert.AreEqual(h.VersionMajor, 1); + + h.VersionMinor = 1; + h.VersionMajor = 1; + Assert.AreEqual(h.VersionMinor, 1); + Assert.AreEqual(h.VersionMajor, 1); + + try + { + h.VersionMajor = 2; + //don´t get the next line... + Assert.AreEqual(2, 5); + } + catch (LASException e) + { + Assert.AreEqual(e.Message, "Exception in Set Header VersionMajor."); + } + + try + { + h.VersionMinor = 2; + //don´t get the next line... + Assert.AreEqual(2, 5); + } + catch (LASException e) + { + Assert.AreEqual(e.Message, "Exception in Set Header VersionMinor."); + } + } + + [Test] + public void SoftwareId() + { + LASHeader h = new LASHeader(); + + string softid1 = "Short Soft Id"; // 13 bytes + int len1 = softid1.Length; + string softid2 = "Long Software Identifier - XX YY"; // 32 bytes + int len2 = softid2.Length; + + h.SoftwareId = softid1; + Assert.AreEqual(h.SoftwareId, softid1); + Assert.AreEqual(h.SoftwareId.Length, len1); + // Assert.AreEqual(h.GetSoftwareId(true).size(), 32); + + h.SoftwareId = softid2; + Assert.AreEqual(h.SoftwareId, softid2); + Assert.AreEqual(h.SoftwareId.Length, len2); + // Assert.AreEqual(h.GetSoftwareId(true).size(), 32); + } + + [Test] + public void PointRecordsByReturnCount() + { + LASHeader h = new LASHeader(); + // Assert.AreEqual(h.GetPointRecordsByReturnCount(5),5); + + h.SetPointRecordsByReturnCount(0, 100); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(0), 100); + + h.SetPointRecordsByReturnCount(1, 101); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(1), 101); + + h.SetPointRecordsByReturnCount(2, 102); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(2), 102); + + h.SetPointRecordsByReturnCount(3, 103); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(3), 103); + + h.SetPointRecordsByReturnCount(4, 104); + //ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + Assert.AreEqual(h.GetPointRecordsByReturnCount(4), 104); + + try + { + // 5 is out of range + h.SetPointRecordsByReturnCount(5, 500); + //don´t get the next line... + Assert.AreEqual(2, 5); + } + catch (LASException e) + { + Assert.AreEqual(e.Message, "Exception in Set Header SetPointRecordsByReturnCount."); + } + } + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest_Express.csproj work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest_Express.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest_Express.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest_Express.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,63 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {E019C630-508C-4F2C-9743-F66423C216F2} + Library + Properties + NUnitTest + NUnitTest + + + + + 2.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\dotnetLibLAS\bin\$(Configuration)\dotnetLibLAS.dll + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest.csproj work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/NUnitTest.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,58 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {E019C630-508C-4F2C-9743-F66423C216F2} + Library + Properties + NUnitTest + NUnitTest + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\dotnetLibLAS\bin\$(Configuration)\dotnetLibLAS.dll + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/Properties/AssemblyInfo.cs work/libLAS-1.2.1/csharp/NUnitTest/Properties/AssemblyInfo.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/NUnitTest/Properties/AssemblyInfo.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/NUnitTest/Properties/AssemblyInfo.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("NUnitTest")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Martin Vales")] +[assembly: AssemblyProduct("NUnitTest")] +[assembly: AssemblyCopyright("Copyright © 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c984e4fe-9eb1-4313-bc7e-e978ab08af7a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/README work/libLAS-1.2.1/csharp/README --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/README 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/README 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,176 @@ + + .NET/Mono bindings for libLAS - ASPRS LiDAR data translation toolset +============================================================================== + +This directory consists of all components of .NET/Mono bindings for libLAS. + + +Building with Visual Studio 2003/2005/2008 and .NET Framework +------------------------------------------------------------------------------ + +Requirements: + +* Visual Studio 2003, 2005 or 2008 +* .NET Framework 1.x, 2.0 or 3.0 + +Steps: + +1. Build libLAS C++ and C DLLs + +nmake /f makefile.vc + +or + +Open trunk/build/msvc80/liblas.sln in VS2005 or VS2008. Build the solution. Successfull build is required for only two projects: liblas_lib.vcproj and liblas_c_dll.vcproj. + +2. Load trunk/csharp/dotnetLibLAS.sln in VS2005/2008 and build solution dotnetLibLAS dll. + +or + +Now, in order to build .NET bindings, one can do: + +2.1. cd trunk/csharp +2.2. nmake -f makefile.vc + +To clean: + +2.3. nmake -f makefile.vc clean + +To rebuild: + +2.4. nmake -f makefile.vc rebuild + +This makefile is just a tiny proxy calling MSBuild which in turn +builds the dotnetLibLAS.sln solution. Debug/Release builds is controlled by BUILD_DEBUG variable defined in nmake.opt. + +Notes: +- To build dotnetLibLAS is not mandatory build the native C/C++ library but it is if you want use the .NET bindings. +- dotnetLibLAS search liblas1.dll according the Dynamic-Link Library Search Order of Windows: + http://msdn.microsoft.com/en-us/library/ms682586.aspx +- If you try the HelloWorldLAS sample and you have a P/Invoke exception, perhaps is because the .NET bindings don`t find the native DLL. + +Register the dotnetLibLAS Assembly in the GAC in Windows/.NET and Unix/Mono +------------------------------------------------------------------------------ +1. Use the sn.exe tool to create a new key file in trunk/csharp/dotnetLibLAS: +sn -k liblas.snk + +2. Add your assembly to the GAC + +gacutil /i dotnetLibLAS.dll + +To uninstall this assembly from the GAC, use the command: + +3. gacutil /u dotnetLibLAS + +Notes: +- This operation is not recomended by now. Remember you need have the Native DLL install in your computer. +- If your path environment variables aren't set, you'll have to go to the C:\Program Files\Microsoft.NET\FrameworkSDK\Bin\ directory to run sn.exe + +Run the test +------------------------------------------------------------------------------ +dotnetLibLAS use the NUNIT library to testing: +http://www.nunit.org/index.php + +Steps to run the test: + +1. Download the last NUNIT version: + http://prdownloads.sourceforge.net/nunit/NUnit-2.4.8-net-2.0.msi?download + +2. Install NUNIT in your computer to have the NUNIT assembly and the NUNIT applications to run the test. + +3. Open the NUNIT test project from trunk/csharp/dotnetLibLAS/NUnitTest + +3. Update the nunit.dll reference in the properties of the project. + +or + +if you have problems delete nunit.dll reference and add it. Previous NUNIT intallation installed nunit.dll in the GAC for you. + +4. From Windows Start Menu\Programs menu open the NUnit Gui Runner application. + http://www.nunit.org/index.php?p=nunit-gui&r=2.4.8 + + or + + use the NUnit-Console applications instead: + http://www.nunit.org/index.php?p=nunit-console&r=2.4.8 + +5. Run the test of this assembly: + trunk/csharp/csharp/NUnitTest/bin/release/NUnitTest.dll + + +Building with Mono +------------------------------------------------------------------------------ + +To build liblas for MONO you need have installed these dependencies: + +1. mono mono-gmcs mono-gac mono-utils + mono is the Virtual machine o run the applications. + gmcs is the compiler of the c# programming language. + +2. In debian (or variants like ubuntu): + sudo apt-get install mono mono-gmcs mono-gac mono-utils + +Further you could need these dependencies if need unit testing with NUNIT + +1. nunit libmono-i18n2.0-cil nunit-console + sudo apt-get install libmono-i18n2.0-cil nunit nunit-console + nunit is the assembly to link to your unit test projects. + nunit-console is the tool to run the tests. + + +Notes: +- NUNIT by now have bad support in the linux repositories. Perhaps the best is download it from the official web. + You can use the compiled version of NUNIT for windows: + http://prdownloads.sourceforge.net/nunit/NUnit-2.4.8-net-2.0.zip?download + The basic assemblies are: + nunit.core.dll + nunit.core.interfaces.dll + nunit.framework.dll + nunit.util.dll + nunit-console.exe + nunit-console-runner.dll + +Using Monodevelop +------------------------------------------------------------------------------ +You could install also Monodevelop 1.x if you want have a full IDE for C#. +The problem i see with this IDE now is it have an own build system. You can open Visual studio projects but with bad support. +In Monodevelop 2.x (in alpha status yet) you work with visual studio solutions files like native format of the IDE. +http://monodevelop.com/Release_notes_for_MonoDevelop_2.0_Alpha_1#MSBuild_File_format + +Besides msbuild system in MONO is xbuild. This will let us in the future release the dotnetLibLAS bindings with visual studio solutions. +By now xbuild is not complete. +http://www.mono-project.com/Microsoft.Build + + +Compiling dotnetLibLAS in MONO +------------------------------------------------------------------------------ +By now dotnetLibLAS is not officially supported by MONO but it's possible use it: + +1. You can use the compiled library you have in windows. It's fully compatible. + +2. Compile the library by hand. + gmcs /target:library /out:dotnetLibLAS.dll *.cs /keyfile:liblas.snk + You must run this command in the /trunk/csharp/dotnetLibLAS folder. + +3. Autools. TODO + +Notes: +In the project folder you can see this file dotnetLibLAS.dll.config. +This file maps the linux shared library from the windows native DLL. The names shared libraries in windows and linux are different. +You need have always this file in your linux applications folder. MONO read this XML file before our dotnetLibLAS assembly. + +Run the tests in MONO +------------------------------------------------------------------------------ +By now you need compile and run the tests by hand. + +1. The test are in the folder /trunk/csharp/NUnitTest + +2. You need have the assemblies of nunit and dotnetLibLAS referenced to the library. + +3. Run this command to compile the library: + gmcs /target:library /r:nunit.framework.dll /r:dotnetLibLAS.dll /out:pruebaunit.dll *.cs + +4. Run the tests: + mono nunit-console.exe pruebaunit.dll + +$Id$ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/Read_Express/Read_Express.csproj work/libLAS-1.2.1/csharp/Samples/Read_Express/Read_Express.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/Read_Express/Read_Express.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/Samples/Read_Express/Read_Express.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,53 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {545BB2BA-CE19-474B-AB86-5BC2373658CB} + Exe + Properties + Read_Express + Read_Express + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\dotnetLibLAS\bin\Release\dotnetLibLAS.dll + + + + + + + + + + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/Read_Express/ReadLAS.cs work/libLAS-1.2.1/csharp/Samples/Read_Express/ReadLAS.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/Read_Express/ReadLAS.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/Samples/Read_Express/ReadLAS.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,91 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Sample program demonstrating use of libLAS for .NET/Mono + * Author: Martin Vales, martin_gnu@mundo-r.com + * + ****************************************************************************** + * Copyright (c) 2008, Martin Vales + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +using System; +using System.Text; +using LibLAS; + + +class ReadProgram +{ + static void Main(string[] args) + { + try + { + + string filename = @"..\..\..\..\..\test\data\TO_core_last_zoom.las"; + LASReader lasreader = new LASReader(filename); + LASHeader h = lasreader.GetHeader(); + Console.WriteLine("Version : " + lasreader.GetVersion()); + Console.WriteLine("Signature: : " + h.FileSignature); + Console.WriteLine("Format : " + h.DataFormatId); + Console.WriteLine("Project : " + h.ProjectId); + Console.WriteLine("Points count: " + h.PointRecordsCount); + Console.WriteLine("VLRecords count: " + h.VariableLengthRecordsCount); + int counter = 0; + while (lasreader.GetNextPoint()) + { + LASPoint laspoint = lasreader.GetPoint(); + counter += 1; + } + + if (lasreader.GetHeader().PointRecordsCount != counter) + throw new LASException("read incorrect number of point records"); + + + } + catch (LASException e) + { + Console.WriteLine("\nLASException! Msg: {0}", e.Message); + } + catch (SystemException e) + { + Console.WriteLine("\nException! Msg: {0}", e.Message); + } + catch + { + Console.WriteLine("Unknown exception caught"); + } + + Console.WriteLine("End of file"); + Console.Read(); + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/WriteLAS/Properties/AssemblyInfo.cs work/libLAS-1.2.1/csharp/Samples/WriteLAS/Properties/AssemblyInfo.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/WriteLAS/Properties/AssemblyInfo.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/Samples/WriteLAS/Properties/AssemblyInfo.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("WriteLAS")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("WriteLAS")] +[assembly: AssemblyCopyright("Copyright © 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4b75d764-15be-4739-9dcc-80e564199de6")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/WriteLAS/Write_Express.csproj work/libLAS-1.2.1/csharp/Samples/WriteLAS/Write_Express.csproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/WriteLAS/Write_Express.csproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/Samples/WriteLAS/Write_Express.csproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,53 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {51ACDC75-D5FA-445C-9E04-E7BF07AAFAD5} + Exe + Properties + WriteLAS + WriteLAS + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\dotnetLibLAS\bin\Release\dotnetLibLAS.dll + + + + + + + + + + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/WriteLAS/WriteLAS.cs work/libLAS-1.2.1/csharp/Samples/WriteLAS/WriteLAS.cs --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/csharp/Samples/WriteLAS/WriteLAS.cs 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/csharp/Samples/WriteLAS/WriteLAS.cs 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Text; +using LibLAS; +using System.IO; + + +namespace WriteLAS +{ + public class WriteLAS + { + static void Main(string[] args) + { + try + { + + string filename = @".\test.las"; + LASHeader hdr = new LASHeader(); + hdr.VersionMajor = 1; + hdr.VersionMinor = 1; + hdr.DataFormatId = (byte)LASHeader.PointFormat.ePointFormat1; + hdr.PointRecordsCount = 1000; // should be corrected automatically by writer + LASWriter laswriter = new LASWriter(filename, hdr, LASReadWriteMode.LASModeWrite); + LASPoint p=new LASPoint(); + p.X = 10; + p.Y = 20; + p.Z = 30; + laswriter.WritePoint(p); + //File.Delete(filename); + + } + catch (LASException e) + { + Console.WriteLine("\nLASException! Msg: {0}", e.Message); + } + catch (SystemException e) + { + Console.WriteLine("\nException! Msg: {0}", e.Message); + } + catch + { + Console.WriteLine("Unknown exception caught"); + } + + Console.WriteLine("End of file"); + Console.Read(); + } + + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/doxygen_dev.conf work/libLAS-1.2.1/doc/api/doxygen_dev.conf --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/doxygen_dev.conf 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/api/doxygen_dev.conf 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1259 @@ +# Doxyfile 1.5.4 +# +# $Id$ + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "libLAS Developer's Reference" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = (svn-trunk) + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = . + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = YES + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../../include ../../include/liblas ../../include/liblas/capi ../../src ../../apps + +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py + +FILE_PATTERNS = *.hpp *.cpp *.h *.c + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = */.svn/* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 3 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html_dev + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = YES + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = YES + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = "c:\Program Files\Graphviz2.16\bin" + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen will always +# show the root nodes and its direct children regardless of this setting. + +DOT_GRAPH_MAX_NODES = 50 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/doxygen.conf work/libLAS-1.2.1/doc/api/doxygen.conf --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/doxygen.conf 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/api/doxygen.conf 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1259 @@ +# Doxyfile 1.5.4 +# +# $Id$ + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "libLAS API Reference" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = (svn-trunk) + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = . + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = NO + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../../include/liblas ../../include/liblas/capi + +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py + +FILE_PATTERNS = *.hpp *.cpp *.h *.c + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = */.svn/* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 3 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = TracHeader.html + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = TracHeader.html + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = YES + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = YES + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = "c:\Program Files\Graphviz2.16\bin" + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen will always +# show the root nodes and its direct children regardless of this setting. + +DOT_GRAPH_MAX_NODES = 50 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/TracFooter.html work/libLAS-1.2.1/doc/api/TracFooter.html --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/TracFooter.html 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/api/TracFooter.html 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,2 @@ + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/TracHeader.html work/libLAS-1.2.1/doc/api/TracHeader.html --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/api/TracHeader.html 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/api/TracHeader.html 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,5 @@ + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/las2las.txt work/libLAS-1.2.1/doc/las2las.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/las2las.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/las2las.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,160 @@ +**************************************************************** + las2las: converts from binary LAS to binary LAS +**************************************************************** + +:Author: Martin Isenburg +:Contact: isenburg@cs.unc.edu +:Author: Howard Butler +:Contact: hobu.inc@gmail.com +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +Description +----------- + +`las2las` reads and writes LiDAR data in the ASPRS LAS 1.0 and 1.1 formats while +modifying its contents. While `lasinfo` can do a few simple operations like +updating header information, more drastic changes, like removing points or +altering values, will require `las2las`. `las2las` is expected to be used for +modifying single files at a time, and all `las2las` operations require multiple +read passes through the points. Some examples of operations `las2las` can be +used for include: + +* clipping of points to those that lie within a certain region specified + by a bounding box (--clip) +* eliminating points that are the second return (--eliminate_return 2), +* eliminating points that have a scan angle + above some threshold (--eliminate_scan_angle_above 5) +* eliminating points that have an intensity below some + threshold (--eliminate_intensity_below 15) +* extracting only first (--first-only) or last (--last-only) returns +* changing the format from LAS 1.0 to 1.1 or vice versa +* eliminating points of a given classification (--eliminate class 2) + +`las2las` is a port of Martin Isenburg's `las2las` utility from `LASTools`_ +to the libLAS library. For the most part, it is unchanged from Martin's +utility except for a few differences: + +* Text output describing the operation(s) is only provided when the --verbose + switch is provided. + +* Provides some point validation + +* Variable Length Records (VLRs) are carried forward by default. + +* Supports format (1.1->1.0 & 1.0->1.1) conversion. + +* GNU-style arguments and switches (although most of the switches used by + Martin's utilities should continue to work). + +Usage +----- + +Clipping with a rectangle +~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --clip 63025000 483450000 63050000 483475000 + +clips points of in.las with x<63025000 or y<483450000 or x>63050000 +or y>483475000 and stores surviving points to out.las. Note that +clip expects the scaled integer values that the points are stored +with (not the floating point coordinates they represent). + +Eliminating specified returns +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --eliminate_return 1 + +eliminates all points of in.las that are designated first returns by the +value in their return_number field and stores surviving points to out.las. + +Limiting based on scan angle +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --eliminate_scan_angle_above 15 + +eliminates all points of in.las whose scan angle is above 15 or below -15 +and stores surviving points to out.las. + +Limiting based on intensity +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --eliminate_intensity_below 1000 + +eliminates all points of in.las whose intensity is below 1000 and stores +surviving points to out.las. + +Extract last returns +~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --last_only + +extracts all last return points from in.las and stores them to out.las. + +Throw out invalid data +~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --skip_invalid + +removes invalid (according to the ASPRS LAS file format specification) points. +This switch should only be required in a few special circumstances. + +Eliminate ground points +~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --eliminate_class 2 + +removes points with that have a classification of 2. Points with a +classification of 2 are conventionally called ground points, but that convention +may not be followed for older LAS 1.0 files. + +Convert to 1.1 +~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ las2las --input in.las --output out.las --format 1.1 + +converts the in.las file to a 1.1-formatted file. For the most part, this +conversion is "in name only." For example, + + + + +Usage +----- + +:: + + C:\lastools\bin>las2las -h + usage: + las2las -remove_extra_header in.las out.las + las2las -i in.las -clip 63000000 483450000 63050000 483500000 -o out.las + las2las -i in.las -eliminate_return 2 -o out.las + las2las -i in.las -eliminate_scan_angle_above 15 -o out.las + las2las -i in.las -eliminate_intensity_below 1000 -olas > out.las + las2las -i in.las -first_only -clip 63000000 483450000 63050000 483500000 -o out.las + las2las -i in.las -last_only -eliminate_intensity_below 2000 -olas > out.las + las2las -h + +.. _`LAStools`: http://www.cs.unc.edu/~isenburg/lastools/ \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/las2ogr.txt work/libLAS-1.2.1/doc/las2ogr.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/las2ogr.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/las2ogr.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,51 @@ +**************************************************************** + las2ogr: converts from binary LAS to one of OGR formats +**************************************************************** + +:Author: Mateusz Loskot +:Contact: mateusz@loskot.net +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +lasdiff compares two LAS files and reports whether they are identical +or whether they are different. + +las2ogr converts LAS file to data source using OGR drivers +available from GDAL/OGR package. This utility is useful to translate +cloud of points collected by LiDAR sensors to vectors for easier +data exchange and processing. + +In order to build las2ogr utility, one has to link libLAS against GDAL library. +For Unix, use ./configure script option --with-gdal. +For Windows, edit nmake.opt file and set GDAL_HOME variable. +Windows users can instal GDAL binaries using friendly installer from OSGeo4W package. + +Usage +----- + +:: + + $ las2ogr -h + Usage: las2ogr OPTIONS + Options are: + -h print this message + -i input ASPRS LAS file + -o output file + -f OGR format for output file + -formats list supported OGR formats + +Example +------- + +Shows how to convert LAS file to ESRI Shapefile with POINT geometry type: + +:: + + $ las2ogr -i mydata.las -o points.shp -f "ESRI Shapefile" + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/las2txt.txt work/libLAS-1.2.1/doc/las2txt.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/las2txt.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/las2txt.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,111 @@ +**************************************************************** + las2txt: converts from binary LAS to a standard ASCII format +**************************************************************** + +:Author: Martin Isenburg +:Contact: isenburg@cs.unc.edu +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +Simple conversion to text file +------------------------------ + +:: + + $ las2txt -i lidar.las -o lidar.txt -parse xyz + +converts LAS file to ASCII and places the x, y, and z coordinate +of each point at the 1st, 2nd, and 3rd entry of each line. the +entries are seperated by a space. + +Specifying a separator +---------------------- + +:: + + $ las2txt -i lidar.las -o lidar.txt -parse txyzr -sep komma + +converts LAS file to ASCII and places the gps_time as the first +entry, the x, y, and z coordinates at the 2nd, 3rd, and 4th entry +and the number of the return as the 5th entry of each line. the +entries are separated by a komma. + +Altering the header separtor +---------------------------- + +:: + + $ las2txt -i lidar.las -o lidar.txt -parse xyzia -sep semicolon -header pound + +converts LAS file to ASCII and places the x, y, and z coordinate +at the 1st, 2nd, and 3rd entry, the intensity at the 4th and the +scan angle as the 5th entry of each line. the entries are separated +by a semicolon. at the beginning of the file we print the header +information as a comment starting with a '#' symbol. + +Altering the coordinate order +----------------------------- + +:: + + $ las2txt -i lidar.las -o lidar.txt -parse xyzcu -sep tab -header percent + +converts LAS file to ASCII and places the x, y, and z coordinate +at the 1st, 2nd, and 3rd entry, the classification at the 4th and +the user data as the 5th entry of each line. the entries are +separated by a semicolon. at the beginning of the file we print +the header information as a comment starting with a '%' symbol. + +Usage +----- + +:: + + C:\lastools\bin>las2txt -h + usage: + las2txt lidar.las + las2txt -parse xyziar lidar.las lidar.txt + las2txt -i lidar.las -o lidar.laz -parse xyz + las2txt -parse xyzt -verbose lidar.las + las2txt -parse xyz lidar.las.gz + las2txt -h + +The '-parse txyz' flag specifies how to format each each line of the ASCII +file. For example, 'txyzia' means that the first number of each line should +be the gpstime, the next three numbers should be the x, y, and z coordinate, +the next number should be the intensity and the next number should be the +scan angle. + +Supported entries +~~~~~~~~~~~~~~~~~ + + * a - scan angle + * i - intensity, + * n - number of returns for given pulse + * r - number of this return + * c - classification + * u - user data + * p - point source ID + * e - edge of flight line flag + * d - direction of scan flag + +Separators +~~~~~~~~~~ + +The '-sep space' flag specifies what separator to use. The default is a +space but 'tab', 'komma', 'colon', 'hyphen', 'dot', or 'semicolon' +are other possibilities. + +Header Separators +~~~~~~~~~~~~~~~~~ +The '-header pound' flag results in the header information being printed at +the beginning of the ASCII file in form of a comment that starts with the +special character '#'. Also possible are 'percent', 'dollar', 'semicolon', +'komma', 'star', 'colon', or 'semicolon' as that special character. + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/lasdiff.txt work/libLAS-1.2.1/doc/lasdiff.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/lasdiff.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/lasdiff.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,29 @@ +**************************************************************** + lasdiff: comparison of LAS files +**************************************************************** + +:Author: Martin Isenburg +:Contact: isenburg@cs.unc.edu +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +lasdiff compares two LAS files and reports whether they are identical +or whether they are different. + +Usage +----- + +:: + + C:\lastools\bin>lasdiff -h + usage: + lasdiff lidar1.las lidar2.las + lasdiff lidar1.las lidar1.laz + lasdiff -i lidar1.las -i lidar1.laz + lasdiff -h diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/lasinfo.txt work/libLAS-1.2.1/doc/lasinfo.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/lasinfo.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/lasinfo.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,148 @@ +**************************************************************** + lasinfo: a utility for inspecting LAS files +**************************************************************** + +:Author: Martin Isenburg +:Contact: isenburg@cs.unc.edu +:Author: Howard Butler +:Contact: hobu.inc@gmail.com +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +Description +----------- + +`lasinfo` prints the header contents by default, and with a switch, can +be used to print a short summary of the points. When in summary mode (using +the --check switch), differences between header info and point content are +reported as warnings. `lasinfo` prints its information to stderr, and you +can use pipes to redirect the output of `lasinfo` as necessary. `lasinfo` +supports reading from stdin, but it does not attempt to read from stdin if the +--stdin switch is not used. `lasinfo` can also be used to modify a few header +entries in-place as described in the examples. + +`lasinfo` is a port of Martin Isenburg's `lasinfo` utility from `LASTools`_ +to the libLAS library. For the most part, it is unchanged from Martin's +utility except for a few differences: + +* It does *not* scan the points by default and instead you must use the --check + switch to have them scanned. + +* It *does* print the Variable Length Records (VLRs) by default. + +* Slightly different (and tidier) output format. + +* GNU-style arguments and switches (although most of the switches used by + Martin's utilities should continue to work). + + +Usage +----- + +Simple header inspection +~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo lidar.las + $ lasinfo --input lidar.las + + +Read from STDIN +~~~~~~~~~~~~~~~ + +:: + + $ lasinfo --stdin < lidar.las + + +Variable Header Records +~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo --input lidar.las -skip_vlr + +will skip the printing of Variable Record Headers (VLRs) for the file. + +Check the points for header inconsistencies +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo --input lidar.las --check + +scans over all the points and reports any differences with the header. +Descriptive information like minimums and maximums of various variables +(time, x, y, z, etc) and some basic histograms are also reported. + +Repair missing or inconsistent header information +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo --input lidar.las --repair + +will add missing or repair inconsistent header entries with respect to the points. +Items that are repaired with --repair include the bounding box header entries +and the point records by return count. Future versions of the software may +include other header repair types if they can be done in such a way as to not +require rewriting of the file. + +Update bounding box of LAS file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo --input lidar.las --repair_boundingbox + +reads all points, computes their bounding box, and updates it in the header. + +Set file creation date +~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo -i lidar.las --file_creation 8 2007 + +sets the file creation day/year in the header to 8/2007. With accordance to the +ASPRS LAS specification, this literally means the 8th day of 2007. + +Set system identifier +~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo -i lidar.las --system_identifier "hello world!" + +copies the first 31 characters of the string into the system_identifier +field of the header. + +Set generating software header field +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ lasinfo -i lidar.las -generating_software "this is a test (-:" + +copies the first 31 characters of the string into the generating_software +field of the header. + +Example data +------------ + +try these sources for sample lidar data in LAS format: + +http://www.geoict.net/LidarData/Data/OptechSampleLAS.zip + +http://www.qcoherent.com/data/LP360_Sample_Data.rar + +http://www.appliedimagery.com/Serpent%20Mound%20Model%20LAS%20Data.las + +.. _`LAStools`: http://www.cs.unc.edu/~isenburg/lastools/ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/lasmerge.txt work/libLAS-1.2.1/doc/lasmerge.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/lasmerge.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/lasmerge.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,77 @@ +**************************************************************** + lasmerge: merge multiple LAS files into a single file +**************************************************************** + +:Author: Martin Isenburg +:Contact: isenburg@cs.unc.edu +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +lasmerge reads multiple LIDAR data files in the LAS format and merges them +into a single file. The filenames can either be provided one by one or in +form of a text file. + +All the header information of the first file provided is used including +variable and user_defined headers. but some records are updated by +integrating the corresponding information from other headers. these are: + +* number_of_point_records +* number_of_points_by_return[5] +* max_x, min_x, max_y, min_y, max_z, and min_z + +In addition x_scale_factor, y_scale_factor, z_scale_factor may need to be +increased to accommodate a possibly larger bounding box. The user can +also set those in the command line with + + -scale 0.01 or -scale_xyz 0.01 0.01 0.001 + +Similarly a new offset can be specified + + -xyz_offset 63025000 483450000 0 + +Usage +----- + +:: + + $ lasmerge -i in1.las -i in2.las -i in3.las -o out.las + +merge the three inX.las files into one out.las file. + +:: + + $ lasmerge -i las_file_list.txt -o out.las + +merges all LAS files listed in the text file into one out.las file + +:: + + $ lasmerge -i las_file_list.txt -o out.las -scale 0.01 -verbose + +merges the file and stores the LIDAR points with 0.01 accuracy in x, y, and +z and prints out control information. + +:: + + $ lasmerge -i las_file_list.txt -o out.las -scale_xyz 0.01 0.01 0.001 + +same but with a different accuracy for z. + +Help +~~~~ + +:: + + C:\lastools\bin>lasmerge -h + usage: + lasmerge -i lasfiles.txt -o out.las + lasmerge -i file1.las -i file2.las -i file3.las -o out.las + lasmerge -i file1.las -i file2.las -olas > out.las + lasmerge -i lasfiles.txt -scale 0.01 -verbose -o out.las + lasmerge -h diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/Makefile.am work/libLAS-1.2.1/doc/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1 @@ +SUBDIRS= man diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/man/Makefile.am work/libLAS-1.2.1/doc/man/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/man/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/man/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,11 @@ +man3_MANS=lasinfo.man las2las.man lasmerge.man +dist_man3_MANS = lasinfo.man las2las.man lasmerge.man + +lasinfo.man: ../lasinfo.txt + python ../rst2man.py ../lasinfo.txt lasinfo.man + +las2las.man: ../las2las.txt + python ../rst2man.py ../las2las.txt las2las.man + +lasmerge.man: ../lasmerge.txt + python ../rst2man.py ../lasmerge.txt lasmerge.man diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/rst2man.py work/libLAS-1.2.1/doc/rst2man.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/rst2man.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/rst2man.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,26 @@ +#!/usr/bin/env python + +# Author: +# Contact: grubert@users.sf.net +# Copyright: This module has been placed in the public domain. + +""" +man.py +====== + +This module provides a simple command line interface that uses the +man page writer to output from ReStructuredText source. +""" + +import locale +try: + locale.setlocale(locale.LC_ALL, '') +except: + pass + +from docutils.core import publish_cmdline, default_description +from writers import manpage + +description = ("Generates plain man. " + default_description) + +publish_cmdline(writer=manpage.Writer(), description=description) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/txt2las.txt work/libLAS-1.2.1/doc/txt2las.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/txt2las.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/txt2las.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,84 @@ +**************************************************************** + las2txt: converts from standard ASCII to LAS +**************************************************************** + +:Author: Martin Isenburg +:Contact: isenburg@cs.unc.edu +:Revision: $Revision$ +:Date: $Date$ + +.. sectnum:: + +.. contents:: + :depth: 3 + :backlinks: top + +txt2las converts LIDAR data from a standard ASCII format into the more +efficient binary LAS representation. + +Usage +----- + +:: + + $ txt2las -i lidar.taxyz -o lidar.las -parse ssxyz + +converts ASCII file and uses the 3rd, 4th, and 5th entry of each +line as the x, y, and z coordinate of each point. + +:: + + $ txt2las -i lidar.txt.gz -o lidar.las -parse txyzsa + +converts a gzipped ASCII file and uses the 1st entry of each line +as the gps time, the 3rd, 4th, and 5th entry as the x, y, and z +coordinate of each point, and the 6th entry as the scan angle + +Help +~~~~ + +:: + + C:\lastools\bin>txt2las -h + usage: + txt2las -parse tsxyz lidar.txt + txt2las -parse txyzar lidar.txt.gz lidar.laz + txt2las -parse xyz -scale 0.02 -i lidar.txt -o lidar.laz + txt2las -parse xyzsst -verbose -scale 0.05 lidar.txt + txt2las -parse xsysz -xyz_scale 0.02 0.02 0.01 lidar.txt + txt2las -h + +Parsing Flags +------------- + +The '-parse tsxyz' flag specifies how to interpret each line of the ASCII +file. For example, 'tsxyzssa' means that the first number is the gpstime, +the next number should be skipped, the next three numbers are the x, y, +and z coordinate, the next two should be skipped, and the next number +is the scan angle. + +The other supported entries are: + * i - intensity + * n - number of returns of given pulse + * r - number of return + * c - classification + * u - user data + * p - point source ID + * e - edge of flight line flag + * d - direction of scan flag. + +Scale +----- + +The '-scale 0.02' flag specifies the quantization. The default value of +0.01 means that the smallest increment two between coordinates is 0.01. +If measurements are in meters this corresponds to centimeter accuracy, +which is commonly considered sufficient for LIDAR data. + +Other parameters +---------------- + +Other parameters such as '-xyz_offset 500000 2000000 0' +or '-xyz_scale 0.02 0.02 0.01' or '-file_creation 67 2003' +or '-system_identifier "Airborne One Leica 50,000 Hz"' +or '-generating_software "TerraScan"' are available too. diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/writers/manpage.py work/libLAS-1.2.1/doc/writers/manpage.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/doc/writers/manpage.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/doc/writers/manpage.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1072 @@ +# $Id: manpage.py 5554 2008-05-15 07:12:34Z grubert $ +# Author: Engelbert Gruber +# Copyright: This module is put into the public domain. + +""" +Simple man page writer for reStructuredText. + +Man pages (short for "manual pages") contain system documentation on unix-like +systems. The pages are grouped in numbered sections: + + 1 executable programs and shell commands + 2 system calls + 3 library functions + 4 special files + 5 file formats + 6 games + 7 miscellaneous + 8 system administration + +Man pages are written *troff*, a text file formatting system. + +See http://www.tldp.org/HOWTO/Man-Page for a start. + +Man pages have no subsection only parts. +Standard parts + + NAME , + SYNOPSIS , + DESCRIPTION , + OPTIONS , + FILES , + SEE ALSO , + BUGS , + +and + + AUTHOR . + +A unix-like system keeps an index of the DESCRIPTIONs, which is accesable +by the command whatis or apropos. + +""" + +# NOTE: the macros only work when at line start, so try the rule +# start new lines in visit_ functions. + +__docformat__ = 'reStructuredText' + +import sys +import os +import time +import re +from types import ListType + +import docutils +from docutils import nodes, utils, writers, languages + +FIELD_LIST_INDENT = 7 +DEFINITION_LIST_INDENT = 7 +OPTION_LIST_INDENT = 7 +BLOCKQOUTE_INDENT = 3.5 + +# Define two macros so man/roff can calculate the +# indent/unindent margins by itself +MACRO_DEF = (r""" +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level magin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +""") + +class Writer(writers.Writer): + + supported = ('manpage') + """Formats this writer supports.""" + + output = None + """Final translated form of `document`.""" + + def __init__(self): + writers.Writer.__init__(self) + self.translator_class = Translator + + def translate(self): + visitor = self.translator_class(self.document) + self.document.walkabout(visitor) + self.output = visitor.astext() + + +class Table: + def __init__(self): + self._rows = [] + self._options = ['center', ] + self._tab_char = '\t' + self._coldefs = [] + def new_row(self): + self._rows.append([]) + def append_cell(self, cell_lines): + """cell_lines is an array of lines""" + self._rows[-1].append(cell_lines) + if len(self._coldefs) < len(self._rows[-1]): + self._coldefs.append('l') + def astext(self): + text = '.TS\n' + text += ' '.join(self._options) + ';\n' + text += '|%s|.\n' % ('|'.join(self._coldefs)) + for row in self._rows: + # row = array of cells. cell = array of lines. + # line above + text += '_\n' + max_lns_in_cell = 0 + for cell in row: + max_lns_in_cell = max(len(cell), max_lns_in_cell) + for ln_cnt in range(max_lns_in_cell): + line = [] + for cell in row: + if len(cell) > ln_cnt: + line.append(cell[ln_cnt]) + else: + line.append(" ") + text += self._tab_char.join(line) + '\n' + text += '_\n' + text += '.TE\n' + return text + +class Translator(nodes.NodeVisitor): + """""" + + words_and_spaces = re.compile(r'\S+| +|\n') + document_start = """Man page generated from reStructeredText.""" + + def __init__(self, document): + nodes.NodeVisitor.__init__(self, document) + self.settings = settings = document.settings + lcode = settings.language_code + self.language = languages.get_language(lcode) + self.head = [] + self.body = [] + self.foot = [] + self.section_level = 0 + self.context = [] + self.topic_class = '' + self.colspecs = [] + self.compact_p = 1 + self.compact_simple = None + # the list style "*" bullet or "#" numbered + self._list_char = [] + # writing the header .TH and .SH NAME is postboned after + # docinfo. + self._docinfo = { + "title" : "", "subtitle" : "", + "manual_section" : "", "manual_group" : "", + "author" : "", + "date" : "", + "copyright" : "", + "version" : "", + } + self._in_docinfo = None + self._active_table = None + self._in_entry = None + self.header_written = 0 + self.authors = [] + self.section_level = 0 + self._indent = [0] + # central definition of simple processing rules + # what to output on : visit, depart + self.defs = { + 'indent' : ('.INDENT %.1f\n', '.UNINDENT\n'), + 'definition' : ('', ''), + 'definition_list' : ('', '.TP 0\n'), + 'definition_list_item' : ('\n.TP', ''), + #field_list + #field + 'field_name' : ('\n.TP\n.B ', '\n'), + 'field_body' : ('', '.RE\n', ), + 'literal' : ('\\fB', '\\fP'), + 'literal_block' : ('\n.nf\n', '\n.fi\n'), + + #option_list + 'option_list_item' : ('\n.TP', ''), + #option_group, option + 'description' : ('\n', ''), + + 'reference' : (r'\fI\%', r'\fP'), + #'target' : (r'\fI\%', r'\fP'), + 'emphasis': ('\\fI', '\\fP'), + 'strong' : ('\\fB', '\\fP'), + 'term' : ('\n.B ', '\n'), + 'title_reference' : ('\\fI', '\\fP'), + } + # TODO dont specify the newline before a dot-command, but ensure + # check it is there. + + def comment_begin(self, text): + """Return commented version of the passed text WITHOUT end of line/comment.""" + prefix = '\n.\\" ' + return prefix+prefix.join(text.split('\n')) + + def comment(self, text): + """Return commented version of the passed text.""" + return self.comment_begin(text)+'\n' + + def astext(self): + """Return the final formatted document as a string.""" + if not self.header_written: + # ensure we get a ".TH" as viewers require it. + self.head.append(self.header()) + return ''.join(self.head + self.body + self.foot) + + def visit_Text(self, node): + text = node.astext().replace('-','\-') + text = text.replace("'","\\'") + self.body.append(text) + + def depart_Text(self, node): + pass + + def list_start(self, node): + class enum_char: + enum_style = { + 'arabic' : (3,1), + 'loweralpha' : (3,'a'), + 'upperalpha' : (3,'A'), + 'lowerroman' : (5,'i'), + 'upperroman' : (5,'I'), + 'bullet' : (2,'\\(bu'), + 'emdash' : (2,'\\(em'), + } + def __init__(self, style): + if style == 'arabic': + if node.has_key('start'): + start = node['start'] + else: + start = 1 + self._style = ( + len(str(len(node.children)))+2, + start ) + # BUG: fix start for alpha + else: + self._style = self.enum_style[style] + self._cnt = -1 + def next(self): + self._cnt += 1 + # BUG add prefix postfix + try: + return "%d." % (self._style[1] + self._cnt) + except: + if self._style[1][0] == '\\': + return self._style[1] + # BUG romans dont work + # BUG alpha only a...z + return "%c." % (ord(self._style[1])+self._cnt) + def get_width(self): + return self._style[0] + def __repr__(self): + return 'enum_style%r' % list(self._style) + + if node.has_key('enumtype'): + self._list_char.append(enum_char(node['enumtype'])) + else: + self._list_char.append(enum_char('bullet')) + if len(self._list_char) > 1: + # indent nested lists + # BUG indentation depends on indentation of parent list. + self.indent(self._list_char[-2].get_width()) + else: + self.indent(self._list_char[-1].get_width()) + + def list_end(self): + self.dedent() + self._list_char.pop() + + def header(self): + tmpl = (".TH %(title)s %(manual_section)s" + " \"%(date)s\" \"%(version)s\" \"%(manual_group)s\"\n" + ".SH NAME\n" + "%(title)s \- %(subtitle)s\n") + return tmpl % self._docinfo + + def append_header(self): + """append header with .TH and .SH NAME""" + # TODO before everything + # .TH title section date source manual + if self.header_written: + return + self.body.append(self.header()) + self.body.append(MACRO_DEF) + self.header_written = 1 + + def visit_address(self, node): + raise NotImplementedError, node.astext() + self.visit_docinfo_item(node, 'address', meta=None) + + def depart_address(self, node): + self.depart_docinfo_item() + + def visit_admonition(self, node, name): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'div', CLASS=name)) + self.body.append('

' + + self.language.labels[name] + '

\n') + + def depart_admonition(self): + raise NotImplementedError, node.astext() + self.body.append('\n') + + def visit_attention(self, node): + self.visit_admonition(node, 'attention') + + def depart_attention(self, node): + self.depart_admonition() + + def visit_author(self, node): + self._docinfo['author'] = node.astext() + raise nodes.SkipNode + + def depart_author(self, node): + pass + + def visit_authors(self, node): + self.body.append(self.comment('visit_authors')) + + def depart_authors(self, node): + self.body.append(self.comment('depart_authors')) + + def visit_block_quote(self, node): + #self.body.append(self.comment('visit_block_quote')) + # BUG/HACK: indent alway uses the _last_ indention, + # thus we need two of them. + self.indent(BLOCKQOUTE_INDENT) + self.indent(0) + + def depart_block_quote(self, node): + #self.body.append(self.comment('depart_block_quote')) + self.dedent() + self.dedent() + + def visit_bullet_list(self, node): + self.list_start(node) + + def depart_bullet_list(self, node): + self.list_end() + + def visit_caption(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'p', '', CLASS='caption')) + + def depart_caption(self, node): + raise NotImplementedError, node.astext() + self.body.append('

\n') + + def visit_caution(self, node): + self.visit_admonition(node, 'caution') + + def depart_caution(self, node): + self.depart_admonition() + + def visit_citation(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'table', CLASS='citation', + frame="void", rules="none")) + self.body.append('\n' + '\n' + '\n' + '') + self.footnote_backrefs(node) + + def depart_citation(self, node): + raise NotImplementedError, node.astext() + self.body.append('\n' + '\n\n') + + def visit_citation_reference(self, node): + raise NotImplementedError, node.astext() + href = '' + if node.has_key('refid'): + href = '#' + node['refid'] + elif node.has_key('refname'): + href = '#' + self.document.nameids[node['refname']] + self.body.append(self.starttag(node, 'a', '[', href=href, + CLASS='citation-reference')) + + def depart_citation_reference(self, node): + raise NotImplementedError, node.astext() + self.body.append(']') + + def visit_classifier(self, node): + raise NotImplementedError, node.astext() + self.body.append(' : ') + self.body.append(self.starttag(node, 'span', '', CLASS='classifier')) + + def depart_classifier(self, node): + raise NotImplementedError, node.astext() + self.body.append('') + + def visit_colspec(self, node): + self.colspecs.append(node) + + def depart_colspec(self, node): + pass + + def write_colspecs(self): + self.body.append("%s.\n" % ('L '*len(self.colspecs))) + + def visit_comment(self, node, + sub=re.compile('-(?=-)').sub): + self.body.append(self.comment(node.astext())) + raise nodes.SkipNode + + def visit_contact(self, node): + self.visit_docinfo_item(node, 'contact') + + def depart_contact(self, node): + self.depart_docinfo_item() + + def visit_copyright(self, node): + self._docinfo['copyright'] = node.astext() + raise nodes.SkipNode + + def visit_danger(self, node): + self.visit_admonition(node, 'danger') + + def depart_danger(self, node): + self.depart_admonition() + + def visit_date(self, node): + self._docinfo['date'] = node.astext() + raise nodes.SkipNode + + def visit_decoration(self, node): + pass + + def depart_decoration(self, node): + pass + + def visit_definition(self, node): + self.body.append(self.defs['definition'][0]) + + def depart_definition(self, node): + self.body.append(self.defs['definition'][1]) + + def visit_definition_list(self, node): + self.indent(DEFINITION_LIST_INDENT) + + def depart_definition_list(self, node): + self.dedent() + + def visit_definition_list_item(self, node): + self.body.append(self.defs['definition_list_item'][0]) + + def depart_definition_list_item(self, node): + self.body.append(self.defs['definition_list_item'][1]) + + def visit_description(self, node): + self.body.append(self.defs['description'][0]) + + def depart_description(self, node): + self.body.append(self.defs['description'][1]) + + def visit_docinfo(self, node): + self._in_docinfo = 1 + + def depart_docinfo(self, node): + self._in_docinfo = None + # TODO nothing should be written before this + self.append_header() + + def visit_docinfo_item(self, node, name): + self.body.append(self.comment('%s: ' % self.language.labels[name])) + if len(node): + return + if isinstance(node[0], nodes.Element): + node[0].set_class('first') + if isinstance(node[0], nodes.Element): + node[-1].set_class('last') + + def depart_docinfo_item(self): + pass + + def visit_doctest_block(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'pre', CLASS='doctest-block')) + + def depart_doctest_block(self, node): + raise NotImplementedError, node.astext() + self.body.append('\n\n') + + def visit_document(self, node): + self.body.append(self.comment(self.document_start).lstrip()) + # writing header is postboned + self.header_written = 0 + + def depart_document(self, node): + if self._docinfo['author']: + self.body.append('\n.SH AUTHOR\n%s\n' + % self._docinfo['author']) + if self._docinfo['copyright']: + self.body.append('\n.SH COPYRIGHT\n%s\n' + % self._docinfo['copyright']) + self.body.append( + self.comment( + 'Generated by docutils manpage writer on %s.\n' + % (time.strftime('%Y-%m-%d %H:%M')) ) ) + + def visit_emphasis(self, node): + self.body.append(self.defs['emphasis'][0]) + + def depart_emphasis(self, node): + self.body.append(self.defs['emphasis'][1]) + + def visit_entry(self, node): + # BUG entries have to be on one line separated by tab force it. + self.context.append(len(self.body)) + self._in_entry = 1 + + def depart_entry(self, node): + start = self.context.pop() + self._active_table.append_cell(self.body[start:]) + del self.body[start:] + self._in_entry = 0 + + def visit_enumerated_list(self, node): + self.list_start(node) + + def depart_enumerated_list(self, node): + self.list_end() + + def visit_error(self, node): + self.visit_admonition(node, 'error') + + def depart_error(self, node): + self.depart_admonition() + + def visit_field(self, node): + #self.body.append(self.comment('visit_field')) + pass + + def depart_field(self, node): + #self.body.append(self.comment('depart_field')) + pass + + def visit_field_body(self, node): + #self.body.append(self.comment('visit_field_body')) + if self._in_docinfo: + self._docinfo[ + self._field_name.lower().replace(" ","_")] = node.astext() + raise nodes.SkipNode + + def depart_field_body(self, node): + pass + + def visit_field_list(self, node): + self.indent(FIELD_LIST_INDENT) + + def depart_field_list(self, node): + self.dedent('depart_field_list') + + + def visit_field_name(self, node): + if self._in_docinfo: + self._field_name = node.astext() + raise nodes.SkipNode + else: + self.body.append(self.defs['field_name'][0]) + + def depart_field_name(self, node): + self.body.append(self.defs['field_name'][1]) + + def visit_figure(self, node): + raise NotImplementedError, node.astext() + + def depart_figure(self, node): + raise NotImplementedError, node.astext() + + def visit_footer(self, node): + raise NotImplementedError, node.astext() + + def depart_footer(self, node): + raise NotImplementedError, node.astext() + start = self.context.pop() + footer = (['
\n', + self.starttag(node, 'div', CLASS='footer')] + + self.body[start:] + ['\n']) + self.body_suffix[:0] = footer + del self.body[start:] + + def visit_footnote(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'table', CLASS='footnote', + frame="void", rules="none")) + self.body.append('\n' + '\n' + '') + self.footnote_backrefs(node) + + def footnote_backrefs(self, node): + raise NotImplementedError, node.astext() + if self.settings.footnote_backlinks and node.hasattr('backrefs'): + backrefs = node['backrefs'] + if len(backrefs) == 1: + self.context.append('') + self.context.append('' % (backrefs[0], node['id'])) + else: + i = 1 + backlinks = [] + for backref in backrefs: + backlinks.append('%s' + % (backref, i)) + i += 1 + self.context.append('(%s) ' % ', '.join(backlinks)) + self.context.append('' % node['id']) + else: + self.context.append('') + self.context.append('' % node['id']) + + def depart_footnote(self, node): + raise NotImplementedError, node.astext() + self.body.append('\n' + '\n\n') + + def visit_footnote_reference(self, node): + raise NotImplementedError, node.astext() + href = '' + if node.has_key('refid'): + href = '#' + node['refid'] + elif node.has_key('refname'): + href = '#' + self.document.nameids[node['refname']] + format = self.settings.footnote_references + if format == 'brackets': + suffix = '[' + self.context.append(']') + elif format == 'superscript': + suffix = '' + self.context.append('') + else: # shouldn't happen + suffix = '???' + self.content.append('???') + self.body.append(self.starttag(node, 'a', suffix, href=href, + CLASS='footnote-reference')) + + def depart_footnote_reference(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.context.pop() + '') + + def visit_generated(self, node): + pass + + def depart_generated(self, node): + pass + + def visit_header(self, node): + raise NotImplementedError, node.astext() + self.context.append(len(self.body)) + + def depart_header(self, node): + raise NotImplementedError, node.astext() + start = self.context.pop() + self.body_prefix.append(self.starttag(node, 'div', CLASS='header')) + self.body_prefix.extend(self.body[start:]) + self.body_prefix.append('
\n\n') + del self.body[start:] + + def visit_hint(self, node): + self.visit_admonition(node, 'hint') + + def depart_hint(self, node): + self.depart_admonition() + + def visit_image(self, node): + raise NotImplementedError, node.astext() + atts = node.attributes.copy() + atts['src'] = atts['uri'] + del atts['uri'] + if not atts.has_key('alt'): + atts['alt'] = atts['src'] + if isinstance(node.parent, nodes.TextElement): + self.context.append('') + else: + self.body.append('

') + self.context.append('

\n') + self.body.append(self.emptytag(node, 'img', '', **atts)) + + def depart_image(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.context.pop()) + + def visit_important(self, node): + self.visit_admonition(node, 'important') + + def depart_important(self, node): + self.depart_admonition() + + def visit_label(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'td', '%s[' % self.context.pop(), + CLASS='label')) + + def depart_label(self, node): + raise NotImplementedError, node.astext() + self.body.append(']%s' % self.context.pop()) + + def visit_legend(self, node): + raise NotImplementedError, node.astext() + self.body.append(self.starttag(node, 'div', CLASS='legend')) + + def depart_legend(self, node): + raise NotImplementedError, node.astext() + self.body.append('\n') + + def visit_line_block(self, node): + self.body.append('\n') + + def depart_line_block(self, node): + self.body.append('\n') + + def visit_line(self, node): + pass + + def depart_line(self, node): + self.body.append('\n.br\n') + + def visit_list_item(self, node): + # man 7 man argues to use ".IP" instead of ".TP" + self.body.append('\n.IP %s %d\n' % ( + self._list_char[-1].next(), + self._list_char[-1].get_width(),) ) + + def depart_list_item(self, node): + pass + + def visit_literal(self, node): + self.body.append(self.defs['literal'][0]) + + def depart_literal(self, node): + self.body.append(self.defs['literal'][1]) + + def visit_literal_block(self, node): + self.body.append(self.defs['literal_block'][0]) + + def depart_literal_block(self, node): + self.body.append(self.defs['literal_block'][1]) + + def visit_meta(self, node): + raise NotImplementedError, node.astext() + self.head.append(self.emptytag(node, 'meta', **node.attributes)) + + def depart_meta(self, node): + pass + + def visit_note(self, node): + self.visit_admonition(node, 'note') + + def depart_note(self, node): + self.depart_admonition() + + def indent(self, by=0.5): + # if we are in a section ".SH" there already is a .RS + #self.body.append('\n[[debug: listchar: %r]]\n' % map(repr, self._list_char)) + #self.body.append('\n[[debug: indent %r]]\n' % self._indent) + step = self._indent[-1] + self._indent.append(by) + self.body.append(self.defs['indent'][0] % step) + + def dedent(self, name=''): + #self.body.append('\n[[debug: dedent %s %r]]\n' % (name, self._indent)) + self._indent.pop() + self.body.append(self.defs['indent'][1]) + + def visit_option_list(self, node): + self.indent(OPTION_LIST_INDENT) + + def depart_option_list(self, node): + self.dedent() + + def visit_option_list_item(self, node): + # one item of the list + self.body.append(self.defs['option_list_item'][0]) + + def depart_option_list_item(self, node): + self.body.append(self.defs['option_list_item'][1]) + + def visit_option_group(self, node): + # as one option could have several forms it is a group + # options without parameter bold only, .B, -v + # options with parameter bold italic, .BI, -f file + + # we do not know if .B or .BI + self.context.append('.B') # blind guess + self.context.append(len(self.body)) # to be able to insert later + self.context.append(0) # option counter + + def depart_option_group(self, node): + self.context.pop() # the counter + start_position = self.context.pop() + text = self.body[start_position:] + del self.body[start_position:] + self.body.append('\n%s%s' % (self.context.pop(), ''.join(text))) + + def visit_option(self, node): + # each form of the option will be presented separately + if self.context[-1]>0: + self.body.append(' ,') + if self.context[-3] == '.BI': + self.body.append('\\') + self.body.append(' ') + + def depart_option(self, node): + self.context[-1] += 1 + + def visit_option_string(self, node): + # do not know if .B or .BI + pass + + def depart_option_string(self, node): + pass + + def visit_option_argument(self, node): + self.context[-3] = '.BI' # bold/italic alternate + if node['delimiter'] != ' ': + self.body.append('\\fn%s ' % node['delimiter'] ) + elif self.body[len(self.body)-1].endswith('='): + # a blank only means no blank in output, just changing font + self.body.append(' ') + else: + # backslash blank blank + self.body.append('\\ ') + + def depart_option_argument(self, node): + pass + + def visit_organization(self, node): + raise NotImplementedError, node.astext() + self.visit_docinfo_item(node, 'organization') + + def depart_organization(self, node): + raise NotImplementedError, node.astext() + self.depart_docinfo_item() + + def visit_paragraph(self, node): + # BUG every but the first paragraph in a list must be intended + # TODO .PP or new line + return + + def depart_paragraph(self, node): + # TODO .PP or an empty line + if not self._in_entry: + self.body.append('\n\n') + + def visit_problematic(self, node): + raise NotImplementedError, node.astext() + if node.hasattr('refid'): + self.body.append('' % (node['refid'], + node['id'])) + self.context.append('') + else: + self.context.append('') + self.body.append(self.starttag(node, 'span', '', CLASS='problematic')) + + def depart_problematic(self, node): + raise NotImplementedError, node.astext() + self.body.append('') + self.body.append(self.context.pop()) + + def visit_raw(self, node): + if node.get('format') == 'manpage': + self.body.append(node.astext()) + # Keep non-manpage raw text out of output: + raise nodes.SkipNode + + def visit_reference(self, node): + """E.g. link or email address.""" + self.body.append(self.defs['reference'][0]) + + def depart_reference(self, node): + self.body.append(self.defs['reference'][1]) + + def visit_revision(self, node): + self.visit_docinfo_item(node, 'revision') + + def depart_revision(self, node): + self.depart_docinfo_item() + + def visit_row(self, node): + self._active_table.new_row() + + def depart_row(self, node): + pass + + def visit_section(self, node): + self.section_level += 1 + + def depart_section(self, node): + self.section_level -= 1 + + def visit_status(self, node): + raise NotImplementedError, node.astext() + self.visit_docinfo_item(node, 'status', meta=None) + + def depart_status(self, node): + self.depart_docinfo_item() + + def visit_strong(self, node): + self.body.append(self.defs['strong'][1]) + + def depart_strong(self, node): + self.body.append(self.defs['strong'][1]) + + def visit_substitution_definition(self, node): + """Internal only.""" + raise nodes.SkipNode + + def visit_substitution_reference(self, node): + self.unimplemented_visit(node) + + def visit_subtitle(self, node): + self._docinfo["subtitle"] = node.astext() + raise nodes.SkipNode + + def visit_system_message(self, node): + # TODO add report_level + #if node['level'] < self.document.reporter['writer'].report_level: + # Level is too low to display: + # raise nodes.SkipNode + self.body.append('\.SH system-message\n') + attr = {} + backref_text = '' + if node.hasattr('id'): + attr['name'] = node['id'] + if node.hasattr('line'): + line = ', line %s' % node['line'] + else: + line = '' + self.body.append('System Message: %s/%s (%s:%s)\n' + % (node['type'], node['level'], node['source'], line)) + + def depart_system_message(self, node): + self.body.append('\n') + + def visit_table(self, node): + self._active_table = Table() + + def depart_table(self, node): + self.body.append(self._active_table.astext()) + self._active_table = None + + def visit_target(self, node): + self.body.append(self.comment('visit_target')) + #self.body.append(self.defs['target'][0]) + #self.body.append(node['refuri']) + + def depart_target(self, node): + self.body.append(self.comment('depart_target')) + #self.body.append(self.defs['target'][1]) + + def visit_tbody(self, node): + pass + + def depart_tbody(self, node): + pass + + def visit_term(self, node): + self.body.append(self.defs['term'][0]) + + def depart_term(self, node): + self.body.append(self.defs['term'][1]) + + def visit_tgroup(self, node): + pass + + def depart_tgroup(self, node): + pass + + def visit_thead(self, node): + raise NotImplementedError, node.astext() + self.write_colspecs() + self.body.append(self.context.pop()) # '\n' + # There may or may not be a ; this is for to use: + self.context.append('') + self.body.append(self.starttag(node, 'thead', valign='bottom')) + + def depart_thead(self, node): + raise NotImplementedError, node.astext() + self.body.append('\n') + + def visit_tip(self, node): + self.visit_admonition(node, 'tip') + + def depart_tip(self, node): + self.depart_admonition() + + def visit_title(self, node): + if isinstance(node.parent, nodes.topic): + self.body.append(self.comment('topic-title')) + elif isinstance(node.parent, nodes.sidebar): + self.body.append(self.comment('sidebar-title')) + elif isinstance(node.parent, nodes.admonition): + self.body.append(self.comment('admonition-title')) + elif self.section_level == 0: + # document title for .TH + self._docinfo['title'] = node.astext() + raise nodes.SkipNode + elif self.section_level == 1: + self.body.append('\n.SH ') + else: + self.body.append('\n.SS ') + + def depart_title(self, node): + self.body.append('\n') + + def visit_title_reference(self, node): + """inline citation reference""" + self.body.append(self.defs['title_reference'][0]) + + def depart_title_reference(self, node): + self.body.append(self.defs['title_reference'][1]) + + def visit_topic(self, node): + self.body.append(self.comment('topic: '+node.astext())) + raise nodes.SkipNode + ##self.topic_class = node.get('class') + + def depart_topic(self, node): + ##self.topic_class = '' + pass + + def visit_transition(self, node): + # .PP Begin a new paragraph and reset prevailing indent. + # .sp N leaves N lines of blank space. + # .ce centers the next line + self.body.append('\n.sp\n.ce\n----\n') + + def depart_transition(self, node): + self.body.append('\n.ce 0\n.sp\n') + + def visit_version(self, node): + self._docinfo["version"] = node.astext() + raise nodes.SkipNode + + def visit_warning(self, node): + self.visit_admonition(node, 'warning') + + def depart_warning(self, node): + self.depart_admonition() + + def unimplemented_visit(self, node): + raise NotImplementedError('visiting unimplemented node type: %s' + % node.__class__.__name__) + +# vim: set et ts=4 ai : diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/HOWTORELEASE.txt work/libLAS-1.2.1/HOWTORELEASE.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/HOWTORELEASE.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/HOWTORELEASE.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,100 @@ + +Steps for Making a libLAS Release +============================================================================== + +:Author: Howard Butler +:Contact: hobu.inc@gmail.com +:Revision: $Revision$ +:Date: $Date$ + +This document describes the process for releasing a new version of libLAS. + +General Notes +------------------------------------------------------------------------------ + +The libLAS library is very conservative with regards to API linkages. +Specifically, major versions (1.0, 2.0, ..., X.0) of the library should be +released if the C API changes in any significant way, especially if you are +removing or changing API functions. It is desirable that minor versions +(1.1, 1.2, ..., 1.X) of the library are API compatible for the C++ APIs, +but this is not required. + +Release Process + +1) Increment Version Numbers + + - configure.ac + - include/liblas/capi/las_version.h + - python/setup.py + - nmake.opt + +2) Update README to include any relevant info about the release that + might have changed. + +3) Build Windows version + + - Issue nmake and nmake install commands + + :: + + nmake /f makefile.vc clean + nmake /f makefile.vc + nmake /f makefile.vc install + nmake /f makefile.vc package + + - Build Python bindings for Python 2.4 and Python 2.5 + + :: + cd python + python setup.py bdist_wininst + python setup.py bdist_egg + + - Upload Python bindings to PyPI + + :: + + # ensure a .pypirc file exists here with login info + set HOME=C:\Docume~1\hobu.FIRE-WINDOWS + c:\python24\python.exe setup.py register + c:\python24\python.exe setup.py sdist upload + c:\python24\python.exe setup.py bdist_wininst upload + c:\python24\python.exe setup.py bdist_egg upload + c:\python25\python.exe setup.py bdist_egg upload + + - Create a zip file from the .\bin directory. This will contain the + utilities and relevant DLLs. The Python bindings are packaged with their + own copies of the DLLs. I usually call this file liblas$(VERSION).zip. + + +4) Make the source distribution + + :: + + make dist + +5) Only bz2 files can be uploaded to trac, so gunzip the dist file and + recompress it as bz2. + + +6) Generate MD5 sums + + :: + + md5 las-0.9.7.tar.bz2 + md5 liblas0.9.7.zip + +6) Create a new release page on http://liblas.org/wiki/Releases + +7) Upload windows and source package as attachments to the new release page. + +8) Tag the release + + :: + + svn cp http://liblas.org/svn/trunk http://liblas.org/svn/tags/0.9.7 + +9) Write the release notes. Place a copy of the release notes on the release + page you created as well as send an email to liblas-devel announcing the + new release. + +$Id$ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/capi/las_config.h work/libLAS-1.2.1/include/liblas/capi/las_config.h --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/capi/las_config.h 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/capi/las_config.h 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,93 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Basic macros for the libLAS C API + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LAS_CONFIG_H_INCLUDED +#define LAS_CONFIG_H_INCLUDED + +#define LIBLAS_C_API 1 + +/* ==================================================================== */ +/* Other standard services. */ +/* ==================================================================== */ +#ifdef __cplusplus +# define LAS_C_START extern "C" { +# define LAS_C_END } +#else +# define LAS_C_START +# define LAS_C_END +#endif + +#ifndef LAS_DLL +#if defined(_MSC_VER) && !defined(LAS_DISABLE_DLL) +# define LAS_DLL __declspec(dllexport) +#else +# if defined(USE_GCC_VISIBILITY_FLAG) +# define LAS_DLL __attribute__ ((visibility("default"))) +# else +# define LAS_DLL +# endif +#endif +#endif + +#ifndef NULL +#define NULL 0 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#ifndef MAX +# define MIN(a,b) ((ab) ? a : b) +#endif + +#ifdef _MSC_VER +#define strdup _strdup +#endif + + +#endif /* LAS_CONFIG_H_INCLUDED */ + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/capi/las_version.h work/libLAS-1.2.1/include/liblas/capi/las_version.h --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/capi/las_version.h 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/capi/las_version.h 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,64 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Basic macros for the libLAS C API + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LAS_VERSION_H_INCLUDED +#define LAS_VERSION_H_INCLUDED + +#ifndef LIBLAS_VERSION_MAJOR +#define LIBLAS_VERSION_MAJOR 1 +#define LIBLAS_VERSION_MINOR 2 +#define LIBLAS_VERSION_REV 1 +#define LIBLAS_VERSION_BUILD 0 +#endif + +#ifndef LIBLAS_VERSION_NUM +#define LIBLAS_VERSION_NUM (LIBLAS_VERSION_MAJOR*1000+LIBLAS_VERSION_MINOR*100+LIBLAS_VERSION_REV*10+LIBLAS_VERSION_BUILD) +#endif + +#ifndef LIBLAS_RELEASE_DATE +#define LIBLAS_RELEASE_DATE 20091002 +#endif + +#ifndef LIBLAS_RELEASE_NAME +#define LIBLAS_RELEASE_NAME "1.2.1" +#endif + +#endif /* LAS_VERSION_H_INCLUDED */ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/capi/liblas.h work/libLAS-1.2.1/include/liblas/capi/liblas.h --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/capi/liblas.h 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/capi/liblas.h 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1116 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Main prototypes for the libLAS C API + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_H_INCLUDED +#define LIBLAS_H_INCLUDED + + + +#define LIBLAS_C_API 1 + +#include "las_version.h" +#include "las_config.h" + + +#include + + +typedef struct LASWriterHS *LASWriterH; +typedef struct LASReaderHS *LASReaderH; +typedef struct LASPointHS *LASPointH; +typedef struct LASHeaderHS *LASHeaderH; +typedef struct LASGuidHS *LASGuidH; +typedef struct LASVLRHS *LASVLRH; +typedef struct LASColorHS *LASColorH; +typedef struct LASSRSHS *LASSRSH; + + +/* Fake out the compiler if we don't have libgeotiff */ +#ifndef HAVE_LIBGEOTIFF + typedef struct GTIFS * GTIF; + typedef struct TIFFS * TIFF; +#else +#include +#endif + + +LAS_C_START + + +#define LAS_MODE_READ 0 +#define LAS_MODE_WRITE 1 +#define LAS_MODE_APPEND 2 + +/** + * \todo to be documented + */ +typedef enum +{ + LE_None = 0, + LE_Debug = 1, + LE_Warning = 2, + LE_Failure = 3, + LE_Fatal = 4 +} LASError; + +/** + * \todo to be documented + */ +typedef struct { + + double t; + double x, y, z; + uint16_t intensity; + uint8_t cls; + int8_t scan_angle; + uint8_t user_data; + uint16_t retnum; + uint16_t numret; + uint16_t scandir; + uint16_t fedge; + uint16_t red; + uint16_t green; + uint16_t blue; + long rgpsum; + int number_of_point_records; + int number_of_points_by_return[8]; + int number_of_returns_of_given_pulse[8]; + int classification[32]; + int classification_synthetic; + int classification_keypoint; + int classification_withheld; + LASPointH pmax; + LASPointH pmin; +} LASPointSummary; + + +/** Returns the version string for this library. + * @return the version string for this library. +*/ +LAS_DLL char* LAS_GetVersion(void); + +LAS_DLL int LAS_IsLibGeoTIFFEnabled(void); + +LAS_DLL int LAS_IsGDALEnabled(void); + +/****************************************************************************/ +/* Error handling */ +/****************************************************************************/ + +/** Resets the error stack for the libLAS C API. +*/ +LAS_DLL void LASError_Reset(void); + +/** Pops the top error off of the error stack for the libLAS C API. +*/ +LAS_DLL void LASError_Pop(void); + +/** Returns the error number of the last error on the error stack. + * @return the error number of the last error on the error stack. +*/ +LAS_DLL LASError LASError_GetLastErrorNum(void); + +/** Returns the name of the method the last error message happened in. + * @return the name of the method the last error message happened in. +*/ +LAS_DLL char * LASError_GetLastErrorMsg(void); + +/** Returns the name of the method the last error message happened in. + * @return the name of the method the last error message happened in. +*/ +LAS_DLL char * LASError_GetLastErrorMethod(void); + +/** Returns the number of error messages on the error stack. + * @return the number of error messages on the error stack. +*/ +LAS_DLL int LASError_GetErrorCount(void); + +/** Prints the last error message in the error stack to stderr. If + * there is no error on the error stack, only the message is printed. + * The function does not alter the error stack in any way. + * @param message Message to include in the stderr output +*/ +LAS_DLL void LASError_Print(const char* message); + +/****************************************************************************/ +/* Reader operations */ +/****************************************************************************/ + +/** Creates a LASReaderH object that can be used to read LASHeaderH and + * LASPointH objects with. The LASReaderH must not be created with a + * filename that is opened for read or write by any other API functions. + * @return opaque pointer to a LASReaderH instance. + * @param filename Filename to open for read +*/ +LAS_DLL LASReaderH LASReader_Create(const char * filename); + +/** Reads the next available point on the LASReaderH instance. If no point + * is available to read, NULL is returned. If an error happens during + * the reading of the next available point, an error will be added to the + * error stack and can be returned with the LASError_GetLastError* methods. + * @param hReader the opaque handle to the LASReaderH + * @return an opaque handle to a LASPointH object, or NULL if no point is + * available to read or an error occured. Use the + * LASError_GetLastError* methods to confirm the existence of an error + * if NULL is returned. +*/ +LAS_DLL LASPointH LASReader_GetNextPoint(const LASReaderH hReader); + +/** Reads a LASPointH from the given position in the LAS file represented + * by the LASReaderH instance. If no point is available at that location, + * NULL is returned. If an error happens during the reading of the point, + * an error will be added to the error stack and can be returned with the + * LASError_GetLastError* methods. + * @param hReader the opaque handle to the LASReaderH + * @param position the integer position of the point in the file to read. + * @return an opaque handle to a LASPointH object, or NULL if no point is + * available at the given location or an error occured. Use the + * LASError_GetLastError* methods to confirm the existence of an error + * if NULL is returned. +*/ +LAS_DLL LASPointH LASReader_GetPointAt(const LASReaderH hReader, uint32_t position); + +/** Closes the file for reading operations represented by the LASReaderH instance. + * @param hReader the opqaue handle to the LASReaderH +*/ +LAS_DLL void LASReader_Destroy(LASReaderH hReader); + +/** Returns a LASHeaderH representing the header for the file + * @param hReader the LASReaderH instance + * @return a LASHeaderH representing the header for the file. NULL is returned + * in the event of an error. Use the LASError_GetLastError* methods to check + * in the event of a NULL return. +*/ +LAS_DLL LASHeaderH LASReader_GetHeader(const LASReaderH hReader); + + +LAS_DLL LASError LASReader_SetSRS(LASHeaderH hReader, const LASSRSH hSRS); + + +/****************************************************************************/ +/* Point operations */ +/****************************************************************************/ + +/** Returns the X value for the point. This value is not scaled or offset + * by any header values and stands on its own. If you need points to have + * a scale and/or offset applied, this must be done in conjunction with the + * header values after the value is read. + * @param hPoint the opaque pointer to the LASPointH instance + * @return the X value for the LASPointH +*/ +LAS_DLL double LASPoint_GetX(const LASPointH hPoint); + +/** Sets the X value for the point. This value must be scaled or offset + * by any header values before being set. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the double value to set for the X value of the point + * @return an error number if an error occured during the setting of the point. +*/ +LAS_DLL LASError LASPoint_SetX(LASPointH hPoint, double value); + +/** Returns the Y value for the point. This value is not scaled or offset + * by any header values and stands on its own. If you need points to have + * a scale and/or offset applied, this must be done in conjunction with the + * header values after the value is read. + * @param hPoint the opaque pointer to the LASPointH instance + * @return the Y value for the LASPointH +*/ +LAS_DLL double LASPoint_GetY(const LASPointH hPoint); + +/** Sets the Y value for the point. This value must be scaled or offset + * by any header values before being set. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the double value to set for the Y value of the point + * @return an error number if an error occured during the setting of the point. +*/ +LAS_DLL LASError LASPoint_SetY(LASPointH hPoint, double value); + +/** Returns the Z value for the point. This value is not scaled or offset + * by any header values and stands on its own. If you need points to have + * a scale and/or offset applied, this must be done in conjunction with the + * header values after the value is read. + * @param hPoint the opaque pointer to the LASPointH instance + * @return the Z value for the LASPointH +*/ +LAS_DLL double LASPoint_GetZ(const LASPointH hPoint); + +/** Sets the Z value for the point. This value must be scaled or offset + * by any header values before being set. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the double value to set for the Z value of the point + * @return an error number if an error occured during the setting of the point. +*/ +LAS_DLL LASError LASPoint_SetZ(LASPointH hPoint, double value); + +/** Returns the intensity value for the point. This value is the pulse return + * magnitude, it is optional, and it is LiDAR system specific. + * @return the intensity value for the point. +*/ +LAS_DLL uint16_t LASPoint_GetIntensity(const LASPointH hPoint); + +/** Sets the intensity value for the point. + * @param hPoint the opaque pointer to the LASPointH instance + * @param value the value to set the intensity to + * @return an error number if an error occured. +*/ +LAS_DLL LASError LASPoint_SetIntensity(LASPointH hPoint, uint16_t value); + +/** Returns the return number for the point. The return number is "the pulse + * return number for a given output pulse." The first return number starts with + * the value 1. + * @param hPoint LASPointH instance + * @return a return number, valid from 1-6, for the point. Use the LASError + * methods to determine if an error occurred during this operation if 0 + * is returned. +*/ +LAS_DLL uint16_t LASPoint_GetReturnNumber(const LASPointH hPoint); + +/** Sets the return number for the point. Valid values are from 1-6. + * @param hPoint LASPointH instance + * @param value the value to set for the return number + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetReturnNumber(LASPointH hPoint, uint16_t value); + +/** Returns the total number of returns for a given pulse. + * @param hPoint LASPointH instance + * @return total number of returns for this pulse. +*/ +LAS_DLL uint16_t LASPoint_GetNumberOfReturns(const LASPointH hPoint); + +/** Sets the number of returns for the point. Valid values are from 1-5. + * @param hPoint LASPointH instance + * @param value the value to set for the number of returns + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetNumberOfReturns(LASPointH hPoint, uint16_t value); + +/** Returns the scan direction for a given pulse. + * @param hPoint LASPointH instance + * @return the scan direction for a given pulse. +*/ +LAS_DLL uint16_t LASPoint_GetScanDirection(const LASPointH hPoint); + +/** Sets the scan direction for a given pulse. Valid values are 0 or 1, with + * 1 being a positive scan direction and 0 being a negative scan direction. + * @param hPoint LASPointH instance + * @param value the value to set for scan direction + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetScanDirection(LASPointH hPoint, uint16_t value); + +/** Returns whether or not a given pulse is an edge point + * @param hPoint LASPointH instance + * @return whether or not a given pulse is an edge point. +*/ +LAS_DLL uint16_t LASPoint_GetFlightLineEdge(const LASPointH hPoint); + +/** Sets the edge marker for a given pulse. Valid values are 0 or 1, with + * 1 being an edge point and 0 being interior. + * @param hPoint LASPointH instance + * @param value the value to set for flightline edge + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetFlightLineEdge(LASPointH hPoint, uint16_t value); + +/** Returns all of the scan flags for the point -- Return number, number of + * returns, flightline edge, scan direction, and scan angle rank. + * @param hPoint LASPointH instance + * @return all of the scan flags for the point +*/ +LAS_DLL uint8_t LASPoint_GetScanFlags(const LASPointH hPoint); + +/** Sets all of the scan flags for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the flags + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetScanFlags(LASPointH hPoint, uint8_t value); + +/** Returns the classification for the point + * @param hPoint LASPointH instance + * @return the classification for the point +*/ +LAS_DLL uint8_t LASPoint_GetClassification(const LASPointH hPoint); + +/** Sets the classification for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the classification + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetClassification(LASPointH hPoint, uint8_t value); + +/** Returns the time for the point + * @param hPoint LASPointH instance + * @return the time for the point +*/ +LAS_DLL double LASPoint_GetTime(const LASPointH hPoint); + +/** Sets the time for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the time + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetTime(LASPointH hPoint, double value); + +/** Returns the scan angle for the point + * @param hPoint LASPointH instance + * @return the scan angle for the point +*/ +LAS_DLL int8_t LASPoint_GetScanAngleRank(const LASPointH hPoint); + +/** Sets the scan angle for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the scan angle + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetScanAngleRank(LASPointH hPoint, int8_t value); + +/** Sets the point source id for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the point source id + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetPointSourceId(LASPointH hPoint, uint16_t value); + +/** Returns the point source id for the point + * @param hPoint LASPointH instance + * @return the scan angle for the point +*/ +LAS_DLL uint16_t LASPoint_GetPointSourceId(LASPointH hPoint); + +/** Returns the arbitrary user data for the point + * @param hPoint LASPointH instance + * @return the arbitrary user data for the point +*/ +LAS_DLL uint8_t LASPoint_GetUserData(const LASPointH hPoint); + +/** Sets the arbitrary user data for the point. No validation is done. + * @param hPoint LASPointH instance + * @param value the value to set for the arbitrary user data + * @return LASError value determine success or failure. +*/ +LAS_DLL LASError LASPoint_SetUserData(LASPointH hPoint, uint8_t value); + +/** Returns a bitfield representing the validity of various members + * enum DataMemberFlag + { + eReturnNumber = 1, + eNumberOfReturns = 2, + eScanDirection = 4, + eFlightLineEdge = 8, + eClassification = 16, + eScanAngleRank = 32, + eTime = 64 + }; + * @param hPoint LASPointH instance + * @return bitfield representing the validity of various members. +*/ +LAS_DLL int LASPoint_Validate(LASPointH hPoint); + +/** Returns a boolean whether or not the point is valid + * @param hPoint LASPointH instance + * @return a boolean (1 or 0) whether or not the point is valid. +*/ +LAS_DLL int LASPoint_IsValid(LASPointH hPoint); + +/** Creates a new empty LASPointH instance + * @return LASPointH instance. If the value is NULL use the + * LASError_GetLastError* methods to determine the problem +*/ +LAS_DLL LASPointH LASPoint_Create(void); + +/** Creates a copy of a LASPointH instance + * @param hPoint the LASPointH instance to copy + * @return new LASPointH instance. If the value is NULL use the + * LASError_GetLastError* methods to determine the problem +*/ +LAS_DLL LASPointH LASPoint_Copy(const LASPointH); + +/** Destroys/deletes a LASPointH instance +*/ +LAS_DLL void LASPoint_Destroy(LASPointH hPoint); + +/****************************************************************************/ +/* Header operations */ +/****************************************************************************/ + +/** Copies a LASHeaderH instance + * @param hHeader the LASHeaderH to copy + * @return a LASHeaderH instance or NULL on error +*/ +LAS_DLL LASHeaderH LASHeader_Copy(const LASHeaderH hHeader); + +/** Creates an empty LASHeaderH with default values +*/ +LAS_DLL LASHeaderH LASHeader_Create(void); + +/** Destroys/deletes a LASHeader instance +*/ +LAS_DLL void LASHeader_Destroy(LASHeaderH hHeader); + +/** Returns the file signature the the file. This should always be 'LASF' + * @param hHeader LASHeaderH instance + * @return the file signature the the file. This should always be 'LASF' +*/ +LAS_DLL char *LASHeader_GetFileSignature(const LASHeaderH hHeader); + +/** Returns the file source id for the file. It is a number from 1-65535 + * @param hHeader LASHeaderH instance + * @return the file source id for the file. +*/ +LAS_DLL uint16_t LASHeader_GetFileSourceId(const LASHeaderH hHeader); + +/** Sets the FileSource ID value for the header. By default, this value is "0" if it + * is not explicitly set. See the LAS specification for details on what this + * value should logically be set to. + * @param hHeader LASHeaderH instance + * @param value the value to set as the FileSource ID value for the header + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetFileSourceId(LASHeaderH hHeader, uint16_t value); + +/** Returns the project id for the header as a GUID string + * @return the project id for the header as a GUID string +*/ +LAS_DLL char *LASHeader_GetProjectId(const LASHeaderH hHeader); + +/** Sets the project id/GUID for the header + * @param hHeader LASHeaderH instance + * @param value character value GUID to set the header value to + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetProjectId(LASHeaderH hHeader, const char* value); + +/** Sets the project id/GUID for the header + * @param hHeader LASHeaderH instance + * @param hId LASGuidH instance to set the GUID for the header to + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId); + +/** Returns the major version number for the header. This value is expected + * to always be 1. + * @param hHeader LASHeaderH instance + * @return major version number for the header. +*/ +LAS_DLL uint8_t LASHeader_GetVersionMajor(const LASHeaderH hHeader); + +/** Sets the major version number for the header. All values other than 1 + * are invalid. + * @param hHeader LASHeaderH instance + * @param value integer value to set the major version to (only the value 1 is valid) + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetVersionMajor(LASHeaderH hHeader, uint8_t value); + +/** Returns the min version number for the header. This value is expected + * to be 1 or 0 representing LAS 1.1 or LAS 1.0 + * @param hHeader LASHeaderH instance + * @return minor version number for the header. +*/ +LAS_DLL uint8_t LASHeader_GetVersionMinor(const LASHeaderH hHeader); + +/** Sets the minor version number for the header. All values other than 1 or 0 + * are invalid. + * @param hHeader LASHeaderH instance + * @param value integer value to set the minor version to (only the values 1 or 0 are valid) + * @return LASError enum + * + * @todo TODO: Maybe this should return fatal error if version out of range -- hobu +*/ +LAS_DLL LASError LASHeader_SetVersionMinor(LASHeaderH hHeader, uint8_t value); + +/** Returns the System ID for the header. The caller assumes ownership of the returned string + * @return the system id for the header as a character array +*/ +LAS_DLL char *LASHeader_GetSystemId(const LASHeaderH hHeader); + +/** Sets the System ID for the header. By default, this value is "libLAS" if it + * is not explicitly set. See the LAS specification for details on what this + * value should logically be set to. + * @param hHeader LASHeaderH instance + * @param value the value to set as the System ID for the header + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetSystemId(LASHeaderH hHeader, const char* value); + +/** Returns the Software ID for the header. The caller assumes ownership of the returned string + * @return the software id for the header as a character array +*/ +LAS_DLL char *LASHeader_GetSoftwareId(const LASHeaderH hHeader); + +/** Sets the Software ID for the header. By default, this value is "libLAS 1.0" if it + * is not explicitly set. See the LAS specification for details on what this + * value should logically be set to. + * @param hHeader LASHeaderH instance + * @param value the value to set as the Software ID for the header + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetSoftwareId(LASHeaderH hHeader, const char* value); + +/** Returns the reserved value for the header. This should aways be 0. + * @return the reserved value for the header. +*/ +LAS_DLL uint16_t LASHeader_GetReserved(const LASHeaderH hHeader); + +/** Sets the Reserved value for the header. By default, this value is "0" if it + * is not explicitly set. See the LAS specification for details on what this + * value should logically be set to. + * @param hHeader LASHeaderH instance + * @param value the value to set as the reserved value for the header + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetReserved(LASHeaderH hHeader, uint16_t value); + +/** Returns the file creation day of the year. The values start from 1, being January 1st, + * and end at 365 or 366 being December 31st, depending on leap year. + * @return the day of the year as an integer starting from 1 for the file creation. +*/ +LAS_DLL uint16_t LASHeader_GetCreationDOY(const LASHeaderH hHeader); + +/** Sets the file creation day of the year. The values start from 1, being January 1st. No + * date validation is done + * @param hHeader LASHeaderH instance + * @param value the value to set as the creation day + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetCreationDOY(LASHeaderH hHeader, uint16_t value); + +/** Returns the file creation year. This is a four digit number representing the + * year for the file, ie 2003, 2008, etc. + * @return the creation year for the file or 0 if none is set +*/ +LAS_DLL uint16_t LASHeader_GetCreationYear(const LASHeaderH hHeader); + +/** Sets the file creation year. This should be a four digit number representing + * the year for the file, ie 2003, 2008, etc. No validation on the value is done + * @param hHeader LASHeaderH instance + * @param value the value to set for the creation year + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetCreationYear(LASHeaderH hHeader, uint16_t value); + +/** Returns the size of the header for the file in bytes. + * @return the size of the header for the file in bytes. +*/ +LAS_DLL uint16_t LASHeader_GetHeaderSize(const LASHeaderH hHeader); + +/** Returns the byte offset to the start of actual point data for the file + * @param hHeader LASHeaderH instance + * @return the type offset to the start of actual point data for the file +*/ +LAS_DLL uint32_t LASHeader_GetDataOffset(const LASHeaderH hHeader); + +/** Sets the location in number of bytes to start writing point data. Any + * space between the end of the LASVLRHs and this value will be written with 0's. + * @param hHeader LASHeaderH instance + * @param value the long integer to set for byte location determining the end of the header + * @return LASError enum +*/ + LAS_DLL LASError LASHeader_SetDataOffset(const LASHeaderH hHeader, uint32_t value); + +/** Returns the number of variable length records in the header + * @param hHeader LASHeaderH instance + * @return the number of variable length records in the header +*/ +LAS_DLL uint32_t LASHeader_GetRecordsCount(const LASHeaderH hHeader); + +/** Returns the record length for the points based on their data format id in bytes + * @param hHeader LASHeaderH instance + * @return the record length for the points based on their data format id in bytes +*/ +LAS_DLL uint16_t LASHeader_GetDataRecordLength(const LASHeaderH hHeader); + +/** Returns the data format id. If this value is 1, the point data have time values + * associated with them. If it is 0, the point data do not have time values. + * @param hHeader LASHeaderH instance + * @return the data format id for the file. +*/ +LAS_DLL uint8_t LASHeader_GetDataFormatId(const LASHeaderH hHeader); + +/** Sets the data format id for the file. The value should be 1 or 0, with 1 being + * points that contain time values and 0 being points that do not. + * @param hHeader LASHeaderH instance + * @param value the value for the data format id, 1 or 0 are valid values. + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetDataFormatId(const LASHeaderH hHeader, uint8_t value); + +/** Returns the number of point records in the file. This value may not reflect the actual + * number of point records in the file. + * @param hHeader LASHeaderH instance + * @return the number of point records in the file +*/ +LAS_DLL uint32_t LASHeader_GetPointRecordsCount(const LASHeaderH hHeader); + +/** Sets the number of point records for the file. + * @param hHeader LASHeaderH instance + * @param value the long integer to set for the number of point records in the file + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetPointRecordsCount(const LASHeaderH hHeader, uint32_t value); + +/** Returns the number of point records by return. + * @param hHeader LASHeaderH instance + * @param index the return number to fetch the count for + * @return the number of point records for a given return +*/ +LAS_DLL uint32_t LASHeader_GetPointRecordsByReturnCount(const LASHeaderH hHeader, int index); + +/** Sets the number of point records for a given return + * @param hHeader LASHeaderH instance + * @param index the return number to set the count for + * @param value the number of point records for the return + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetPointRecordsByReturnCount(const LASHeaderH hHeader, int index, uint32_t value); + +/** Return the X scale factor + * @param hHeader LASHeaderH instance + * @return the X scale factor +*/ +LAS_DLL double LASHeader_GetScaleX(const LASHeaderH hHeader); + +/** Return the Y scale factor + * @param hHeader LASHeaderH instance + * @return the Y scale factor +*/ +LAS_DLL double LASHeader_GetScaleY(const LASHeaderH hHeader); + +/** Return the Z scale factor + * @param hHeader LASHeaderH instance + * @return the Z scale factor +*/ +LAS_DLL double LASHeader_GetScaleZ(const LASHeaderH hHeader); + +/** Sets the scale factors + * @param hHeader LASHeaderH instance + * @param x the x scale factor + * @param y the y scale factor + * @param z the z scale factor + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetScale(LASHeaderH hHeader, double x, double y, double z); + +/** Return the X offset + * @param hHeader LASHeaderH instance + * @return the X offset +*/ +LAS_DLL double LASHeader_GetOffsetX(const LASHeaderH hHeader); + +/** Return the Y offset + * @param hHeader LASHeaderH instance + * @return the Y offset +*/ +LAS_DLL double LASHeader_GetOffsetY(const LASHeaderH hHeader); + +/** Return the Z offset + * @param hHeader LASHeaderH instance + * @return the Z offset +*/ +LAS_DLL double LASHeader_GetOffsetZ(const LASHeaderH hHeader); + +/** Sets the offset values + * @param hHeader LASHeaderH instance + * @param x the x offset + * @param y the y offset + * @param z the z offset + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetOffset(LASHeaderH hHeader, double x, double y, double z); + +/** Return the minimum x value + * @param hHeader LASHeaderH instance + * @return the minimum x value +*/ +LAS_DLL double LASHeader_GetMinX(const LASHeaderH hHeader); + +/** Return the minimum y value + * @param hHeader LASHeaderH instance + * @return the minimum y value +*/ +LAS_DLL double LASHeader_GetMinY(const LASHeaderH hHeader); + +/** Return the minimum z value + * @param hHeader LASHeaderH instance + * @return the minimum z value +*/ +LAS_DLL double LASHeader_GetMinZ(const LASHeaderH hHeader); + +/** Sets the minimum values + * @param hHeader LASHeaderH instance + * @param x the x minimum + * @param y the y minimum + * @param z the z minimum + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetMin(LASHeaderH hHeader, double x, double y, double z); + +/** Return the maximum x value + * @param hHeader LASHeaderH instance + * @return the maximum x value +*/ +LAS_DLL double LASHeader_GetMaxX(const LASHeaderH hHeader); + +/** Return the maximum y value + * @param hHeader LASHeaderH instance + * @return the maximum y value +*/ +LAS_DLL double LASHeader_GetMaxY(const LASHeaderH hHeader); + +/** Return the maximum z value + * @param hHeader LASHeaderH instance + * @return the maximum z value +*/ +LAS_DLL double LASHeader_GetMaxZ(const LASHeaderH hHeader); + +/** Sets the maximum values + * @param hHeader LASHeaderH instance + * @param x the x maximum + * @param y the y maximum + * @param z the z maximum + * @return LASError enum +*/ +LAS_DLL LASError LASHeader_SetMax(LASHeaderH hHeader, double x, double y, double z); + +/** Returns the VLR record for the given index. Use LASHeader_GetRecordsCount to + * determine the number of VLR records available on the header. + * @param hHeader the LASHeaderH instance + * @param i the index starting from 0 of the VLR to fetch + * @return LASVLRH instance that models the Variable Length Record +*/ +LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, uint32_t i); + +/** Deletes a VLR record from the header for the given index. + * @param hHeader the LASHeaderH instance + * @param index the index starting from 0 of the VLR to delete + * @return LASErrorEnum +*/ +LAS_DLL LASError LASHeader_DeleteVLR(LASHeaderH hHeader, uint32_t index); + +/** Adds a VLR record to the header. + * @param hHeader the LASHeaderH instance + * @param hVLR the VLR to add to the header + * @return LASErrorEnum +*/ +LAS_DLL LASError LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR); + +/****************************************************************************/ +/* Writer Operations */ +/****************************************************************************/ + +/** Creates a new LASWriterH for write operations on LAS files. The file may + * be opened in either LAS_MODE_APPEND or LAS_MODE_WRITE, but the file cannot + * be open by another other operations (another LASReaderH or LASWriterH). + * @param filename The filename to open to write + * @param hHeader an opaque pointer to a LASHeaderH that will be written to + * the file as part of the opening for write operation. + * @param mode a mode value to denote whether to open for write or append + * operations. Valid values are LAS_MODE_APPEND and LAS_MODE_WRITE. +*/ +LAS_DLL LASWriterH LASWriter_Create(const char* filename, const LASHeaderH hHeader, int mode); + +/** Writes a point to the file. The location of where the point is writen is + * determined by the mode the file is opened in, and what the last operation was. + * For example, if the file was opened for append, the next point would be written + * at the end of the file. Likewise, if the file is opened in write mode, even + * if the file already existed, the next WritePoint operation will happen at the + * end of the header and all of the existing points in the file will be overwritten. + * @param hWriter opaque pointer to the LASWriterH instance + * @param hPoint the opaque LASPointH pointer to write + * @return LE_None if no error occurred during the write operation. +*/ +LAS_DLL LASError LASWriter_WritePoint(const LASWriterH hWriter, const LASPointH hPoint); + +/** Overwrites the header for the file represented by the LASWriterH. It does + * not matter if the file is opened for append or for write. + * @param hWriter opaque pointer to the LASWriterH instance + * @param hHeader LASHeaderH instance to write into the file + * @return LE_None if no error occurred during the operation. +*/ + +LAS_DLL LASError LASWriter_WriteHeader(const LASWriterH hWriter, const LASHeaderH hHeader); + +/** Destroys the LASWriterH instance, effectively closing the file and performing + * housekeeping operations. + * @param hWriter LASWriterH instance to close +*/ +LAS_DLL void LASWriter_Destroy(LASWriterH hWriter); + + +LAS_DLL LASError LASWriter_SetSRS(LASWriterH hWriter, const LASSRSH hSRS); + +/****************************************************************************/ +/* GUID Operations */ +/****************************************************************************/ + +/** Returns the GUID value for the header as an opaque LASGuidH pointer. + * @param hHeader the opaque pointer to the LASHeaderH + * @return the GUID value for the header as an opaque LASGuidH pointer. +*/ +LAS_DLL LASGuidH LASHeader_GetGUID(const LASHeaderH hHeader); + +/** Returns a new random GUID. + * @return a new random GUID +*/ +LAS_DLL LASGuidH LASGuid_Create(); + +/** Creates a new GUID opaque pointer using the given string. + * @param string A GUID string in the form "00000000-0000-0000-0000-000000000000" + * An example GUID might be something like '8388F1B8-AA1B-4108-BCA3-6BC68E7B062E' + * @return the GUID value as an opaque LASGuidH pointer. +*/ +LAS_DLL LASGuidH LASGuid_CreateFromString(const char* string); + +/** Destroys a GUID opaque pointer and removes it from the heap + * @param hId the GUID value to destroy as an opaque LASGuidH pointer. +*/ +LAS_DLL void LASGuid_Destroy(LASGuidH hId); + +/** Determines if two GUIDs are equal. + * @param hId1 the first GUID + * @param hId2 the second GUID + * @return 0 if false, 1 if true. Use the LASError_GetLastError* methods to + * determine if an error occured during the operation of this function. +*/ +LAS_DLL int LASGuid_Equals(LASGuidH hId1, LASGuidH hId2); + +/** Returns a string representation of the GUID opqaue pointer. The caller + * owns the string. + * @param hId the LASGuidH pointer + * @return a string representation of the GUID opaque pointer. +*/ +LAS_DLL char* LASGuid_AsString(LASGuidH hId); + +/****************************************************************************/ +/* VLR Operations */ +/****************************************************************************/ + +/** Creates a new VLR record + * @return a new VLR record +*/ +LAS_DLL LASVLRH LASVLR_Create(void); + +/** Destroys a VLR record and removes it from the heap +*/ +LAS_DLL void LASVLR_Destroy(LASVLRH hVLR); + +/** Returns the User Id for the VLR + * @param hVLR the LASVLRH instance + * @return the User Id for the VLR +*/ +LAS_DLL char* LASVLR_GetUserId(const LASVLRH hVLR); + +/** Sets the User Id for the VLR + * @param hVLR the LASVLRH instance + * @param value the value to set for the User Id. It will be clipped to fit + * within 16 characters + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_SetUserId(LASVLRH hVLR, const char* value); + +/** Gets the description for the VLR + * @param hVLR the LASVLRH instance + * @return the description for the VLR +*/ +LAS_DLL char* LASVLR_GetDescription(const LASVLRH hVLR); + +/** Sets the description for the VLR + * @param hVLR the LASVLRH instance + * @param value the value to set for the description. It will be clipped to fit + * within 32 characters + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_SetDescription(LASVLRH hVLR, const char* value); + +/** Returns the record length of the data stored in the VLR + * @param hVLR the LASVLRH instance + * @return the record length of the data stored in the VLR +*/ +LAS_DLL uint16_t LASVLR_GetRecordLength(const LASVLRH hVLR); + +/** Sets the record length of the data stored in the VLR + * @param hVLR the LASVLRH instance + * @param value the length to set for the VLR data length + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_SetRecordLength(LASVLRH hVLR, uint16_t value); + +/** Gets the record id for the VLR + * @param hVLR the LASVLRH instance + * @return the record id for the VLR +*/ +LAS_DLL uint16_t LASVLR_GetRecordId(const LASVLRH hVLR); + +/** Sets the record id for the VLR + * @param hVLR the LASVLRH instance + * @param value the record id to set + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_SetRecordId(LASVLRH hVLR, uint16_t value); + +/** Gets the reserved value of the VLR. This should be 0 and should aways be 0. + * @param hVLR the LASVLRH instance + * @return the reserved value of the VLR. +*/ +LAS_DLL uint16_t LASVLR_GetReserved(const LASVLRH hVLR); + +/** Sets the reserved value of the VLR. This should be 0 and you should not + * have to ever monkey with this value according to the spec. + * @param hVLR the LASVLRH instance + * @param value the value to set for the reserved value + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_SetReserved(LASVLRH hVLR, uint16_t value); + +/** Gets the data stream for the VLR as an array of bytes. The length of this + * array should be the same as LASVLR_GetRecordLength. You must allocate it on + * the heap and you are responsible for its destruction. + * @param hVLR the LASVLRH instance + * @param data a pointer to your array where you want the data copied + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t* data); + +/** Sets the data stream for the VLR as an array of bytes. The length of this + * array should be the same as LASVLR_GetRecordLength. The data are copied into + * the VLR structure. + * @param hVLR the LASVLRH instance + * @param data a pointer to your array. It must be LASVLR_GetRecordLength in size + * @return LASErrorEnum +*/ +LAS_DLL LASError LASVLR_SetData(const LASVLRH hVLR, uint8_t* data, uint16_t length); + + +/****************************************************************************/ +/* Color Operations */ +/****************************************************************************/ + +/** Creates a new Color + * @return a new Color +*/ +LAS_DLL LASColorH LASColor_Create(void); + +/** Destroys a Color and removes it from the heap +*/ +LAS_DLL void LASColor_Destroy(LASColorH hColor); + +/** Returns the red value for the color. + * @return the red value for the color. +*/ +LAS_DLL uint16_t LASColor_GetRed(const LASColorH hColor); + +/** Sets the red value for the color + * @param hColor the opaque pointer to the LASColorH instance + * @param value the value to set the red value to + * @return an error number if an error occured. +*/ +LAS_DLL LASError LASColor_SetRed(LASColorH hColor, uint16_t value); + +/** Returns the green value for the color. + * @return the green value for the color. +*/ +LAS_DLL uint16_t LASColor_GetGreen(const LASColorH hColor); + +/** Sets the green value for the color + * @param hColor the opaque pointer to the LASColorH instance + * @param value the value to set the green value to + * @return an error number if an error occured. +*/ +LAS_DLL LASError LASColor_SetGreen(LASColorH hColor, uint16_t value); + +/** Returns the blue value for the color. + * @return the blue value for the color. +*/ +LAS_DLL uint16_t LASColor_GetBlue(const LASColorH hColor); + +/** Sets the blue value for the color + * @param hColor the opaque pointer to the LASColorH instance + * @param value the value to set the blue value to + * @return an error number if an error occured. +*/ +LAS_DLL LASError LASColor_SetBlue(LASColorH hColor, uint16_t value); + + +/** Returns the color for the LASPointH + * @return the color for the LASPointH. +*/ +LAS_DLL LASColorH LASPoint_GetColor(const LASPointH hPoint); + +/** Sets the color for the point + * @param hPoint the opaque pointer to the LASPointH instance + * @param hColor the opaque pointer to the LASColorH instance + * @return an error number if an error occured. +*/ +LAS_DLL LASError LASPoint_SetColor(LASPointH hPoint, const LASColorH hColor); + + +/****************************************************************************/ +/* SRS Operations */ +/****************************************************************************/ + +/** Creates a new SRS + * @return a new SRS +*/ +LAS_DLL LASSRSH LASSRS_Create(void); + + +LAS_DLL const GTIF* LASSRS_GetGTIF(LASSRSH hSRS); +LAS_DLL char* LASSRS_GetWKT(LASSRSH hSRS); +LAS_DLL LASError LASSRS_SetWKT(LASSRSH hSRS, const char* value); +LAS_DLL char* LASSRS_GetProj4(LASSRSH hSRS); +LAS_DLL LASError LASSRS_SetProj4(LASSRSH hSRS, const char* value); +LAS_DLL LASSRSH LASHeader_GetSRS(const LASHeaderH hHeader); +LAS_DLL LASError LASHeader_SetSRS(LASHeaderH hHeader, const LASSRSH hSRS); +LAS_DLL void LASSRS_Destroy(LASSRSH hSRS); +LAS_DLL LASVLRH LASSRS_GetVLR(const LASSRSH hSRS, uint32_t i); +LAS_DLL uint32_t LASSRS_GetVLRCount(const LASSRSH hSRS); + +/** Method to ensure that you are freeing char*'s from the + * correct heap. + * @param string the string to free +*/ +LAS_DLL void LASString_Free(char* string); + +LAS_C_END +#endif + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/cstdint.hpp work/libLAS-1.2.1/include/liblas/cstdint.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/cstdint.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/cstdint.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,173 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Integer types definitions + * Author: Mateusz Loskot, mateusz@loskot.net + * + * This file has been stolen from and + * modified for libLAS purposes. + * + * (C) Copyright Mateusz Loskot 2007, mateusz@loskot.net + * (C) Copyright Phil Vachon 2007, philippe@cowpig.ca + * (C) Copyright John Maddock 2001 + * (C) Copyright Jens Mauer 2001 + * (C) Copyright Beman Dawes 1999 + * Distributed under the Boost Software License, Version 1.0. + * (See accompanying file LICENSE_1_0.txt or copy at + * http://www.boost.org/LICENSE_1_0.txt) + * + ****************************************************************************** + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_CSTDINT_HPP_INCLUDED +#define LIBLAS_CSTDINT_HPP_INCLUDED + +#ifdef LIBLAS_C_API +# include +# ifndef _MSC_VER +# include +# endif /* _MSC_VER */ +#else /* LIBLAS_C_API */ +# include +namespace liblas +{ +#endif /* LIBLAS_C_API */ + +/* +// These are fairly safe guesses for some 16-bit, and most 32-bit and 64-bit +// platforms. For other systems, they will have to be hand tailored. +// +// Because the fast types are assumed to be the same as the undecorated types, +// it may be possible to hand tailor a more efficient implementation. Such +// an optimization may be illusionary; on the Intel x86-family 386 on, for +// example, byte arithmetic and load/stores are as fast as "int" sized ones. + +// 8-bit types ------------------------------------------------------------// +*/ + +#ifndef UINT8_C +# if UCHAR_MAX == 0xff + typedef unsigned char uint8_t; + typedef signed char int8_t; +# else +# error defaults not correct; you must hand modify liblas/cstdint.hpp +# endif +#else +# ifndef LIBLAS_C_API + typedef ::uint8_t uint8_t; + typedef ::int8_t int8_t; +# endif + +#endif /* UINT8_C */ + +/* +// 16-bit types -----------------------------------------------------------// +*/ + +#ifndef UINT16_C +# if USHRT_MAX == 0xffff + typedef unsigned short uint16_t; + typedef short int16_t; +# else +# error defaults not correct; you must hand modify liblas/cstdint.hpp +# endif +#else +# ifndef LIBLAS_C_API + typedef ::uint16_t uint16_t; + typedef ::int16_t int16_t; +# endif +#endif /* UINT16_C */ + +/* +// 32-bit types -----------------------------------------------------------// +*/ + +#ifndef UINT32_C +# if ULONG_MAX == 0xffffffff + typedef unsigned long uint32_t; +# elif UINT_MAX == 0xffffffff + typedef unsigned int uint32_t; +# else +# error defaults not correct; you must hand modify liblas/cstdint.hpp +# endif +#else +# ifndef LIBLAS_C_API + typedef ::uint32_t uint32_t; +# endif +#endif /* UINT32_C */ + +#ifndef INT32_C +# if ULONG_MAX == 0xffffffff + typedef long int32_t; +# elif UINT_MAX == 0xffffffff + typedef int int32_t; +# else +# error defaults not correct; you must hand modify liblas/cstdint.hpp +# endif +#else +# ifndef LIBLAS_C_API + typedef ::int32_t int32_t; +# endif +#endif /* INT32_C */ + +/* +// 64-bit types + intmax_t and uintmax_t ----------------------------------// +*/ + +#ifndef UINT64_C +# if ULONG_MAX != 0xffffffffu +# if ULONG_MAX == 18446744073709551615u /* 2**64 - 1 */ + typedef long int64_t; + typedef unsigned long uint64_t; +# else +# error defaults not correct; you must hand modify boost/cstdint.hpp +# endif +# elif defined(__GNUC__) || defined(HAVE_LONG_LONG) + __extension__ typedef long long int64_t; + __extension__ typedef unsigned long long uint64_t; +# elif defined(_MSC_VER) +/* // we have Borland/Intel/Microsoft __int64: */ + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; +# else /* // assume no 64-bit integers */ +# define LIBLAS_NO_INT64_T +# endif +#endif /* UINT64_C */ + +#ifndef LIBLAS_C_API +} /* namespace liblas */ +#endif /* LIBLAS_C_API */ + +#endif /* LIBLAS_CSTDINT_HPP_INCLUDED */ + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/endian.hpp work/libLAS-1.2.1/include/liblas/detail/endian.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/endian.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/endian.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,127 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Endian macros + * Author: Mateusz Loskot, mateusz@loskot.net + * + * This file has been stolen from and + * modified for libLAS purposes. + * + * (C) Copyright Mateusz Loskot 2007, mateusz@loskot.net + * (C) Copyright Caleb Epstein 2005 + * (C) Copyright John Maddock 2006 + * Distributed under the Boost Software License, Version 1.0. + * (See accompanying file LICENSE_1_0.txt or copy at + * http://www.boost.org/LICENSE_1_0.txt) + * + * Revision History + * 06 Feb 2006 - Initial Revision + * 09 Nov 2006 - fixed variant and version bits for v4 guids + * 13 Nov 2006 - added serialization + * 17 Nov 2006 - added name-based guid creation + * 20 Nov 2006 - add fixes for gcc (from Tim Blechmann) + * 07 Mar 2007 - converted to header only + * 20 Jan 2008 - removed dependency of Boost and modified for libLAS (by Mateusz Loskot) + ****************************************************************************** + * + * Copyright (c) 1997 + * Silicon Graphics Computer Systems, Inc. + * + * Permission to use, copy, modify, distribute and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. Silicon Graphics makes no + * representations about the suitability of this software for any + * purpose. It is provided "as is" without express or implied warranty. + * + * + * + * Copyright notice reproduced from , from + * which this code was originally taken. + * + * Modified by Caleb Epstein to use with GNU libc and to + * defined the BOOST_ENDIAN macro. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_ENDIAN_HPP_INCLUDED +#define LIBLAS_DETAIL_ENDIAN_HPP_INCLUDED + +// GNU libc offers the helpful header which defines +// __BYTE_ORDER + +#if defined (__GLIBC__) +# include +# if (__BYTE_ORDER == __LITTLE_ENDIAN) +# define LIBLAS_LITTLE_ENDIAN +# elif (__BYTE_ORDER == __BIG_ENDIAN) +# define LIBLAS_BIG_ENDIAN +# elif (__BYTE_ORDER == __PDP_ENDIAN) +# define LIBLAS_PDP_ENDIAN +# else +# error Unknown machine endianness detected. +# endif +# define LIBLAS_BYTE_ORDER __BYTE_ORDER +#elif defined(_BIG_ENDIAN) +# define LIBLAS_BIG_ENDIAN +# define LIBLAS_BYTE_ORDER 4321 +#elif defined(_LITTLE_ENDIAN) +# define LIBLAS_LITTLE_ENDIAN +# define LIBLAS_BYTE_ORDER 1234 + +// If they're both defined, we're assuming little for now. See http://liblas.org/ticket/133 +#elif defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) +# define LIBLAS_LITTLE_ENDIAN +# define LIBLAS_BYTE_ORDER 1234 + +#elif defined(__sparc) || defined(__sparc__) \ + || defined(_POWER) || defined(__powerpc__) \ + || defined(__ppc__) || defined(__hpux) \ + || defined(_MIPSEB) || defined(_POWER) \ + || defined(__s390__) +# define LIBLAS_BIG_ENDIAN +# define LIBLAS_BYTE_ORDER 4321 +#elif defined(__i386__) || defined(__alpha__) \ + || defined(__ia64) || defined(__ia64__) \ + || defined(_M_IX86) || defined(_M_IA64) \ + || defined(_M_ALPHA) || defined(__amd64) \ + || defined(__amd64__) || defined(_M_AMD64) \ + || defined(__x86_64) || defined(__x86_64__) \ + || defined(_M_X64) + +# define LIBLAS_LITTLE_ENDIAN +# define LIBLAS_BYTE_ORDER 1234 +#else +# error The file liblas/detail/endian.hpp needs to be set up for your CPU type. +#endif + + +#if defined(LIBLAS_BIG_ENDIAN) +# define LIBLAS_SWAP_BYTES(p) \ + do { \ + char* first = static_cast(static_cast(&p)); \ + char* last = first + sizeof(p) - 1; \ + for(; first < last; ++first, --last) { \ + char const x = *last; \ + *last = *first; \ + *first = x; \ + }} while(false) + +# define LIBLAS_SWAP_BYTES_N(p, n) \ + do { \ + char* first = static_cast(static_cast(&p)); \ + char* last = first + n - 1; \ + for(; first < last; ++first, --last) { \ + char const x = *last; \ + *last = *first; \ + *first = x; \ + }} while(false) + +#else +# define LIBLAS_SWAP_BYTES(p) do {} while(false) +# define LIBLAS_SWAP_BYTES_N(p, n) do {} while(false) +#endif // LIBLAS_BIG_ENDIAN + +#endif // LIBLAS_DETAIL_ENDIAN_HPP_INCLUDED + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/file.hpp work/libLAS-1.2.1/include/liblas/detail/file.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/file.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/file.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,90 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A composite class to handle read/write operations + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_FILE_HPP_INCLUDED +#define LIBLAS_DETAIL_FILE_HPP_INCLUDED + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace liblas { namespace detail { + +class FileImpl +{ +public: + + FileImpl(std::string const& filename); + FileImpl(std::string const& filename, LASHeader const& header, int mode); + ~FileImpl(); + + std::string GetName() const; + int GetMode() const; + LASHeader const& GetHeader() const; + LASReader& GetReader(); + LASWriter& GetWriter(); + +private: + + // Blocked copying operations, declared but not defined. + FileImpl(FileImpl const& other); + FileImpl& operator=(FileImpl const& rhs); + + int m_mode; + std::string m_filename; + std::istream* m_istrm; + std::ostream* m_ostrm; + LASReader* m_reader; + LASWriter* m_writer; + LASHeader m_header; + + void throw_no_file_error() const; +}; + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_FILE_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/fwd.hpp work/libLAS-1.2.1/include/liblas/detail/fwd.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/fwd.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/fwd.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,64 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Forward declarations for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_FWD_HPP_INCLUDED +#define LIBLAS_DETAIL_FWD_HPP_INCLUDED + +// Forward declarations +namespace liblas { + +class LASHeader; +class LASPoint; +class LASReader; +class LASWriter; +class LASColor; +class LASSpatialReference; + +namespace detail { + +class Reader; +class Writer; +struct PointRecord; +struct Color; + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_FWD_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader.hpp work/libLAS-1.2.1/include/liblas/detail/reader.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/reader.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,110 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Reader implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_READER_HPP_INCLUDED +#define LIBLAS_DETAIL_READER_HPP_INCLUDED + +#include +#include +#include + +#ifndef HAVE_GDAL + typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH; + typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH; +#endif + +// std +#include + +namespace liblas { namespace detail { + +struct PointRecord; + +class Reader +{ +public: + + Reader(std::istream& ifs); + virtual ~Reader(); + virtual std::size_t GetVersion() const = 0; + virtual bool ReadHeader(LASHeader& header) = 0; + virtual bool ReadNextPoint(LASPoint& point, const LASHeader& header) = 0; + virtual bool ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) = 0; + + std::istream& GetStream() const; + bool ReadVLR(LASHeader& header); + bool ReadGeoreference(LASHeader& header); + void Reset(LASHeader const& header); + void SetSRS(const LASSpatialReference& srs); + +protected: + + std::istream& m_ifs; + uint32_t m_size; + uint32_t m_current; + LASSpatialReference m_out_srs; + LASSpatialReference m_in_srs; + OGRCoordinateTransformationH m_transform; + OGRSpatialReferenceH m_in_ref; + OGRSpatialReferenceH m_out_ref; + + void FillPoint(PointRecord& record, LASPoint& point); + void Project(LASPoint& point); + +private: + + // Blocked copying operations, declared but not defined. + Reader(Reader const& other); + Reader& operator=(Reader const& rhs); +}; + +class ReaderFactory +{ +public: + + // TODO: prototypes + static Reader* Create(std::istream& ifs); + static void Destroy(Reader* p); +}; + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_READER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader10.hpp work/libLAS-1.2.1/include/liblas/detail/reader10.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader10.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/reader10.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,68 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.0 reader implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_READER10_HPP_INCLUDED +#define LIBLAS_DETAIL_READER10_HPP_INCLUDED + +#include +#include +// std +#include + +namespace liblas { namespace detail { namespace v10 { + +class ReaderImpl : public Reader +{ +public: + + typedef Reader Base; + + ReaderImpl(std::istream& ifs); + std::size_t GetVersion() const; + bool ReadHeader(LASHeader& header); + bool ReadNextPoint(LASPoint& point, const LASHeader& header); + bool ReadPointAt(std::size_t n, LASPoint& record, const LASHeader& header); + +}; + +}}} // namespace liblas::detail::v10 + +#endif // LIBLAS_DETAIL_READER10_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader11.hpp work/libLAS-1.2.1/include/liblas/detail/reader11.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader11.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/reader11.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,68 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.1 reader implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_READER11_HPP_INCLUDED +#define LIBLAS_DETAIL_READER11_HPP_INCLUDED + +#include +#include +// std +#include + +namespace liblas { namespace detail { namespace v11 { + +class ReaderImpl : public Reader +{ +public: + + typedef Reader Base; + + ReaderImpl(std::istream& ifs); + std::size_t GetVersion() const; + bool ReadHeader(LASHeader& header); + bool ReadNextPoint(LASPoint& point, const LASHeader& header); + bool ReadPointAt(std::size_t n, LASPoint& record, const LASHeader& header); + +}; + +}}} // namespace liblas::detail::v11 + +#endif // LIBLAS_DETAIL_READER11_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader12.hpp work/libLAS-1.2.1/include/liblas/detail/reader12.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/reader12.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/reader12.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,68 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.2 reader implementation for C++ libLAS + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_READER12_HPP_INCLUDED +#define LIBLAS_DETAIL_READER12_HPP_INCLUDED + +#include +#include +// std +#include + +namespace liblas { namespace detail { namespace v12 { + +class ReaderImpl : public Reader +{ +public: + + typedef Reader Base; + + ReaderImpl(std::istream& ifs); + std::size_t GetVersion() const; + bool ReadHeader(LASHeader& header); + bool ReadNextPoint(LASPoint& point, LASHeader const& header); + bool ReadPointAt(std::size_t n, LASPoint& record, LASHeader const& header); + +}; + +}}} // namespace liblas::detail::v12 + +#endif // LIBLAS_DETAIL_READER12_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/sha1.hpp work/libLAS-1.2.1/include/liblas/detail/sha1.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/sha1.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/sha1.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,625 @@ +// $Id$ +// +// sha1.h +// +// Copyright (C) 1998 +// Paul E. Jones +// All Rights Reserved. +// +// This software is licensed as "freeware." Permission to distribute +// this software in source and binary forms is hereby granted without +// a fee. THIS SOFTWARE IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// THE AUTHOR SHALL NOT BE HELD LIABLE FOR ANY DAMAGES RESULTING +// FROM THE USE OF THIS SOFTWARE, EITHER DIRECTLY OR INDIRECTLY, INCLUDING, +// BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE. +// +////////////////////////////////////////////////////////////////////////////// +// ###Id: sha1.h,v 1.6 2004/03/27 18:02:26 paulej Exp ### +// Modified March 7, 2007 - Andy Tompkins - change to a header only library +////////////////////////////////////////////////////////////////////////////// +// +// Description: +// This class implements the Secure Hashing Standard as defined +// in FIPS PUB 180-1 published April 17, 1995. +// +// Many of the variable names in this class, especially the single +// character names, were used because those were the names used +// in the publication. +// +// The Secure Hashing Standard, which uses the Secure Hashing +// Algorithm (SHA), produces a 160-bit message digest for a +// given data stream. In theory, it is highly improbable that +// two messages will produce the same message digest. Therefore, +// this algorithm can serve as a means of providing a "fingerprint" +// for a message. +// +// Portability Issues: +// SHA-1 is defined in terms of 32-bit "words". This code was +// written with the expectation that the processor has at least +// a 32-bit machine word size. If the machine word size is larger, +// the code should still function properly. One caveat to that +// is that the input functions taking characters and character arrays +// assume that only 8 bits of information are stored in each character. +// +// Caveats: +// SHA-1 is designed to work with messages less than 2^64 bits long. +// Although SHA-1 allows a message digest to be generated for +// messages of any number of bits less than 2^64, this implementation +// only works with messages with a length that is a multiple of 8 +// bits. +// +#ifndef LIBLAS_SHA1_HPP_INCLUDED +#define LIBLAS_SHA1_HPP_INCLUDED + +namespace liblas { namespace detail { + +class SHA1 +{ +public: + /* + * SHA1 + * + * Description: + * This is the constructor for the sha1 class. + * + * Parameters: + * None. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + SHA1() + { + Reset(); + } + + /* + * ~SHA1 + * + * Description: + * This is the destructor for the sha1 class + * + * Parameters: + * None. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + ~SHA1() + { + // The destructor does nothing + } + + /* + * Reset + * + * Description: + * This function will initialize the sha1 class member variables + * in preparation for computing a new message digest. + * + * Parameters: + * None. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + void Reset() + { + Length_Low = 0; + Length_High = 0; + Message_Block_Index = 0; + + H[0] = 0x67452301; + H[1] = 0xEFCDAB89; + H[2] = 0x98BADCFE; + H[3] = 0x10325476; + H[4] = 0xC3D2E1F0; + + Computed = false; + Corrupted = false; + } + + /* + * Result + * + * Description: + * This function will return the 160-bit message digest into the + * array provided. + * + * Parameters: + * message_digest_array: [out] + * This is an array of five unsigned integers which will be filled + * with the message digest that has been computed. + * + * Returns: + * True if successful, false if it failed. + * + * Comments: + * + */ + bool Result(unsigned *message_digest_array) + { + int i; // Counter + + if (Corrupted) + { + return false; + } + + if (!Computed) + { + PadMessage(); + Computed = true; + } + + for(i = 0; i < 5; i++) + { + message_digest_array[i] = H[i]; + } + + return true; + } + + /* + * Input + * + * Description: + * This function accepts an array of octets as the next portion of + * the message. + * + * Parameters: + * message_array: [in] + * An array of characters representing the next portion of the + * message. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + void Input( const unsigned char *message_array, + unsigned length) + { + if (!length) + { + return; + } + + if (Computed || Corrupted) + { + Corrupted = true; + return; + } + + while(length-- && !Corrupted) + { + Message_Block[Message_Block_Index++] = (*message_array & 0xFF); + + Length_Low += 8; + Length_Low &= 0xFFFFFFFF; // Force it to 32 bits + if (Length_Low == 0) + { + Length_High++; + Length_High &= 0xFFFFFFFF; // Force it to 32 bits + if (Length_High == 0) + { + Corrupted = true; // Message is too long + } + } + + if (Message_Block_Index == 64) + { + ProcessMessageBlock(); + } + + message_array++; + } + } + + /* + * Input + * + * Description: + * This function accepts an array of octets as the next portion of + * the message. + * + * Parameters: + * message_array: [in] + * An array of characters representing the next portion of the + * message. + * length: [in] + * The length of the message_array + * + * Returns: + * Nothing. + * + * Comments: + * + */ + void Input( const char *message_array, + unsigned length) + { + Input((unsigned char *) message_array, length); + } + + /* + * Input + * + * Description: + * This function accepts a single octets as the next message element. + * + * Parameters: + * message_element: [in] + * The next octet in the message. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + void Input(unsigned char message_element) + { + Input(&message_element, 1); + } + + /* + * Input + * + * Description: + * This function accepts a single octet as the next message element. + * + * Parameters: + * message_element: [in] + * The next octet in the message. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + void Input(char message_element) + { + Input((unsigned char *) &message_element, 1); + } + + /* + * operator<< + * + * Description: + * This operator makes it convenient to provide character strings to + * the SHA1 object for processing. + * + * Parameters: + * message_array: [in] + * The character array to take as input. + * + * Returns: + * A reference to the SHA1 object. + * + * Comments: + * Each character is assumed to hold 8 bits of information. + * + */ + SHA1& operator<<(const char *message_array) + { + const char *p = message_array; + + while(*p) + { + Input(*p); + p++; + } + + return *this; + } + + /* + * operator<< + * + * Description: + * This operator makes it convenient to provide character strings to + * the SHA1 object for processing. + * + * Parameters: + * message_array: [in] + * The character array to take as input. + * + * Returns: + * A reference to the SHA1 object. + * + * Comments: + * Each character is assumed to hold 8 bits of information. + * + */ + SHA1& operator<<(const unsigned char *message_array) + { + const unsigned char *p = message_array; + + while(*p) + { + Input(*p); + p++; + } + + return *this; + } + + /* + * operator<< + * + * Description: + * This function provides the next octet in the message. + * + * Parameters: + * message_element: [in] + * The next octet in the message + * + * Returns: + * A reference to the SHA1 object. + * + * Comments: + * The character is assumed to hold 8 bits of information. + * + */ + SHA1& operator<<(const char message_element) + { + Input((unsigned char *) &message_element, 1); + + return *this; + } + + /* + * operator<< + * + * Description: + * This function provides the next octet in the message. + * + * Parameters: + * message_element: [in] + * The next octet in the message + * + * Returns: + * A reference to the SHA1 object. + * + * Comments: + * The character is assumed to hold 8 bits of information. + * + */ + SHA1& operator<<(const unsigned char message_element) + { + Input(&message_element, 1); + + return *this; + } + +private: + /* + * ProcessMessageBlock + * + * Description: + * This function will process the next 512 bits of the message + * stored in the Message_Block array. + * + * Parameters: + * None. + * + * Returns: + * Nothing. + * + * Comments: + * Many of the variable names in this function, especially the single + * character names, were used because those were the names used + * in the publication. + * + */ + void ProcessMessageBlock() + { + const unsigned K[] = { // Constants defined for SHA-1 + 0x5A827999, + 0x6ED9EBA1, + 0x8F1BBCDC, + 0xCA62C1D6 + }; + int t; // Loop counter + unsigned temp; // Temporary word value + unsigned W[80]; // Word sequence + unsigned A, B, C, D, E; // Word buffers + + /* + * Initialize the first 16 words in the array W + */ + for(t = 0; t < 16; t++) + { + W[t] = ((unsigned) Message_Block[t * 4]) << 24; + W[t] |= ((unsigned) Message_Block[t * 4 + 1]) << 16; + W[t] |= ((unsigned) Message_Block[t * 4 + 2]) << 8; + W[t] |= ((unsigned) Message_Block[t * 4 + 3]); + } + + for(t = 16; t < 80; t++) + { + W[t] = CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]); + } + + A = H[0]; + B = H[1]; + C = H[2]; + D = H[3]; + E = H[4]; + + for(t = 0; t < 20; t++) + { + temp = CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0]; + temp &= 0xFFFFFFFF; + E = D; + D = C; + C = CircularShift(30,B); + B = A; + A = temp; + } + + for(t = 20; t < 40; t++) + { + temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1]; + temp &= 0xFFFFFFFF; + E = D; + D = C; + C = CircularShift(30,B); + B = A; + A = temp; + } + + for(t = 40; t < 60; t++) + { + temp = CircularShift(5,A) + + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]; + temp &= 0xFFFFFFFF; + E = D; + D = C; + C = CircularShift(30,B); + B = A; + A = temp; + } + + for(t = 60; t < 80; t++) + { + temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3]; + temp &= 0xFFFFFFFF; + E = D; + D = C; + C = CircularShift(30,B); + B = A; + A = temp; + } + + H[0] = (H[0] + A) & 0xFFFFFFFF; + H[1] = (H[1] + B) & 0xFFFFFFFF; + H[2] = (H[2] + C) & 0xFFFFFFFF; + H[3] = (H[3] + D) & 0xFFFFFFFF; + H[4] = (H[4] + E) & 0xFFFFFFFF; + + Message_Block_Index = 0; + } + + /* + * PadMessage + * + * Description: + * According to the standard, the message must be padded to an even + * 512 bits. The first padding bit must be a '1'. The last 64 bits + * represent the length of the original message. All bits in between + * should be 0. This function will pad the message according to those + * rules by filling the message_block array accordingly. It will also + * call ProcessMessageBlock() appropriately. When it returns, it + * can be assumed that the message digest has been computed. + * + * Parameters: + * None. + * + * Returns: + * Nothing. + * + * Comments: + * + */ + void PadMessage() + { + /* + * Check to see if the current message block is too small to hold + * the initial padding bits and length. If so, we will pad the + * block, process it, and then continue padding into a second block. + */ + if (Message_Block_Index > 55) + { + Message_Block[Message_Block_Index++] = 0x80; + while(Message_Block_Index < 64) + { + Message_Block[Message_Block_Index++] = 0; + } + + ProcessMessageBlock(); + + while(Message_Block_Index < 56) + { + Message_Block[Message_Block_Index++] = 0; + } + } + else + { + Message_Block[Message_Block_Index++] = 0x80; + while(Message_Block_Index < 56) + { + Message_Block[Message_Block_Index++] = 0; + } + + } + + /* + * Store the message length as the last 8 octets + */ + Message_Block[56] = static_cast((Length_High >> 24) & 0xFF); + Message_Block[57] = static_cast((Length_High >> 16) & 0xFF); + Message_Block[58] = static_cast((Length_High >> 8) & 0xFF); + Message_Block[59] = static_cast((Length_High) & 0xFF); + Message_Block[60] = static_cast((Length_Low >> 24) & 0xFF); + Message_Block[61] = static_cast((Length_Low >> 16) & 0xFF); + Message_Block[62] = static_cast((Length_Low >> 8) & 0xFF); + Message_Block[63] = static_cast((Length_Low) & 0xFF); + + ProcessMessageBlock(); + } + + + /* + * CircularShift + * + * Description: + * This member function will perform a circular shifting operation. + * + * Parameters: + * bits: [in] + * The number of bits to shift (1-31) + * word: [in] + * The value to shift (assumes a 32-bit integer) + * + * Returns: + * The shifted value. + * + * Comments: + * + */ + unsigned CircularShift(int bits, unsigned word) + { + return ((word << bits) & 0xFFFFFFFF) | ((word & 0xFFFFFFFF) >> (32-bits)); + } + +private: + unsigned H[5]; // Message digest buffers + + unsigned Length_Low; // Message length in bits + unsigned Length_High; // Message length in bits + + unsigned char Message_Block[64]; // 512-bit message blocks + int Message_Block_Index; // Index into message block array + + bool Computed; // Is the digest computed? + bool Corrupted; // Is the message digest corruped? +}; + +}} //namespace liblas::detail + +#endif // LIBLAS_SHA1_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/sharedptr.hpp work/libLAS-1.2.1/include/liblas/detail/sharedptr.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/sharedptr.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/sharedptr.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,132 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Shared pointer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * The SharedPtr class is based on implementation of CountedPtr + * from the book "The C++ Standard Library - A Tutorial and Reference" + * + * (C) Copyright Nicolai M. Josuttis 1999 + * (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net (modifications) + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_SHAREDPTR_HPP_INCLUDED +#define LIBLAS_DETAIL_SHAREDPTR_HPP_INCLUDED +#include + +namespace liblas { namespace detail { + +template +class SharedPtr +{ +public: + + // Initialize pointer with existing pointer, where pointer p + // is required to be a return value of new operator + // TODO: Relax the "0 != p requirement" + // m_count(new long(p ? 1 : 0)) + explicit SharedPtr(T* p = 0) + : m_ptr(p), m_count(new long(1)) + {} + + // Copy pointer (one more owner) + SharedPtr(SharedPtr const& other) throw() + : m_ptr(other.m_ptr), m_count(other.m_count) + { + ++*m_count; + } + + // Destructor (delete value if this was the last owner) + ~SharedPtr() throw() + { + dispose(); + } + + // Assignment operator (unshare old and share new value) + SharedPtr& operator=(SharedPtr const& rhs) throw() + { + if (&rhs != this) + { + dispose(); + m_ptr = rhs.m_ptr; + m_count = rhs.m_count; + ++*m_count; + } + return *this; + } + + T& operator*() const throw() + { + assert(0 != m_ptr); + return *m_ptr; + } + + T* operator->() const throw() + { + assert(0 != m_ptr); + return m_ptr; + } + + T* get() const + { + return m_ptr; + } + + long use_count() const + { + return (*m_count); + } + +private: + + T* m_ptr; + long* m_count; // shared number of owners + + void dispose() + { + + if (--*m_count == 0) + { + delete m_count; + delete m_ptr; + } + } + +}; + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_SHAREDPTR_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/timer.hpp work/libLAS-1.2.1/include/liblas/detail/timer.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/timer.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/timer.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,102 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A simple timing class for performance tuning + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_TIMER_HPP_INCLUDED +#define LIBLAS_DETAIL_TIMER_HPP_INCLUDED + +#ifdef WIN32 +#include +#else +#include // gettimeofday +#endif + +namespace liblas { namespace detail { + +class Timer +{ +public: + + Timer() + { +#ifdef WIN32 + LARGE_INTEGER rfreq = { 0 }; + QueryPerformanceFrequency(&rfreq); + m_freq = rfreq.LowPart / double(1000); +#endif + } + + void start() + { +#ifdef WIN32 + QueryPerformanceCounter(&m_start); +#else + gettimeofday(&m_start, 0); +#endif + } + + double stop() + { +#ifdef WIN32 + QueryPerformanceCounter(&m_stop); + return (m_stop.LowPart - m_start.LowPart) / m_freq; +#else + gettimeofday(&m_stop, 0); + return (m_stop.tv_sec - m_start.tv_sec) * double(1000) + + (m_stop.tv_usec - m_start.tv_usec) / double(1000); +#endif + } + +private: + +#ifdef WIN32 + double m_freq; + LARGE_INTEGER m_start; + LARGE_INTEGER m_stop; +#else + timeval m_start; + timeval m_stop; +#endif + +}; + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_TIMER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/utility.hpp work/libLAS-1.2.1/include/liblas/detail/utility.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/utility.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/utility.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,490 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A grab bucket 'o fun for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_UTILITY_HPP_INCLUDED +#define LIBLAS_DETAIL_UTILITY_HPP_INCLUDED + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// +// Private macros definition +// + +#ifndef UNREFERENCED_PARAMETER +#define UNREFERENCED_PARAMETER(param) ((void)param) +#endif + +// +// Private utilities for internal use in libLAS +// + +namespace liblas { namespace detail { + +/// Simple RAII wrapper. +/// It's dedicated to use with types associated with custom deleter, +/// opaque pointers and C API objects. +template +class raii_wrapper +{ + typedef void(*deleter_type)(T* p); + +public: + + raii_wrapper(T* p, deleter_type d) + : p_(p), del_(d) + { + assert(0 != p_); + assert(0 != del_); + } + + // FIXME: ooh, this is really, really bad. - hobu + raii_wrapper& operator=(raii_wrapper const& rhs) + { + if (&rhs != this) + { + p_ = rhs.p_; + del_ = rhs.del_; + } + return *this; + } + + + ~raii_wrapper() + { + do_delete(p_); + } + + void reset(T* p) + { + do_delete(p_); + p_= p; + } + + T* get() const + { + return p_; + } + + void swap(raii_wrapper& other) + { + std::swap(p_, other.p_); + } + + +private: + + raii_wrapper(raii_wrapper const& other); + // raii_wrapper& operator=(raii_wrapper const& rhs); + + void do_delete(T* p) + { + assert(del_); + if (0 != p) + del_(p); + } + + T* p_; + deleter_type del_; +}; + + +/// Definition of variable-length record header. +struct VLRHeader +{ + uint16_t reserved; + char userId[16]; + uint16_t recordId; + uint16_t recordLengthAfterHeader; + char description[32]; +}; + +struct GeoKeysHeader +{ + uint16_t keyDirectoryVersion; + uint16_t keyRevision; + uint16_t minorRevision; + uint16_t numberOfKeys; +}; + +struct GeoKeyEntry +{ + uint16_t keyId; + uint16_t tiffTagLocation; + uint16_t count; + uint16_t valueOffset; +}; + +class VariableLengthRecord +{ + VariableLengthRecord() + : reserved(0), record_id(0), record_length_after_header(0) + { + std::memset(user_id, 0, eUserIdSize); + std::memset(description, 0, eDescriptionSize); + } + + enum + { + eUserIdSize = 16, + eDescriptionSize = 32 + }; + + uint16_t reserved; + int8_t user_id[eUserIdSize]; + uint16_t record_id; + uint16_t record_length_after_header; + int8_t description[eDescriptionSize]; + uint8_t data; +}; + +struct PointRecord +{ + PointRecord() : + x(0), y(0), z(0), + intensity(0), + flags(0), + classification(0), + scan_angle_rank(0), + user_data(0), + point_source_id(0) + {} + + int32_t x; + int32_t y; + int32_t z; + uint16_t intensity; + uint8_t flags; // TODO: Replace with portable std::bitset<8> + uint8_t classification; + int8_t scan_angle_rank; + uint8_t user_data; // 1.0: File Marker / 1.1: User Data + uint16_t point_source_id; // 1.0: User Bit field / 1.1: Point Source ID +}; + +template +bool compare_distance(const T& actual, const T& expected); + +template +struct Point +{ + Point() + : x(T()), y(T()), z(T()) + {} + + Point(T const& x, T const& y, T const& z) + : x(x), y(y), z(z) + {} + + bool equal(Point const& other) const + { + return (compare_distance(x, other.x) + && compare_distance(y, other.y) + && compare_distance(z, other.z)); + } + + T x; + T y; + T z; +}; + +template +bool operator==(Point const& lhs, Point const& rhs) +{ + return lhs.equal(rhs); +} + +template +bool operator!=(Point const& lhs, Point const& rhs) +{ + return (!lhs.equal(rhs)); +} + +template +struct Extents +{ + Extents() {} + Extents(detail::Point const& min, detail::Point const& max) + : min(min), max(max) + {} + + bool equal(Extents const& other) const + { + return (min == other.min && max == other.max); + } + + typename detail::Point min; + typename detail::Point max; +}; + +template +bool operator==(Extents const& lhs, Extents const& rhs) +{ + return lhs.equal(rhs); +} + +template +bool operator!=(Extents const& lhs, Extents const& rhs) +{ + return (!lhs.equal(rhs)); +} + +template +inline T generate_random_byte() +{ + // Requires pseudo-random numbers generator to be initialized + // in create_random_based() function - a poor man solution. + T const rmin = std::numeric_limits::min(); + T const rmax = std::numeric_limits::max(); + unsigned int const rnd = std::rand() % rmax + rmin; + + assert(rnd <= 255); + return static_cast(rnd); +} + +template +bool compare_distance(const T& actual, const T& expected) +{ + const T epsilon = std::numeric_limits::epsilon(); + const T diff = actual - expected; + + if ( !((diff <= epsilon) && (diff >= -epsilon )) ) + { + return false; + } + + return true; +} + +template +inline char* as_buffer(T& data) +{ + return static_cast(static_cast(&data)); +} + +template +inline char* as_buffer(T* data) +{ + return static_cast(static_cast(data)); +} + +template +inline char const* as_bytes(T const& data) +{ + return static_cast(static_cast(&data)); +} + +template +inline char const* as_bytes(T const* data) +{ + return static_cast(static_cast(data)); +} + +template +inline void check_stream_state(std::basic_ios& srtm) +{ + // NOTE: Detailed stream check disabled in optimized + // builds to increase performance. +#if defined(DEBUG) || defined(_DEBUG) + // Test stream state bits + if (srtm.eof()) + throw std::out_of_range("end of file encountered"); + else if (srtm.fail()) + throw std::runtime_error("non-fatal I/O error occured"); + else if (srtm.bad()) + throw std::runtime_error("fatal I/O error occured"); +#else + UNREFERENCED_PARAMETER(srtm); +#endif +} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4127) // conditional expression is constant. +#endif + +template +inline void read_n(T& dest, std::istream& src, std::streamsize const& num) +{ + // TODO: Review and redesign errors handling logic if necessary + if (!src) + throw std::runtime_error("detail::liblas::read_n input stream is not readable"); + + src.read(detail::as_buffer(dest), num); + + // Fix little-endian + LIBLAS_SWAP_BYTES_N(dest, num); + + check_stream_state(src); +} + +template <> +inline void read_n(PointRecord& dest, std::istream& src, std::streamsize const& num) +{ + // TODO: Review and redesign errors handling logic if necessary + if (!src) + throw std::runtime_error("detail::liblas::read_n input stream is not readable"); + + src.read(detail::as_buffer(dest), num); + check_stream_state(src); + + // Fix little-endian + LIBLAS_SWAP_BYTES(dest.x); + LIBLAS_SWAP_BYTES(dest.y); + LIBLAS_SWAP_BYTES(dest.z); + LIBLAS_SWAP_BYTES(dest.intensity); + LIBLAS_SWAP_BYTES(dest.flags); + LIBLAS_SWAP_BYTES(dest.classification); + LIBLAS_SWAP_BYTES(dest.scan_angle_rank); + LIBLAS_SWAP_BYTES(dest.user_data); + LIBLAS_SWAP_BYTES(dest.point_source_id); +} + +template <> +inline void read_n(VLRHeader& dest, std::istream& src, std::streamsize const& num) +{ + // TODO: Review and redesign errors handling logic if necessary + if (!src) + throw std::runtime_error("detail::liblas::read_n input stream is not readable"); + + src.read(detail::as_buffer(dest), num); + check_stream_state(src); + + // Fix little-endian + LIBLAS_SWAP_BYTES(dest.reserved); + LIBLAS_SWAP_BYTES(dest.recordId); + LIBLAS_SWAP_BYTES(dest.recordLengthAfterHeader); +} + +template <> +inline void read_n(std::string& dest, std::istream& src, std::streamsize const& num) +{ + assert(dest.max_size() >= static_cast(num)); + + // TODO: Review and redesign errors handling logic if necessary + if (!src) + throw std::runtime_error("detail::liblas::read_n input stream is not readable"); + + // Read bytes into temporary buffer then assign as string + char* buf = new char[num]; + src.read(buf, num); + dest.assign(buf, num); + delete [] buf; + + assert(dest.size() == static_cast(num)); + check_stream_state(src); +} + +template +inline void write_n(std::ostream& dest, T const& src, std::streamsize const& num) +{ + if (!dest) + throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); + + // Fix little-endian + T& tmp = const_cast(src); + LIBLAS_SWAP_BYTES_N(tmp, num); + + dest.write(detail::as_bytes(tmp), num); + check_stream_state(dest); +} + +template <> +inline void write_n(std::ostream& dest, PointRecord const& src, std::streamsize const& num) +{ + if (!dest) + throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); + + // Fix little-endian + PointRecord& tmp = const_cast(src); + LIBLAS_SWAP_BYTES(tmp.x); + LIBLAS_SWAP_BYTES(tmp.y); + LIBLAS_SWAP_BYTES(tmp.z); + LIBLAS_SWAP_BYTES(tmp.intensity); + LIBLAS_SWAP_BYTES(tmp.flags); + LIBLAS_SWAP_BYTES(tmp.classification); + LIBLAS_SWAP_BYTES(tmp.scan_angle_rank); + LIBLAS_SWAP_BYTES(tmp.user_data); + LIBLAS_SWAP_BYTES(tmp.point_source_id); + + dest.write(detail::as_bytes(tmp), num); + check_stream_state(dest); +} + +template <> +inline void write_n(std::ostream& dest, VLRHeader const& src, std::streamsize const& num) +{ + if (!dest) + throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); + + // Fix little-endian + VLRHeader& tmp = const_cast(src); + LIBLAS_SWAP_BYTES(tmp.reserved); + LIBLAS_SWAP_BYTES(tmp.recordId); + LIBLAS_SWAP_BYTES(tmp.recordLengthAfterHeader); + + dest.write(detail::as_bytes(tmp), num); + check_stream_state(dest); +} + +template <> +inline void write_n(std::ostream& dest, std::string const& src, std::streamsize const& num) +{ + if (!dest) + throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); + + dest.write(src.c_str(), num); + check_stream_state(dest); +} + +#ifdef _MSC_VER +# pragma warning(push) +#endif + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_UTILITY_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer.hpp work/libLAS-1.2.1/include/liblas/detail/writer.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/writer.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,106 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS writer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_WRITER_HPP_INCLUDED +#define LIBLAS_DETAIL_WRITER_HPP_INCLUDED + +#include +#include +#include + +#ifndef HAVE_GDAL + typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH; + typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH; +#endif + +// std +#include + +namespace liblas { namespace detail { + +class Writer +{ +public: + + Writer(std::ostream& ofs); + virtual ~Writer(); + virtual std::size_t GetVersion() const = 0; + virtual void WriteHeader(LASHeader& header) = 0; + virtual void UpdateHeader(LASHeader const& header) = 0; + virtual void WritePointRecord(LASPoint const& point, const LASHeader& header) = 0; + std::ostream& GetStream() const; + uint32_t WriteVLR(LASHeader const& header); + + void SetSRS(const LASSpatialReference& srs); + +protected: + PointRecord m_record; + std::ostream& m_ofs; + + void FillPointRecord(PointRecord& record, const LASPoint& point, const LASHeader& header); + + void Project(LASPoint& point); + LASSpatialReference m_out_srs; + LASSpatialReference m_in_srs; + + OGRCoordinateTransformationH m_transform; + OGRSpatialReferenceH m_in_ref; + OGRSpatialReferenceH m_out_ref; + +private: + + // Blocked copying operations, declared but not defined. + Writer(Writer const& other); + Writer& operator=(Writer const& rhs); + +}; + +class WriterFactory +{ +public: + + static Writer* Create(std::ostream& ofs, LASHeader const& header); + static void Destroy(Writer* p); +}; + +}} // namespace liblas::detail + +#endif // LIBLAS_DETAIL_WRITER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer10.hpp work/libLAS-1.2.1/include/liblas/detail/writer10.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer10.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/writer10.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,72 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.0 writer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_WRITER10_HPP_INCLUDED +#define LIBLAS_DETAIL_WRITER10_HPP_INCLUDED + +#include +#include +#include +// std +#include + +namespace liblas { namespace detail { namespace v10 { + +class WriterImpl : public Writer +{ +public: + + typedef Writer Base; + + WriterImpl(std::ostream& ofs); + std::size_t GetVersion() const; + void WriteHeader(LASHeader& header); + void UpdateHeader(LASHeader const& header); + void WritePointRecord(LASPoint const& record, const LASHeader& header); + +private: + + liblas::uint32_t m_pointCount; +}; + +}}} // namespace liblas::detail::v10 + +#endif // LIBLAS_DETAIL_WRITER10_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer11.hpp work/libLAS-1.2.1/include/liblas/detail/writer11.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer11.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/writer11.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,72 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.1 writer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_WRITER11_HPP_INCLUDED +#define LIBLAS_DETAIL_WRITER11_HPP_INCLUDED + +#include +#include +#include +// std +#include + +namespace liblas { namespace detail { namespace v11 { + +class WriterImpl : public Writer +{ +public: + + typedef Writer Base; + + WriterImpl(std::ostream& ofs); + std::size_t GetVersion() const; + void WriteHeader(LASHeader& header); + void UpdateHeader(LASHeader const& header); + void WritePointRecord(LASPoint const& record, const LASHeader& header); + +private: + + liblas::uint32_t m_pointCount; +}; + +}}} // namespace liblas::detail::v11 + +#endif // LIBLAS_DETAIL_WRITER11_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer12.hpp work/libLAS-1.2.1/include/liblas/detail/writer12.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/detail/writer12.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/detail/writer12.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,72 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.2 writer implementation for C++ libLAS + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_DETAIL_WRITER12_HPP_INCLUDED +#define LIBLAS_DETAIL_WRITER12_HPP_INCLUDED + +#include +#include +#include +// std +#include + +namespace liblas { namespace detail { namespace v12 { + +class WriterImpl : public Writer +{ +public: + + typedef Writer Base; + + WriterImpl(std::ostream& ofs); + std::size_t GetVersion() const; + void WriteHeader(LASHeader& header); + void UpdateHeader(LASHeader const& header); + void WritePointRecord(LASPoint const& record, LASHeader const& header); + +private: + + liblas::uint32_t m_pointCount; +}; + +}}} // namespace liblas::detail::v12 + +#endif // LIBLAS_DETAIL_WRITER12_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/exception.hpp work/libLAS-1.2.1/include/liblas/exception.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/exception.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/exception.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,77 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Exception subclasses for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_EXCEPTION_HPP_INCLUDED +#define LIBLAS_EXCEPTION_HPP_INCLUDED + +#include +#include + +namespace liblas { + +/// Exception reporting invalid point data. +/// It's usually thrown by LASPoint::Validate function. +class invalid_point_data : public std::runtime_error +{ +public: + + invalid_point_data(std::string const& msg, unsigned int who) + : std::runtime_error(msg), m_who(who) + {} + + /// Return flags identifying invalid point data members. + /// Flags are composed with composed with LASPoint::DataMemberFlag. + /// Testing flags example: bool timeValid = e.who() & LASPoint::eTime; + unsigned int who() const + { + return m_who; + } + +private: + + unsigned int m_who; +}; + +} // namespace liblas + +#endif // LIBLAS_EXCEPTION_HPP_INCLUDED + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/guid.hpp work/libLAS-1.2.1/include/liblas/guid.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/guid.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/guid.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,593 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: GUID implementation + * Author: Andy Tompkins (modified by Mateusz Loskot) + * + * This file has been stolen from the Boost Vault and + * modified for libLAS purposes. Here is the original code posted: + * http://lists.boost.org/boost-users/2007/04/27397.php + * + * (C) Copyright 2006 Andy Tompkins. + * (C) Copyright 2008 Mateusz Loskot, mateusz@loskot.net. + * Distributed under the Boost Software License, Version 1.0. + * (See accompanying file LICENSE_1_0.txt or copy at + * http://www.boost.org/LICENSE_1_0.txt) + * + * Revision History + * 06 Feb 2006 - Initial Revision + * 09 Nov 2006 - fixed variant and version bits for v4 guids + * 13 Nov 2006 - added serialization + * 17 Nov 2006 - added name-based guid creation + * 20 Nov 2006 - add fixes for gcc (from Tim Blechmann) + * 07 Mar 2007 - converted to header only + * 20 Jan 2008 - removed dependency of Boost and modified for libLAS (by Mateusz Loskot) + ****************************************************************************** + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_GUID_HPP_INCLUDED +#define LIBLAS_GUID_HPP_INCLUDED + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace liblas { + +/// Definition of Globally Unique Identifier type. +/// The GUID is a 16-byte (128-bit) number. +/// This class is used to represent value stored as Project Identifier +/// in public header block (see LASHeader) of a LAS file. +/// All files in a unique project should have the same value of +/// the Project Identifier. It is used together with File Source ID to +/// uniquely identify every LAS, globally. +/// +/// \see About GUID in Wikipedia http://en.wikipedia.org/wiki/Globally_Unique_Identifier +class guid +{ +public: + + /// Default constructor initializes GUID as null. + /// \exception nothrow + /// \post guid::is_null() == true. + guid() /* throw() */ + { + std::fill(data_, data_ + static_size, 0); + } + + /// Initializes from textual representation of valid GUID. + /// \param str - non-null pointer to string with GUID text. + /// \exception std::invalid_argument if construction failed. + /// \post guid::is_null() == false. + explicit guid(char const* const str) + { + if (0 == str) + throw_invalid_argument(); + construct(std::string(str)); + } + + /// Initializes from textual representation of valid GUID. + /// \param str - string with GUID text. + /// \exception std::invalid_argument if construction failed. + /// \post guid::is_null() == false. + template + explicit guid(std::basic_string const& str) + { + construct(str); + } + + /// Initializes from 4-fields structure. + /// \param d1 - field of first 32 bits of GUID number. + /// \param d2 - field of subsequent 16 bits of GUID number. + /// \param d3 - third field of 16 bits of GUID number. + /// \param d4 - last 64 bits of GUID number. + /// \exception std::invalid_argument if construction failed. + /// \post guid::is_null() == false. + guid(liblas::uint32_t const& d1, liblas::uint16_t const& d2, liblas::uint16_t const& d3, liblas::uint8_t const (&d4)[8]) + { + construct(d1, d2, d3, d4); + } + + /// Copy constructor. + /// \exception nothrow + guid(guid const& rhs) /* throw() */ + { + std::copy(rhs.data_, rhs.data_ + static_size, data_); + } + + /// Destructor. + /// \exception nothrow + ~guid() /* throw() */ + {} + + /// Assignment operator. + /// \exception nothrow + guid& operator=(guid const& rhs) /* throw() */ + { + if (&rhs != this) + { + std::copy(rhs.data_, rhs.data_ + static_size, data_); + } + return *this; + } + + /// Equality operator. + /// \exception nothrow + bool operator==(guid const& rhs) const /* throw() */ + { + return std::equal(data_, data_ + static_size, rhs.data_); + } + + /// Inequality operator. + /// \exception nothrow + bool operator!=(guid const& rhs) const /* throw() */ + { + return (!(*this == rhs)); + } + + /// Less-than operator. + /// \param rhs - GUID object on the right-hand side of the comparison. + /// \return true if the GUID on the left-hand side is lexicographically less + /// than GUID on the right side; false otherwise. + /// \exception nothrow + bool operator<(guid const& rhs) const /* throw() */ + { + return std::lexicographical_compare(data_, data_ + static_size, rhs.data_, rhs.data_ + static_size); + } + + /// More-than operator. + /// \param rhs - GUID object on the right-hand side of the comparison. + /// \return true if the GUID on the left-hand side is not lexicographically less + /// than GUID on the right side; false otherwise. + /// \exception nothrow + bool operator>(guid const& rhs) const /* throw() */ + { + return std::lexicographical_compare(rhs.data_, rhs.data_ + static_size, data_, data_ + static_size); + } + + /// Less-than-or-equal-to operator. + /// \param rhs - GUID object on the right-hand side of the comparison. + /// \exception nothrow + bool operator<=(guid const& rhs) const /* throw() */ + { + return (*this == rhs) || (*this < rhs); + } + + /// More-than-or-equal-to operator. + /// \param rhs - GUID object on the right-hand side of the comparison. + /// \exception nothrow + bool operator>=(guid const& rhs) const /* throw() */ + { + return (*this == rhs) || (*this > rhs); + } + + /// Test if the GUID object is null GUID or not. + /// Null means GUID number value is Zero. + /// \return true if the GUID is null; false otherwise + /// \exception nothrow + bool is_null() const /* throw() */ + { + return ((*this) == null()); + } + + /// Generate textual representation of the GUID number. + /// Specialization for std::string type. + /// \return string with textual representation of GUID + /// \exception std::runtime_error - thrown on GUID to string conversion failure + /// \post guid::to_string().empty() == false. + std::string to_string() const + { + return to_basic_string(); + } + + /// Generic generator of textual representation of the GUID number. + /// \exception std::runtime_error - thrown on GUID to string conversion failure + /// \post guid::to_basic_string().empty() == false. + template + std::basic_string to_basic_string() const + { + std::basic_string s; + std::basic_stringstream ss; + liblas::guid const& g = *this; + ss << g; + if (!ss || !(ss >> s)) + { + throw std::runtime_error("failed to convert guid to string"); + } + + assert(!s.empty()); + return s; + } + + /// Size of the GUID number in bytes. + /// \return The number of bytes is constant for all GUID objects + /// and equal to 16 bytes (128-bit number). + size_t byte_count() const /* throw() */ + { + return static_size; + } + + + /// Send bytes of GUID data to sequenec of bytes using given output iterator. + /// \exception nothrow + template + void output_bytes(ByteOutputIterator out) const + { + std::copy(data_, data_ + static_size, out); + } + + /// Separate bytes of GUID data to distinct buffers. + /// \param d1 - buffer for first 32 bits of GUID number. + /// \param d2 - buffer for 16 bits of second chunk of GUID number. + /// \param d3 - buffer for 16 bits of third chunk of GUID number. + /// \param d4 - buffer for last 64 bits of GUID number. + /// \exception nothrow + void output_data(liblas::uint32_t& d1, liblas::uint16_t& d2, liblas::uint16_t& d3, liblas::uint8_t (&d4)[8]) const + { + d1 = d2 = d3 = 0; + std::size_t pos = 0; + int const charbit = std::numeric_limits::digits; + + for (; pos < 4; ++pos) + { + + d1 <<= charbit; + d1 |= static_cast(data_[pos]); + } + + for (; pos < 6; ++pos) + { + d2 <<= charbit; + d2 |= static_cast(data_[pos]); + } + + for (; pos < 8; ++pos) + { + d3 <<= charbit; + d3 |= static_cast(data_[pos]); + } + + for (std::size_t j = 0; j < sizeof(d4); ++j) + { + d4[j] = data_[j + 8]; + } + } + + /// Null GUID number generator. + /// \return null-initialized instance of GUID number. + /// \exception nothrow + static guid const& null() /* throw() */ + { + static const guid n; + return n; + } + + /// Random GUID number generator. + /// \return random-initialized instance of GUID number. + /// \exception nothrow + static guid create() + { + return create_random_based(); + } + + /// Create GUID number based on calculation of SHA1 has for given name. + /// \exception std::runtime_error on GUID creation failure. + static guid create(guid const& namespace_guid, char const* name, int name_length) + { + return create_name_based(namespace_guid, name, name_length); + } + + /// Return flag indicating if bracket text form of GUID on output is set. + /// \exception nothrow + static inline bool get_showbraces(std::ios_base & iosbase) + { + return (iosbase.iword(get_showbraces_index()) != 0); + } + + /// Request to bracket text form of GUID on output. + /// \exception nothrow + static inline void set_showbraces(std::ios_base & iosbase, bool showbraces) + { + iosbase.iword(get_showbraces_index()) = showbraces; + } + + /// Request to bracket text form of GUID on output. + /// \exception nothrow + static inline std::ios_base& showbraces(std::ios_base& iosbase) + { + set_showbraces(iosbase, true); + return iosbase; + } + static inline std::ios_base& noshowbraces(std::ios_base& iosbase) + { + set_showbraces(iosbase, false); + return iosbase; + } + + /// Overloaded output stream operator for guid type. + friend std::ostream& operator<<(std::ostream& os, guid const& g); + + /// Overloaded input stream operator for guid type. + friend std::istream& operator>>(std::istream& is, guid &g); + +private: + + void throw_invalid_argument() const + { + throw std::invalid_argument("invalid guid string"); + } + + template + void construct(std::basic_string const& str) + { + std::basic_stringstream ss; + if (!(ss << str) || !(ss >> *this)) + { + throw_invalid_argument(); + } + } + + void construct(liblas::uint32_t const& d1, liblas::uint16_t const& d2, liblas::uint16_t const& d3, liblas::uint8_t const (&d4)[8]) + { + std::ostringstream ss; + ss.flags(std::ios::hex); + ss.fill('0'); + + ss.width(8); + ss << d1; + ss << '-'; + + ss.width(4); + ss << d2; + ss << '-'; + + ss.width(4); + ss << d3; + ss << '-'; + + for (std::size_t i = 0; i < sizeof(d4); ++i) + { + ss.width(2); + ss << static_cast(d4[i]); + if (1 == i) + ss << '-'; + } + + construct(ss.str()); + } + + //random number based + static guid create_random_based() // throw() + { + guid result; + static bool init_rand = true; + if (init_rand) + { + std::srand(static_cast(std::time(0))); + init_rand = false; + } + + for (size_t i = 0; i < static_size; i++) + { + result.data_[i] = detail::generate_random_byte(); + } + + // set variant + // should be 0b10xxxxxx + result.data_[8] &= 0xBF; + result.data_[8] |= 0x80; + + // set version + // should be 0b0100xxxx + result.data_[6] &= 0x4F; //0b01001111 + result.data_[6] |= 0x40; //0b01000000 + + return result; + } + + // name based + static guid create_name_based(guid const& namespace_guid, char const* name, int name_length) + { + using liblas::uint8_t; + + detail::SHA1 sha1; + sha1.Input(namespace_guid.data_, namespace_guid.static_size); + sha1.Input(name, name_length); + unsigned int digest[5]; + + if (sha1.Result(digest) == false) + { + throw std::runtime_error("create error"); + } + + guid result; + for (int i = 0; i < 4; ++i) + { + + result.data_[i*4+0] = static_cast((digest[i] >> 24) & 0xFF); + result.data_[i*4+1] = static_cast((digest[i] >> 16) & 0xFF); + result.data_[i*4+2] = static_cast((digest[i] >> 8) & 0xFF); + result.data_[i*4+3] = static_cast((digest[i] >> 0) & 0xFF); + } + + // set variant + // should be 0b10xxxxxx + result.data_[8] &= 0xBF; + result.data_[8] |= 0x80; + + // set version + // should be 0b0101xxxx + result.data_[6] &= 0x5F; //0b01011111 + result.data_[6] |= 0x50; //0b01010000 + + return result; + } + + static int get_showbraces_index() + { + static int index = std::ios_base::xalloc(); + return index; + } + +private: + + static const std::size_t static_size = 16; + liblas::uint8_t data_[static_size]; +}; + +inline std::ostream& operator<<(std::ostream& os, guid const& g) +{ + using namespace std; + + // TODO: If optional support of Boost is added, + // use Boost I/O State Savers for safe RAII. + std::ios_base::fmtflags flags_saver(os.flags()); + std::streamsize width_saver(os.width()); + std::ostream::char_type fill_saver(os.fill()); + + const std::ostream::sentry ok(os); + if (ok) + { + bool showbraces = guid::get_showbraces(os); + if (showbraces) + { + os << '{'; + } + os << hex; + os.fill('0'); + for (size_t i = 0; i < g.static_size; ++i) + { + os.width(2); + os << static_cast(g.data_[i]); + if (i == 3 || i == 5 || i == 7 || i == 9) + { + os << '-'; + } + } + if (showbraces) + { + os << '}'; + } + } + + os.flags(flags_saver); + os.width(width_saver); + os.fill(fill_saver); + + return os; +} + +inline std::istream& operator>>(std::istream& is, guid &g) +{ + using namespace std; + + typedef std::istream::char_type char_type; + guid temp_guid; + const std::istream::sentry ok(is); + if (ok) + { + char_type c; + c = static_cast(is.peek()); + bool bHaveBraces = false; + if (c == '{') + { + bHaveBraces = true; + is >> c; // read brace + } + + for (size_t i = 0; i < temp_guid.static_size && is; ++i) + { + std::stringstream ss; + + // read 2 characters into stringstream + is >> c; ss << c; + is >> c; ss << c; + + // extract 2 characters from stringstream as a hex number + unsigned int val = 0; + ss >> hex >> val; + if (!ss) + { + is.setstate(ios_base::failbit); + } + + // check that val is within valid range + if (val > 255) + { + is.setstate(ios_base::badbit); + } + + temp_guid.data_[i] = static_cast(val); + + if (is) + { + if (i == 3 || i == 5 || i == 7 || i == 9) + { + is >> c; + if (c != '-') + is.setstate(ios_base::failbit); + } + } + } + + if (bHaveBraces && is) + { + is >> c; + if (c != '}') + is.setstate(ios_base::failbit); + } + + if (is) + { + g = temp_guid; + } + } + + return is; +} + +} //namespace liblas + +#endif // LIBLAS_GUID_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/iterator.hpp work/libLAS-1.2.1/include/liblas/iterator.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/iterator.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/iterator.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,221 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Reader and writer iterator implementation + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_ITERATOR_HPP_INCLUDED +#define LIBLAS_ITERATOR_HPP_INCLUDED + +#include +#include +#include +#include + +namespace liblas { + +/// Input iterator associated with liblas::LASReader. +/// It allows to read LAS file records in similar way to elements of STL container, +/// as well as apply STL algorithms that accept pair of input iterators. +/// \sa About Input Iterator at http://www.sgi.com/tech/stl/InputIterator.html +/// +template +class reader_iterator +{ +public: + + typedef std::input_iterator_tag iterator_category; + typedef T value_type; + typedef T const* pointer; + typedef T const& reference; + typedef ptrdiff_t difference_type; + + /// Initializes iterator pointing to pass-the-end. + reader_iterator() + : m_reader(0) + {} + + /// Initializes iterator pointing to beginning of LAS file sequence. + /// No ownership transfer of reader object occurs. + reader_iterator(liblas::LASReader& reader) + : m_reader(&reader) + { + assert(0 != m_reader); + getval(); + } + + /// Dereference operator. + /// It is implemented in terms of LASReader::GetPoint function. + reference operator*() const + { + assert(0 != m_reader); + return m_reader->GetPoint(); + } + + /// Pointer-to-member operator. + /// It is implemented in terms of LASReader::GetPoint function. + pointer operator->() const + { + return &(operator*()); + } + + /// Pre-increment opertor. + /// Moves iterator to next record by calling LASReader::ReadNextPoint. + reader_iterator& operator++() + { + assert(0 != m_reader); + getval(); + return (*this); + } + + /// Post-increment opertor. + /// Moves iterator to next record by calling LASReader::ReadNextPoint. + reader_iterator operator++(int) + { + reader_iterator tmp(*this); + ++(*this); + return tmp; + } + + /// Compare passed iterator to this. + /// Determine if both iterators apply to the same instance of LASReader class. + bool equal(reader_iterator const& rhs) const + { + return m_reader == rhs.m_reader; + } + +private: + + void getval() + { + if (0 != m_reader && !(m_reader->ReadNextPoint())) + { + m_reader = 0; + } + } + + liblas::LASReader* m_reader; +}; + +/// Equality operator implemented in terms of reader_iterator::equal +template +bool operator==(reader_iterator const& lhs, reader_iterator const& rhs) +{ + return lhs.equal(rhs); +} + +/// Inequality operator implemented in terms of reader_iterator::equal +template +bool operator!=(reader_iterator const& lhs, reader_iterator const& rhs) +{ + return (!(lhs == rhs)); +} + +/// Output iterator associated with liblas::LASWriter. +/// It allows to store a sequence of records into LAS file. +/// \sa About Output Iterator at http://www.sgi.com/tech/stl/OutputIterator.html +/// +template +class writer_iterator +{ +public: + + typedef std::output_iterator_tag iterator_category; + typedef void value_type; + typedef void pointer; + typedef T const& reference; + typedef void difference_type; + + /// Initialize iterator with given writer. + /// The writer position is not changed. + /// No ownership transfer of writer object occurs. + writer_iterator(liblas::LASWriter& writer) + : m_writer(&writer) + { + assert(0 != m_writer); + } + + /// Dereference assignment operator. + /// Implemented in terms of LASWriter::WritePoint function. + writer_iterator& operator=(reference value) + { + assert(0 != m_writer); + + bool const ret = m_writer->WritePoint(value); + assert(ret); // TODO: Low-level debugging + + return (*this); + } + + /// Dereference operator. + writer_iterator& operator*() + { + // pretend to return designated value + return (*this); + } + + /// Pre-increment operator. + writer_iterator& operator++() + { + // pretend to preincrement + return (*this); + } + + /// Post-increment operator. + writer_iterator operator++(int) + { + // pretend to postincrement + return (*this); + } + +private: + + liblas::LASWriter* m_writer; +}; + +// Declare specializations for user's convenience + +/// Public specialization of LASReader input iterator for liblas::LASPoint type. +typedef reader_iterator lasreader_iterator; + +/// Public specialization of LASWriter output iterator for liblas::LASPoint type. +typedef writer_iterator laswriter_iterator; + +} // namespace liblas + +#endif // LIBLAS_ITERATOR_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lascolor.hpp work/libLAS-1.2.1/include/liblas/lascolor.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lascolor.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/lascolor.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,165 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS color class + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASCOLOR_HPP_INCLUDED +#define LIBLAS_LASCOLOR_HPP_INCLUDED + +#include +#include +#include +// std +#include // std::out_of_range +#include // std::size_t + +namespace liblas { + +/// RGB color container +class LASColor +{ +public: + + /// Default constructor. + /// Initializes with black color using RGB {0, 0, 0}. + LASColor(); + + /// Copy constructor. + LASColor(LASColor const& other); + + /// Assignment opreator. + LASColor& operator=(LASColor const& rhs); + + /// Comparison operator. + bool operator==(const LASColor& other) const; + + /// Fetch value of the red image channel + uint16_t GetRed() const; + + /// Set value of the red image channel + void SetRed(uint16_t const& value); + + /// Fetch value of the blue image channel + uint16_t GetBlue() const; + + /// Set value of the blue image channel + void SetBlue(uint16_t const& value); + + /// Fetch value of the green image channel + uint16_t GetGreen() const; + + /// Set value of the red image channel + void SetGreen(uint16_t const& value); + + /// Index operator providing access to RGB values. + /// Valid index values are 0, 1 or 2. + /// \exception std::out_of_range if requested index is out of range (> 2). + uint16_t& operator[](std::size_t const& n); + + /// Const version of index operator providing access to RGB values. + /// Valid index values are 0, 1 or 2. + /// \exception std::out_of_range if requested index is out of range (> 2). + uint16_t const& operator[](std::size_t const& n) const; + +private: + + + uint16_t m_red; + uint16_t m_green; + uint16_t m_blue; + + void throw_out_of_range() const + { + throw std::out_of_range("subscript out of range"); + } +}; + + +inline uint16_t LASColor::GetRed() const +{ + return m_red; +} + +inline void LASColor::SetRed(uint16_t const& value) +{ + m_red = value; +} + +inline uint16_t LASColor::GetBlue() const +{ + return m_blue; +} + +inline void LASColor::SetBlue(uint16_t const& value) +{ + m_blue = value; +} + +inline uint16_t LASColor::GetGreen() const +{ + return m_green; +} + +inline void LASColor::SetGreen(uint16_t const& value) +{ + m_green = value; +} + +inline uint16_t& LASColor::operator[](std::size_t const& n) +{ + if (n == 0) { return m_red; } + if (n == 1) { return m_green; } + if (n == 2) { return m_blue; } + + throw_out_of_range(); + +} + +inline uint16_t const& LASColor::operator[](std::size_t const& n) const +{ + if (n == 0) { return m_red; } + if (n == 1) { return m_green; } + if (n == 2) { return m_blue; } + + throw_out_of_range(); +} + +} // namespace liblas + +#endif // LIBLAS_LASCOLOR_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/laserror.hpp work/libLAS-1.2.1/include/liblas/laserror.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/laserror.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/laserror.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,89 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: An error encapsulation class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * Copyright (c) 2008, Phil Vachon + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASERROR_HPP_INCLUDED +#define LIBLAS_LASERROR_HPP_INCLUDED + +//std +#include +#include + +namespace liblas { + +/// Definition of error notification used on the level of C API. +/// This class describes details of error condition occured in +/// libLAS core. All errors are stacked by C API layer, so it's +/// possible to track problem down to its source. +class LASError +{ +public: + + /// Custom constructor. + /// This is the main and the only tool to initialize error instance. + LASError(int code, std::string const& message, std::string const& method); + + /// Copy constructor. + /// Error objects are copyable. + LASError(LASError const& other); + + /// Assignment operator. + /// Error objects are assignable. + LASError& operator=(LASError const& rhs); + + // TODO - mloskot: What about replacing string return by copy with const char* ? + // char const* GetMethod() const { return m_method.c_str(); }, etc. + + int GetCode() const { return m_code; }; + std::string GetMessage() const { return m_message; }; + std::string GetMethod() const { return m_method; }; + +private: + + int m_code; + std::string m_message; + std::string m_method; +}; + +} // namespace liblas + +#endif diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasfile.hpp work/libLAS-1.2.1/include/liblas/lasfile.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasfile.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/lasfile.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,85 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A composite class to handle read/write operations + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASFILE_HPP_INCLUDED +#define LIBLAS_LASFILE_HPP_INCLUDED + +#include // complete type required +#include +#include +#include + +namespace liblas { + +/// \todo to be documented +class LASFile +{ +public: + + enum Mode + { + eRead = 0, + eWrite = 1, + eAppend = 2 + }; + + LASFile(); + LASFile(std::string const& filename); + LASFile(std::string const& filename, LASHeader const& header, Mode mode); + LASFile(LASFile const& other); + LASFile& operator=(LASFile const& rhs); + + bool IsNull() const; + std::string GetName() const; + Mode GetMode() const; + LASHeader const& GetHeader() const; + LASReader& GetReader(); + LASWriter& GetWriter(); + +private: + + detail::SharedPtr m_pimpl; +}; + +} // namespace liblas + +#endif // LIBLAS_LASFILE_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasheader.hpp work/libLAS-1.2.1/include/liblas/lasheader.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasheader.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/lasheader.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,393 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS header class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Phil Vachon + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASHEADER_HPP_INCLUDED +#define LIBLAS_LASHEADER_HPP_INCLUDED + +#include +#include +#include +#include +#include +#include + +//std +#include +#include + +namespace liblas { + +/// Definition of public header block. +/// The header contains set of generic data and metadata +/// describing a family of ASPRS LAS files. The header is stored +/// at the beginning of every valid ASPRS LAS file. +/// +/// \todo TODO (low-priority): replace static-size char arrays as data members +/// with std::string and return const-reference to string object. +/// +class LASHeader +{ +public: + + /// Range of allowed ASPRS LAS file format versions. + enum FormatVersion + { + eVersionMajorMin = 1, ///< Minimum of major component + eVersionMajorMax = 1, ///< Maximum of major component + eVersionMinorMin = 0, ///< Minimum of minor component + eVersionMinorMax = 2 ///< Maximum of minor component + }; + + /// Versions of point record format. + enum PointFormat + { + ePointFormat0 = 0, ///< Point Data Format \e 0 + ePointFormat1 = 1, ///< Point Data Format \e 1 + ePointFormat2 = 2, ///< Point Data Format \e 2 + ePointFormat3 = 3 ///< Point Data Format \e 3 + + }; + + /// Number of bytes of point record storage in particular format. + enum PointSize + { + ePointSize0 = 20, ///< Size of point record in data format \e 0 + ePointSize1 = 28, ///< Size of point record in data format \e 1 + ePointSize2 = 26, ///< Size of point record in data format \e 2 + ePointSize3 = 34 ///< Size of point record in data format \e 3 + + }; + + /// Official signature of ASPRS LAS file format, always \b "LASF". + static char const* const FileSignature; + + /// Default system identifier used by libLAS, always \b "libLAS". + static char const* const SystemIdentifier; + + /// Default software identifier used by libLAS, always \b "libLAS X.Y". + static char const* const SoftwareIdentifier; + + /// Default constructor. + /// The default constructed header is configured according to the ASPRS + /// LAS 1.1 Specification, point data format set to 0. + /// Other fields filled with 0. + LASHeader(); + + /// Copy constructor. + LASHeader(LASHeader const& other); + + /// Assignment operator. + LASHeader& operator=(LASHeader const& rhs); + + /// Comparison operator. + bool operator==(const LASHeader& other) const; + + /// Get ASPRS LAS file signature. + /// \return 4-characters long string - \b "LASF". + std::string GetFileSignature() const; + + /// Set ASPRS LAS file signature. + /// The only value allowed as file signature is \b "LASF", + /// defined as FileSignature constant. + /// \exception std::invalid_argument - if invalid signature given. + /// \param v - string contains file signature, at least 4-bytes long + /// with "LASF" as first four bytes. + void SetFileSignature(std::string const& v); + + /// Get file source identifier. + /// \exception No throw + uint16_t GetFileSourceId() const; + + /// Set file source identifier. + /// \param v - should be set to a value between 1 and 65535. + /// \exception No throw + /// + /// \todo TODO: Should we warn or throw about type overflow when user passes 65535 + 1 = 0 + void SetFileSourceId(uint16_t v); + + /// Get value field reserved by the ASPRS LAS Specification. + /// \note This field is always filled with 0. + /// + /// \todo TODO: Should we warn or throw about type overflow when user passes 65535 + 1 = 0 + uint16_t GetReserved() const; + + /// Set reserved value for the header identifier. + /// \param v - should be set to a value between 1 and 65535. + /// \exception No throw + void SetReserved(uint16_t v); + + /// Get project identifier. + /// \return Global Unique Identifier as an instance of liblas::guid class. + guid GetProjectId() const; + + /// Set project identifier. + void SetProjectId(guid const& v); + + /// Get major component of version of LAS format. + /// \return Always 1 is returned as the only valid value. + uint8_t GetVersionMajor() const; + + /// Set major component of version of LAS format. + /// \exception std::out_of_range - invalid value given. + /// \param v - value between eVersionMajorMin and eVersionMajorMax. + void SetVersionMajor(uint8_t v); + + /// Get minor component of version of LAS format. + /// \return Valid values are 1 or 0. + uint8_t GetVersionMinor() const; + + /// Set minor component of version of LAS format. + /// \exception std::out_of_range - invalid value given. + /// \param v - value between eVersionMinorMin and eVersionMinorMax. + void SetVersionMinor(uint8_t v); + + /// Get system identifier. + /// Default value is \b "libLAS" specified as the SystemIdentifier constant. + /// \param pad - if true the returned string is padded right with spaces and + /// its length is 32 bytes, if false (default) no padding occurs and + /// length of the returned string is <= 32 bytes. + /// \return value of system identifier field. + std::string GetSystemId(bool pad = false) const; + + /// Set system identifier. + /// \exception std::invalid_argument - if identifier longer than 32 bytes. + /// \param v - system identifiers string. + void SetSystemId(std::string const& v); + + /// Get software identifier. + /// Default value is \b "libLAS 1.0", specified as the SoftwareIdentifier constant. + /// \param pad - if true the returned string is padded right with spaces and its length is 32 bytes, + /// if false (default) no padding occurs and length of the returned string is <= 32 bytes. + /// \return value of generating software identifier field. + std::string GetSoftwareId(bool pad = false) const; + + /// Set software identifier. + /// \exception std::invalid_argument - if identifier is longer than 32 bytes. + /// \param v - software identifiers string. + void SetSoftwareId(std::string const& v); + + /// Get day of year of file creation date. + /// \todo TODO: Use full date structure instead of Julian date number. + uint16_t GetCreationDOY() const; + + /// Set day of year of file creation date. + /// \exception std::out_of_range - given value is higher than number 366. + /// \todo TODO: Use full date structure instead of Julian date number. + void SetCreationDOY(uint16_t v); + + /// Set year of file creation date. + /// \todo TODO: Remove if full date structure is used. + uint16_t GetCreationYear() const; + + /// Get year of file creation date. + /// \exception std::out_of_range - given value is higher than number 9999. + /// \todo TODO: Remove if full date structure is used. + void SetCreationYear(uint16_t v); + + /// Get number of bytes of generic verion of public header block storage. + /// Standard version of the public header block is 227 bytes long. + uint16_t GetHeaderSize() const; + + /// Get number of bytes from the beginning to the first point record. + uint32_t GetDataOffset() const; + + /// Set number of bytes from the beginning to the first point record. + /// \exception std::out_of_range - if given offset is bigger than 227+2 bytes + /// for the LAS 1.0 format and 227 bytes for the LAS 1.1 format. + void SetDataOffset(uint32_t v); + + /// Get number of variable-length records. + uint32_t GetRecordsCount() const; + + /// Set number of variable-length records. + void SetRecordsCount(uint32_t v); + + /// Get identifier of point data (record) format. + PointFormat GetDataFormatId() const; + + /// Set identifier of point data (record) format. + void SetDataFormatId(PointFormat v); + + /// \todo To be documented + uint16_t GetDataRecordLength() const; + + /// Get total number of point records stored in the LAS file. + uint32_t GetPointRecordsCount() const; + + /// Set number of point records that will be stored in a new LAS file. + void SetPointRecordsCount(uint32_t v); + + /// Get array of the total point records per return. + std::vector const& GetPointRecordsByReturnCount() const; + + /// Set values of 5-elements array of total point records per return. + /// \exception std::out_of_range - if index is bigger than 4. + /// \param index - subscript (0-4) of array element being updated. + /// \param v - new value to assign to array element identified by index. + void SetPointRecordsByReturnCount(std::size_t index, uint32_t v); + + /// Get scale factor for X coordinate. + double GetScaleX() const; + + /// Get scale factor for Y coordinate. + double GetScaleY() const; + + /// Get scale factor for Z coordinate. + double GetScaleZ() const; + + /// Set values of scale factor for X, Y and Z coordinates. + void SetScale(double x, double y, double z); + + /// Get X coordinate offset. + double GetOffsetX() const; + + /// Get Y coordinate offset. + double GetOffsetY() const; + + /// Get Z coordinate offset. + double GetOffsetZ() const; + + /// Set values of X, Y and Z coordinates offset. + void SetOffset(double x, double y, double z); + + /// Get minimum value of extent of X coordinate. + double GetMaxX() const; + + /// Get maximum value of extent of X coordinate. + double GetMinX() const; + + /// Get minimum value of extent of Y coordinate. + double GetMaxY() const; + + /// Get maximum value of extent of Y coordinate. + double GetMinY() const; + + /// Get minimum value of extent of Z coordinate. + double GetMaxZ() const; + + /// Get maximum value of extent of Z coordinate. + double GetMinZ() const; + + /// Set maximum values of extent of X, Y and Z coordinates. + void SetMax(double x, double y, double z); + + /// Set minimum values of extent of X, Y and Z coordinates. + void SetMin(double x, double y, double z); + + /// Adds a variable length record to the header + void AddVLR(LASVariableRecord const& v); + + /// Returns a VLR + LASVariableRecord const& GetVLR(uint32_t index) const; + + /// Removes a VLR from the the header. + void DeleteVLR(uint32_t index); + + /// Rewrite variable-length record with georeference infomation, if available. + void SetGeoreference(); + + /// Fetch the georeference + LASSpatialReference GetSRS() const; + + /// Set the georeference + void SetSRS(LASSpatialReference& srs); + +private: + + typedef detail::Point PointScales; + typedef detail::Point PointOffsets; + typedef detail::Extents PointExtents; + + enum + { + eDataSignatureSize = 2, + eFileSignatureSize = 4, + ePointsByReturnSize = 5, + eProjectId4Size = 8, + eSystemIdSize = 32, + eSoftwareIdSize = 32, + eHeaderSize = 227, + eFileSourceIdMax = 65535 + }; + + // TODO (low-priority): replace static-size char arrays + // with std::string and return const-reference to string object. + + // + // Private function members + // + void Init(); + void ClearGeoKeyVLRs(); + + // + // Private data members + // + char m_signature[eFileSignatureSize]; + uint16_t m_sourceId; + uint16_t m_reserved; + uint32_t m_projectId1; + uint16_t m_projectId2; + uint16_t m_projectId3; + uint8_t m_projectId4[eProjectId4Size]; + uint8_t m_versionMajor; + uint8_t m_versionMinor; + char m_systemId[eSystemIdSize]; + char m_softwareId[eSoftwareIdSize]; + uint16_t m_createDOY; + uint16_t m_createYear; + uint16_t m_headerSize; + uint32_t m_dataOffset; + uint32_t m_recordsCount; + uint8_t m_dataFormatId; + uint16_t m_dataRecordLen; + uint32_t m_pointRecordsCount; + std::vector m_pointRecordsByReturn; + PointScales m_scales; + PointOffsets m_offsets; + PointExtents m_extents; + std::vector m_vlrs; + LASSpatialReference m_srs; +}; + +} // namespace liblas + +#endif // LIBLAS_LASHEADER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/laspoint.hpp work/libLAS-1.2.1/include/liblas/laspoint.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/laspoint.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/laspoint.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,365 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS point class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASPOINT_HPP_INCLUDED +#define LIBLAS_LASPOINT_HPP_INCLUDED + +#include +#include +#include +#include +// std +#include // std::out_of_range +#include // std::size_t + +namespace liblas { + +/// Point data record composed with X, Y, Z coordinates and attributes. +class LASPoint +{ +public: + + enum DataMemberFlag + { + eReturnNumber = 1, + eNumberOfReturns = 2, + eScanDirection = 4, + eFlightLineEdge = 8, + eClassification = 16, + eScanAngleRank = 32, + eTime = 64 + }; + + + enum ClassificationType + { + eCreated = 0, + eUnclassified, + eGround, + eLowVegetation, + eMediumVegetation, + eHighVegetation, + eBuilding, + eLowPoint, + eModelKeyPoint, + eWater = 9, + // = 10 // reserved for ASPRS Definition + // = 11 // reserved for ASPRS Definition + eOverlapPoints = 12 + // = 13-31 // reserved for ASPRS Definition + }; + + enum ScanAngleRankRange + { + eScanAngleRankMin = -90, + eScanAngleRankMax = 90 + }; + + LASPoint(); + LASPoint(LASPoint const& other); + LASPoint& operator=(LASPoint const& rhs); + + double GetX() const; + double GetY() const; + double GetZ() const; + void SetCoordinates(double const& x, double const& y, double const& z); + void SetCoordinates(LASHeader const& header, double x, double y, double z); + + void SetX(double const& value); + void SetY(double const& value); + void SetZ(double const& value); + + uint16_t GetIntensity() const; + void SetIntensity(uint16_t const& intensity); + + /// Gets all scanning flags encoded as single byte. + /// The flags are (mandatory): + /// - Return Number (bits 0, 1, 2); + /// - Number of Returns - given pulse (bits 3, 4, 5); + /// - Scan Direction Flag (bit 6); + /// - Edge of Flight Line (bit 7). + uint8_t GetScanFlags() const; + + /// Sets all scanning flags passed as a single byte. + /// \sa Documentation of GetScanFlags method for flags details. + void SetScanFlags(uint8_t const& flags); + + uint16_t GetReturnNumber() const; + void SetReturnNumber(uint16_t const& num); + + uint16_t GetNumberOfReturns() const; + void SetNumberOfReturns(uint16_t const& num); + + uint16_t GetScanDirection() const; + void SetScanDirection(uint16_t const& dir); + + uint16_t GetFlightLineEdge() const; + void SetFlightLineEdge(uint16_t const& edge); + + uint8_t GetClassification() const; + void SetClassification(uint8_t const& classify); + + int8_t GetScanAngleRank() const; + void SetScanAngleRank(int8_t const& rank); + + /// Fetch value of File Marker (LAS 1.0) or User Data (LAS 1.1). + uint8_t GetUserData() const; + + /// Set value of File Marker (LAS 1.0) or User Data (LAS 1.1). + void SetUserData(uint8_t const& data); + + /// Fetch value of User Bit Field (LAS 1.0) or Point Source ID (LAS 1.1). + uint16_t GetPointSourceID() const; + + /// Set value of User Bit Field (LAS 1.0) or Point Source ID (LAS 1.1). + void SetPointSourceID(uint16_t const& id); + + /// Fetch color value associated with this point (LAS 1.2) + LASColor const& GetColor() const; + + /// Set color value associated with this point (LAS 1.2) + void SetColor(LASColor const& value); + + + double GetTime() const; + void SetTime(double const& time); + + /// Index operator providing access to XYZ coordinates of point record. + /// Valid index values are 0, 1 or 2. + /// \exception std::out_of_range if requested index is out of range (> 2). + double& operator[](std::size_t const& n); + + /// Const version of index operator providing access to XYZ coordinates of point record. + /// Valid index values are 0, 1 or 2. + /// \exception std::out_of_range if requested index is out of range (> 2). + double const& operator[](std::size_t const& n) const; + + /// \todo TODO: Should we compare other data members, but not only coordinates? + bool equal(LASPoint const& other) const; + + bool Validate() const; + bool IsValid() const; + + +private: + + static std::size_t const coords_size = 3; + double m_coords[coords_size]; + uint16_t m_intensity; + uint8_t m_flags; + uint8_t m_class; + int8_t m_angleRank; + uint8_t m_userData; + uint16_t m_pointSourceId; + double m_gpsTime; + + LASColor m_color; + detail::PointRecord m_rec; + + void throw_out_of_range() const + { + throw std::out_of_range("coordinate subscript out of range"); + } +}; + +/// Equal-to operator implemented in terms of LASPoint::equal method. +inline bool operator==(LASPoint const& lhs, LASPoint const& rhs) +{ + return lhs.equal(rhs); +} + +/// Not-equal-to operator implemented in terms of LASPoint::equal method. +inline bool operator!=(LASPoint const& lhs, LASPoint const& rhs) +{ + return (!(lhs == rhs)); +} + +inline void LASPoint::SetCoordinates(double const& x, double const& y, double const& z) +{ + m_coords[0] = x; + m_coords[1] = y; + m_coords[2] = z; +} + +inline double LASPoint::GetX() const +{ + return m_coords[0]; +} + +inline void LASPoint::SetX( double const& value ) +{ + m_coords[0] = value; +} + +inline double LASPoint::GetY() const +{ + return m_coords[1]; +} + +inline void LASPoint::SetY( double const& value ) +{ + m_coords[1] = value; +} + +inline double LASPoint::GetZ() const +{ + return m_coords[2]; +} + +inline void LASPoint::SetZ( double const& value ) +{ + m_coords[2] = value; +} + +inline uint16_t LASPoint::GetIntensity() const +{ + return m_intensity; +} + +inline void LASPoint::SetIntensity(uint16_t const& intensity) +{ + m_intensity = intensity; +} + +inline uint16_t LASPoint::GetReturnNumber() const +{ + // Read bits 1,2,3 (first 3 bits) + return (m_flags & 0x07); +} + +inline uint16_t LASPoint::GetNumberOfReturns() const +{ + // Read bits 4,5,6 + return ((m_flags >> 3) & 0x07); +} + +inline uint16_t LASPoint::GetScanDirection() const +{ + // Read 7th bit + return ((m_flags >> 6) & 0x01); +} + +inline uint16_t LASPoint::GetFlightLineEdge() const +{ + // Read 8th bit + return ((m_flags >> 7) & 0x01); +} + +inline uint8_t LASPoint::GetScanFlags() const +{ + return m_flags; +} + +inline void LASPoint::SetScanFlags(uint8_t const& flags) +{ + m_flags = flags; +} + +inline uint8_t LASPoint::GetClassification() const +{ + return m_class; +} + +inline void LASPoint::SetClassification(uint8_t const& classify) +{ + m_class = classify; +} + +inline int8_t LASPoint::GetScanAngleRank() const +{ + return m_angleRank; +} + +inline uint8_t LASPoint::GetUserData() const +{ + return m_userData; +} + +inline uint16_t LASPoint::GetPointSourceID() const +{ + return m_pointSourceId; +} + +inline void LASPoint::SetPointSourceID(uint16_t const& id) +{ + m_pointSourceId = id; +} + +inline double LASPoint::GetTime() const +{ + return m_gpsTime; +} + +inline void LASPoint::SetTime(double const& time) +{ + m_gpsTime = time; +} + +inline LASColor const& LASPoint::GetColor() const +{ + return m_color; +} + +inline void LASPoint::SetColor(LASColor const& value) +{ + m_color = value; +} + + +inline double& LASPoint::operator[](std::size_t const& n) +{ + if (coords_size <= n) + throw_out_of_range(); + + return m_coords[n]; +} + +inline double const& LASPoint::operator[](std::size_t const& n) const +{ + if (coords_size <= n) + throw_out_of_range(); + + return m_coords[n]; +} + +} // namespace liblas + +#endif // LIBLAS_LASPOINT_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasreader.hpp work/libLAS-1.2.1/include/liblas/lasreader.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasreader.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/lasreader.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,103 @@ +/****************************************************************************** +* $Id$ +* +* Project: libLAS - http://liblas.org - A BSD library for LAS format data. +* Purpose: LAS reader class +* Author: Mateusz Loskot, mateusz@loskot.net +* +****************************************************************************** +* Copyright (c) 2008, Mateusz Loskot +* Copyright (c) 2008, Phil Vachon +* +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following +* conditions are met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided +* with the distribution. +* * Neither the name of the Martin Isenburg or Iowa Department +* of Natural Resources nor the names of its contributors may be +* used to endorse or promote products derived from this software +* without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +* OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef LIBLAS_LASREADER_HPP_INCLUDED +#define LIBLAS_LASREADER_HPP_INCLUDED + +#include +#include +#include +#include +#include +// std +#include +#include +#include +#include // std::size_t + +namespace liblas { + +/// \todo To be documented. +class LASReader +{ +public: + + LASReader(std::istream& ifs); + ~LASReader(); + + std::size_t GetVersion() const; + LASHeader const& GetHeader() const; + LASPoint const& GetPoint() const; + std::vector const& GetVLRs() const; + /// Allow fetching of the stream + std::istream& GetStream() const; + bool IsEOF() const; + + bool ReadNextPoint(); + bool ReadPointAt(std::size_t n); + bool ReadVLR(); + void Reset(); + + /// Reproject data as they are written if the LASWriter's reference is + /// different than the LASHeader's + bool SetSRS(const LASSpatialReference& ref); + + /// The operator is not const because it updates file stream position. + LASPoint const& operator[](std::size_t n); + +private: + + // Blocked copying operations, declared but not defined. + LASReader(LASReader const& other); + LASReader& operator=(LASReader const& rhs); + + void Init(); // throws on error + + const std::auto_ptr m_pimpl; + LASHeader m_header; + LASPoint m_point; + std::vector m_vlrs; +}; + +} // namespace liblas + +#endif // ndef LIBLAS_LASREADER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasspatialreference.hpp work/libLAS-1.2.1/include/liblas/lasspatialreference.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasspatialreference.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/lasspatialreference.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,183 @@ +/****************************************************************************** + * $Id: lasspatialreference.hpp 1091 2009-03-10 20:17:35Z hobu $ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS Spatial Reference class + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2009, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED +#define LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED + +#include +#include +#include +#include +#include +#include + +// GDAL OSR +#ifdef HAVE_GDAL +#include "ogr_srs_api.h" +#include "cpl_port.h" +#include "cpl_serv.h" +#include "geo_tiffp.h" +#define CPL_ERROR_H_INCLUDED + +#include "geo_normalize.h" +#include "geovalues.h" +#include "ogr_spatialref.h" +#include "gdal.h" +#include "xtiffio.h" +#include "cpl_multiproc.h" + +#endif + +// GeoTIFF +#ifdef HAVE_LIBGEOTIFF +#include "geotiff.h" +#include "geo_simpletags.h" +#include "geo_normalize.h" +#include "geo_simpletags.h" +#include "geovalues.h" +#endif // HAVE_LIBGEOTIFF + +// std +#include // std::out_of_range +#include // std::size_t +#include + +// Fake out the compiler if we don't have libgeotiff +#ifndef HAVE_LIBGEOTIFF +typedef struct GTIFS * GTIF; +typedef struct ST_TIFFS * ST_TIFF; +#endif + +namespace liblas { + +/// Spatial Reference System container for libLAS +class LASSpatialReference +{ +public: + + /// Default constructor. + LASSpatialReference(); + + /// Destructor. + /// If libgeotiff is enabled, deallocates libtiff and libgeotiff objects used internally. + ~LASSpatialReference(); + + /// Constructor creating LASSpatialReference instance from given Variable-Length Record. + LASSpatialReference(const std::vector& vlrs); + + /// Copy constryctor. + LASSpatialReference(LASSpatialReference const& other); + + /// Assignment operator. + LASSpatialReference& operator=(LASSpatialReference const& rhs); + + /// Returns a pointer to the internal GTIF*. Only available if + /// you have libgeotiff linked in. + const GTIF* GetGTIF(); + + void SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff); + + /// Returns the OGC WKT describing Spatial Reference System. + /// If GDAL is linked, it uses GDAL's operations and methods to determine + /// the WKT. If GDAL is not linked, no WKT is returned. + std::string GetWKT() const; + + /// Sets the SRS using GDAL's OGC WKT. If GDAL is not linked, this + /// operation has no effect. + /// \param v - a string containing the WKT string. + void SetWKT(std::string const& v); + + /// Returns the Proj.4 string describing the Spatial Reference System. + /// If GDAL is linked, it uses GDAL's operations and methods to determine + /// the Proj.4 string -- otherwise, if libgeotiff is linked, it uses + /// that. Note that GDAL's operations are much more mature and + /// support more coordinate systems and descriptions. + std::string GetProj4() const; + + /// Sets the Proj.4 string describing the Spatial Reference System. + /// If GDAL is linked, it uses GDAL's operations and methods to determine + /// the Proj.4 string -- otherwise, if libgeotiff is linked, it uses + /// that. Note that GDAL's operations are much more mature and + /// support more coordinate systems and descriptions. + /// \param v - a string containing the Proj.4 string. + void SetProj4(std::string const& v); + + /// Set the LASVLRs for the LASSpatialReference. SetVLRs will only copy + /// VLR records that pertain to the GeoTIFF keys, and extraneous + /// VLR records will not be copied. + /// \param vlrs - A list of VLRs that contains VLRs describing GeoTIFF keys + void SetVLRs(const std::vector& vlrs); + + /// Add a VLR representing GeoTIFF keys to the SRS + void AddVLR(const LASVariableRecord& vlr); + + /// Return a copy of the LASVLRs that LASSpatialReference maintains + std::vector GetVLRs() const; + +private: + + GTIF* m_gtiff; + ST_TIFF* m_tiff; + + std::vector m_vlrs; + bool IsGeoVLR(const LASVariableRecord& vlr) const; + + /// Reset the VLRs of the LASSpatialReference using the existing GTIF* and ST_TIF* + /// Until this method is called, + /// the LASSpatialReference will only contain a SRS description using the VLRs + /// that it was first instantiated with. SetWKT and SetProj4 can + /// be used to change the GTIF* + void ResetVLRs(); +}; + +} // namespace liblas + +#ifdef HAVE_GDAL +LAS_C_START +char LAS_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); +int LAS_DLL GTIFSetFromOGISDefn(GTIF*, const char*); + +void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName); +void SetGeogCSCitation(GTIF* psGTIF, OGRSpatialReference* poSRS, char* angUnitName, int nDatum, short nSpheroid); +LAS_C_END +#endif + +#endif // LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasvariablerecord.hpp work/libLAS-1.2.1/include/liblas/lasvariablerecord.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/lasvariablerecord.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/lasvariablerecord.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,156 @@ +/****************************************************************************** + * $Id: lasvariablerecord.hpp 889 2008-09-28 04:17:22Z hobu $ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS record header class + * Author: Phil Vachon, philippe@cowpig.ca + * + ****************************************************************************** + * Copyright (c) 2008, Phil Vachon + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASVARIABLERECORD_HPP_INCLUDED +#define LIBLAS_LASVARIABLERECORD_HPP_INCLUDED + +#include +// std +#include +#include + +namespace liblas { + +/// Representation of variable-length record data. +class LASVariableRecord +{ +public: + + /// Default constructor. + /// Zero-initialization of record data. + /// \exception No throw + LASVariableRecord(); + + /// Copy constructor. + /// Construction of new record object as a copy of existing one. + /// \exception No throw + LASVariableRecord(LASVariableRecord const& other); + + ~LASVariableRecord(); + + /// Assignment operator. + /// Construction and initializition of record object by + /// assignment of another one. + /// \exception No throw + LASVariableRecord& operator=(LASVariableRecord const& rhs); + + /// Get record signature (LAS 1.0) or reserved bytes (LAS 1.1). + /// \exception No throw + uint16_t GetReserved() const; + + void SetReserved(uint16_t); + + /// Get identifier of user which created the record. + /// The character data is up to 16 bytes long. + /// \exception No throw + std::string GetUserId(bool pad /*= false*/) const; + + void SetUserId(std::string const&); + + /// Get identifier of record. + /// The record ID is closely related to the user ID. + /// \exception No throw + uint16_t GetRecordId() const; + + void SetRecordId(uint16_t); + + /// Get record length after the header. + /// \exception No throw + uint16_t GetRecordLength() const; + + void SetRecordLength(uint16_t); + + /// Get text description of data in the record. + /// The character data is up to 32 bytes long. + /// \exception No throw + std::string GetDescription(bool pad /*= false*/) const; + + void SetDescription(std::string const&); + + /// Get the data for this VLR + std::vector const& GetData() const; + + void SetData(std::vector const&); + + /// Compare actual header object against the other. + /// \exception No throw + bool equal(LASVariableRecord const& other) const; + + /// Get the total size of the VLR in bytes + uint32_t GetTotalSize() const; + +private: + + enum + { + eUIDSize = 16, + eDescriptionSize = 32 + }; + + uint16_t m_reserved; + uint16_t m_recordId; + uint16_t m_recordLength; // after header + + char m_userId[eUIDSize]; + char m_desc[eDescriptionSize]; + std::vector m_data; +}; + +/// Equality operator. +/// Implemented in terms of LASVariableRecord::equal member function. +/// \exception No throw +inline bool operator==(LASVariableRecord const& lhs, LASVariableRecord const& rhs) +{ + return lhs.equal(rhs); +} + +/// Inequality operator. +/// Implemented in terms of LASRecordHeader::equal member function. +/// \exception No throw +inline bool operator!=(LASVariableRecord const& lhs, LASVariableRecord const& rhs) +{ + return (!(lhs == rhs)); +} + +} // namespace liblas + +#endif // LIBLAS_LASVARIABLERECORD_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/laswriter.hpp work/libLAS-1.2.1/include/liblas/laswriter.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/laswriter.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/laswriter.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,98 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS writer class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#ifndef LIBLAS_LASWRITER_HPP_INCLUDED +#define LIBLAS_LASWRITER_HPP_INCLUDED + +#include +#include +#include +// std +#include // std::ostream +#include +#include +#include // std::size_t + +namespace liblas +{ + +/// \todo To be documented. +class LASWriter +{ +public: + + LASWriter(std::ostream& ofs, LASHeader const& header); + ~LASWriter(); + + std::size_t GetVersion() const; + LASHeader const& GetHeader() const; + + /// \todo TODO: Move point record composition deep into writer implementation. + /// \todo TODO: How to handle point_source_id in portable way, for LAS 1.0 and 1.1 + bool WritePoint(LASPoint const& point); + + // Allow fetching of the stream + std::ostream& GetStream() const; + + // Allow in-place writing of header + void WriteHeader(LASHeader& header); + + // Reproject data as they are written if the LASWriter's reference is + // different than the LASHeader's + bool SetSRS(const LASSpatialReference& ref); + + +private: + + // Blocked copying operations, declared but not defined. + LASWriter(LASWriter const& other); + LASWriter& operator=(LASWriter const& rhs); + + const std::auto_ptr m_pimpl; + + LASHeader m_header; + detail::PointRecord m_record; + +}; + +} // namespace liblas + +#endif // ndef LIBLAS_LASWRITER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/liblas.hpp work/libLAS-1.2.1/include/liblas/liblas.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/liblas/liblas.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/liblas/liblas.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,121 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS include file + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Phil Vachon + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + + +#ifndef LIBLAS_HPP_INCLUDED +#define LIBLAS_HPP_INCLUDED + +#include +#include +#include + +/// Namespace grouping all elements of libLAS public interface. +/// \note +/// User's may notice there is namespace \em detail nested +/// in the \em liblas. The \em detail should be considered as +/// private namespace dedicated for implementation details, +/// so libLAS are not supposed to access it directly, +/// nor included headers from the \em detail subdirectory of \em liblas include folder. +namespace liblas +{ + +/// Version numbers of the ASPRS LAS Specification. +/// Numerical representation of versions is calculated according to +/// following formula: major * 100000 + minor +enum LASFileVersion +{ + eLASVersion10 = 1 * 100000 + 0, ///< LAS Format 1.0 + eLASVersion11 = 1 * 100000 + 1, ///< LAS Format 1.1 + eLASVersion12 = 1 * 100000 + 2, ///< LAS Format 1.2 + eLASVersion20 = 2 * 100000 + 0 ///< LAS Format 2.0 +}; + +/// Open file to read in binary mode. +/// The input file is also attached to input stream. +/// \param ifs - reference to input file stream to +/// which opened file is attached +/// \param filename - name of file to open +/// \return true if file has been opened with success, false otherwise +/// \exception No throw +/// +inline bool Open(std::ifstream& ifs, std::string const& filename) // throw() +{ + ifs.open(filename.c_str(), std::ios::in | std::ios::binary); + return ifs.is_open(); +} + +/// Create file and open to write in binary mode. +/// The output file is also attached to output stream. +/// \param ofs - reference to output file stream to +/// which created file is attached +/// \param filename - name of file to open +/// \return true if file has been create with success, false otherwise +/// \exception No throw +/// +inline bool Create(std::ofstream& ofs, std::string const& filename) // throw() +{ + ofs.open(filename.c_str(), std::ios::out | std::ios::binary); + return ofs.is_open(); +} + +inline bool IsGDALEnabled() +{ +#ifdef HAVE_GDAL + return true; +#else + return false; +#endif +} + +inline bool IsLibGeoTIFFEnabled() +{ +#ifdef HAVE_LIBGEOTIFF + return true; +#else + return false; +#endif +} + +} // namespace liblas + +#endif // LIBLAS_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/Makefile.am work/libLAS-1.2.1/include/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/include/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/include/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,34 @@ +lasdir = $(includedir) + +nobase_las_HEADERS = liblas/cstdint.hpp \ + liblas/exception.hpp \ + liblas/guid.hpp \ + liblas/iterator.hpp \ + liblas/lascolor.hpp \ + liblas/laserror.hpp \ + liblas/lasfile.hpp \ + liblas/lasheader.hpp \ + liblas/laspoint.hpp \ + liblas/lasreader.hpp \ + liblas/lasvariablerecord.hpp \ + liblas/lasspatialreference.hpp \ + liblas/laswriter.hpp \ + liblas/liblas.hpp \ + liblas/capi/liblas.h \ + liblas/capi/las_version.h \ + liblas/capi/las_config.h \ + liblas/detail/endian.hpp \ + liblas/detail/file.hpp \ + liblas/detail/fwd.hpp \ + liblas/detail/reader.hpp \ + liblas/detail/reader10.hpp \ + liblas/detail/reader11.hpp \ + liblas/detail/reader12.hpp \ + liblas/detail/sha1.hpp \ + liblas/detail/sharedptr.hpp \ + liblas/detail/timer.hpp \ + liblas/detail/utility.hpp \ + liblas/detail/writer.hpp \ + liblas/detail/writer10.hpp \ + liblas/detail/writer11.hpp \ + liblas/detail/writer12.hpp \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/INSTALL work/libLAS-1.2.1/INSTALL --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/INSTALL 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/INSTALL 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,40 @@ +*************************************************************** +libLAS Installation +*************************************************************** + + +Unix +~~~~~~~~~~~~~~~~~~~ + +libLAS uses a typical GNU autoconf/automake framework for +building and installation on unix-like platforms. + +The quick and dirty installation that would install things +by default in /usr/local might look like: + +:: + + ./configure + make + make install + +Configure libLAS for debugging and install in my home directory: + +:: + + ./configure --enable-debug --prefix=/home/hobu/liblas + +If you are building directly from subversion, you will need to generate +the configure script first. This will require that your system have +autotools installed. + +:: + + ./autogen.sh + +Windows +~~~~~~~~~~~~~~~~~~~ + +Copy the windows package zip file into a directory of your +choosing and unzip. You should be able to run the utility +applications. \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/LICENSE.txt work/libLAS-1.2.1/LICENSE.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/LICENSE.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/LICENSE.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,226 @@ +libLAS Main License +============================================================================== + +Copyright (c) 2007, Martin Isenburg, isenburg at cs.unc.edu + +Copyright (c) 2008, Howard Butler, hobu.inc at gmail.com + +Copyright (c) 2008, Mateusz Loskot, mateusz at loskot.net + +Copyright (c) 2008, Phil Vachon, philippe at cowpig.ca + +Copyright (c) 2008, Frank Warmerdam, warmerdam at pobox.com + +Copyright (c) 2008, Martin Rodriguez, mrodriguez at stereocarto.com + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following +conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided + with the distribution. + * Neither the name of the Martin Isenburg or Iowa Department + of Natural Resources nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. + +include/liblas/cstdint.hpp +============================================================================== + +This file has been stolen from and +modified for libLAS purposes. + +(C) Copyright Mateusz Loskot 2007 + +(C) Copyright Phil Vachon 2007 + +(C) Copyright John Maddock 2001 + +(C) Copyright Jens Mauer 2001 + +(C) Copyright Beman Dawes 1999 + +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +include/liblas/detail/endian.hpp +============================================================================== + +This file has been stolen from and +modified for libLAS purposes. + +(C) Copyright Mateusz Loskot 2007 + +(C) Copyright Caleb Epstein 2005 + +(C) Copyright John Maddock 2006 + +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +include/liblas/detail/sha1.hpp +============================================================================== + +Copyright (C) 1998 +Paul E. Jones +All Rights Reserved. + +This software is licensed as "freeware." Permission to distribute +this software in source and binary forms is hereby granted without +a fee. THIS SOFTWARE IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +THE AUTHOR SHALL NOT BE HELD LIABLE FOR ANY DAMAGES RESULTING +FROM THE USE OF THIS SOFTWARE, EITHER DIRECTLY OR INDIRECTLY, INCLUDING, +BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE. + +include/liblas/detail/sharedptr.hpp +============================================================================== + +The SharedPtr class is based on implementation of CountedPtr +from the book "The C++ Standard Library - A Tutorial and Reference". It is +released under the main libLAS licensing terms. + +(C) Copyright Nicolai M. Josuttis 1999 + +(C) Copyright Mateusz Loskot 2008, (modifications) + +python/tests/test_doctests.py +============================================================================== + +Copyright (c) 2007, Sean C. Gillies, sgillies at frii.com + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Sean C. Gillies nor the names of + its contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +src/Verson.rc +============================================================================== + +Copyright (c) 2005, Frank Warmerdam, warmerdam at pobox.com + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + +src/gt_wkt_srs.cpp +============================================================================== + +Copyright (c) 1999, Frank Warmerdam, warmerdam at pobox.com + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/Makefile.am work/libLAS-1.2.1/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,18 @@ +SUBDIRS = src apps include test + +if GDAL_IS_CONFIG +GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 +endif + +if GEOTIFF_IS_CONFIG +GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 +endif + +AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail + + +EXTRA_DIST = \ + nmake.opt \ + makefile.vc \ + src/makefile.vc \ + src/Version.rc \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/makefile.vc work/libLAS-1.2.1/makefile.vc --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/makefile.vc 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/makefile.vc 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,85 @@ +# $Id$ +# +# Main libLAS makefile for use with NMAKE and Microsoft Visual C++ +# +LAS_ROOT = . + +!INCLUDE nmake.opt + +CC= cl +LINK= link + +default: src_dir apps_dir + +src_dir: + cd src + $(MAKE) /f makefile.vc + cd .. + +apps_dir: + cd apps + $(MAKE) /f makefile.vc + cd .. + +clean: + -del *.bak + -del *.lib + -del *.obj + -del *.pdb + cd src + $(MAKE) /f makefile.vc clean + cd .. + cd apps + $(MAKE) /f makefile.vc clean + cd .. + -rmdir /s /q osgeo4w + -rmdir /s /q $(BINDIR) + -rmdir /s /q packages + +install: src_dir apps_dir + -mkdir $(BINDIR) + -mkdir $(LAS_HOME)\packages + -mkdir $(BINDIR)\lib + -mkdir $(BINDIR)\include\liblas + -mkdir $(OSGEO4W_DIR) + -mkdir $(OSGEO4W_DIR)\lib + -mkdir $(OSGEO4W_DIR)\devel + -mkdir $(OSGEO4W_DIR)\lib\bin + -mkdir $(OSGEO4W_DIR)\devel\include + -mkdir $(OSGEO4W_DIR)\devel\include\liblas + -mkdir $(OSGEO4W_DIR)\devel\lib + -mkdir $(OSGEO4W_DIR)\apps\python25\lib\site-packages\liblas + cd src + $(MAKE) /f makefile.vc install + cd .. + cd apps + $(MAKE) /f makefile.vc install + cd .. + xcopy /y /r /d /f src\liblas_i.lib $(BINDIR)\lib + xcopy /y /r /d /f src\liblas_i.lib $(OSGEO4W_DIR)\devel\lib + xcopy /y /r /d /f src\liblas.lib $(BINDIR)\lib + xcopy /y /r /d /f src\liblas.lib $(OSGEO4W_DIR)\devel\lib + xcopy /y /r /d /f src\Version.rc $(BINDIR)\include\liblas + xcopy /y /r /d /f src\Version.rc $(OSGEO4W_DIR)\devel\include\liblas + xcopy /y /r /d /f /s include\liblas $(BINDIR)\include\liblas + xcopy /y /r /d /f /s include\liblas $(OSGEO4W_DIR)\devel\include\liblas + xcopy /y /r /d /f /s python\liblas\*.py $(OSGEO4W_DIR)\apps\python25\lib\site-packages\liblas + +package: install + cd $(LAS_HOME)/osgeo4w/lib + C:\cygwin\bin\tar.exe cvf ../../packages/liblas-$(PACKAGE_VERSION).tar * + c:\cygwin\bin\bzip2.exe -f /cygdrive/c/cvs/liblas/packages/liblas-$(PACKAGE_VERSION).tar + cd $(LAS_HOME)/osgeo4w/ + C:\cygwin\bin\tar.exe cvf ../packages/liblas-python-$(PACKAGE_VERSION).tar apps + c:\cygwin\bin\bzip2.exe -f /cygdrive/c/cvs/liblas/packages/liblas-python-$(PACKAGE_VERSION).tar + cd $(LAS_HOME)/osgeo4w/devel + C:\cygwin\bin\tar.exe cvf ../../packages/liblas-devel-$(PACKAGE_VERSION).tar * + c:\cygwin\bin\bzip2.exe -f /cygdrive/c/cvs/liblas/packages/liblas-devel-$(PACKAGE_VERSION).tar + cd $(LAS_HOME)/osgeo4w/ + cd $(LAS_HOME)/ + xcopy /y /r /d /f /s c:\osgeo4w\bin\geotiff.dll $(BINDIR) + xcopy /y /r /d /f /s c:\osgeo4w\bin\libtiff.dll $(BINDIR) + xcopy /y /r /d /f /s c:\osgeo4w\bin\jpeg_osgeo.dll $(BINDIR) + xcopy /y /r /d /f /s c:\osgeo4w\bin\jpeg12_osgeo.dll $(BINDIR) + xcopy /y /r /d /f /s c:\osgeo4w\bin\zlib_osgeo.dll $(BINDIR) + c:\cygwin\bin\zip.exe -r packages/liblas-$(PACKAGE_VERSION)-win32.zip bin \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/nmake.opt work/libLAS-1.2.1/nmake.opt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/nmake.opt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/nmake.opt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,198 @@ +# $Id$ +# +# nmake.opt - main configuration file for NMAKE makefiles +# +!MESSAGE *** libLAS Build Configuration *** +!INCLUDE + +############################################################################### +# For convenience, user may put custom settings to private mynmake.opt +# and use EXT_NMAKE_OPT option while calling nmake.exe, as follows: +# +# nmake -f makefile.vc EXT_NMAKE_OPT=mynmake.opt +!IFDEF EXT_NMAKE_OPT +!MESSAGE *** Setting EXT_NMAKE_OPT $(EXT_NMAKE_OPT) +!INCLUDE $(EXT_NMAKE_OPT) +!ENDIF + +############################################################################### +# libLAS package settings + +LAS_LIB = liblas.lib +LAS_DLL = liblas1.dll +LAS_LIB_DLL = liblas_i.lib + +# only used for filenames of packages +PACKAGE_VERSION = 1.2.1 + +!MESSAGE *** Setting PACKAGE_VERSION $(PACKAGE_VERSION) + +############################################################################### +# Set BUILD_DEBUG balue to YES if you want to make debug build +# and to prepare not optimized binaries. +!IFNDEF BUILD_DEBUG +BUILD_DEBUG = NO +!ENDIF + +!MESSAGE *** Setting BUILD_DEBUG $(BUILD_DEBUG) + +############################################################################### +# libLAS include directories +INCLUDES = -I$(LAS_ROOT)/include -I$(LAS_ROOT)/include/liblas/capi + +!MESSAGE *** Setting libLAS INCLUDE to -I$(LAS_ROOT)/include -I$(LAS_ROOT)/include/liblas/capi + +############################################################################### +# GeoTIFF Support +# Uncomment the folling line to build GeoTIFF support for reading and +# writing LAS files with Coordinate Systems information. +# comment out GEOTIFF_HOME if you are building against a GDAL source tree + +!IFNDEF GEOTIFF_HOME +GEOTIFF_HOME=C:\OSGeo4W +!ENDIF + +!IF "$(GEOTIFF_HOME)" != "" && EXIST("$(GEOTIFF_HOME)") +!MESSAGE *** GeoTIFF support enabled +!MESSAGE *** Setting GEOTIFF_HOME $(GEOTIFF_HOME) + +GEOTIFF_LIB = $(GEOTIFF_HOME)\lib\geotiff_i.lib +GEOTIFF_INCLUDE = -I$(GEOTIFF_HOME)\include +INCLUDES = $(INCLUDES) $(GEOTIFF_INCLUDE) + +!ELSE +GEOTIFF_HOME="" +!MESSAGE *** Support of GeoTIFF has been disabled (GEOTIFF_HOME not set) +!ENDIF + +############################################################################### +# GDAL/OGR Support +# Uncomment the following line to build OGR support for the las2ogr command +# and WKT SRS support +#USE_GDAL_SOURCE_TREE=YES +#GDAL_HOME=C:\cvs\buildkit\gdal + +!IFNDEF GDAL_HOME +GDAL_HOME=C:\OSGeo4W +!ENDIF + +!IF "$(GDAL_HOME)" != "" && EXIST("$(GDAL_HOME)") +!MESSAGE *** GDAL/OGR support enabled +!MESSAGE *** Setting GDAL_HOME $(GDAL_HOME) + +GDAL_LIB = $(GDAL_HOME)\lib\gdal_i.lib +GDAL_INCLUDE = -I$(GDAL_HOME)\include +!IF "$(USE_GDAL_SOURCE_TREE)" == "YES" +GDAL_LIB = $(GDAL_HOME)\gdal_i.lib +GDAL_INCLUDE = -I$(GDAL_HOME)\port -I$(GDAL_HOME)\frmts\gtiff\libgeotiff -I$(GDAL_HOME)\frmts\gtiff\libtiff -I$(GDAL_HOME)\ogr -I$(GDAL_HOME)\gcore +GEOTIFF_INCLUDE = -I$(GEOTIFF_HOME)\frmts\gtiff\libgeotiff +!ENDIF +INCLUDES = $(INCLUDES) $(GDAL_INCLUDE) + +!ELSE +GDAL_HOME="" +!MESSAGE *** Support of GDAL/OGR has been disabled (GDAL_HOME not set) +!ENDIF + +############################################################################### +# Distribution directories + +LAS_HOME=C:\cvs\liblas +BINDIR=$(LAS_HOME)\bin +OSGEO4W_DIR = $(LAS_HOME)\osgeo4w +PYDLL_DIR = $(LAS_HOME)\python + +############################################################################### +# Derive version of Visual C++ being used from NMAKE if not specified +# +# WARNING: +# If we should expect variety of NMAKE build versions, tests below may fail +# and we will need to fall back to setting MSVCVER as command line parameter. +# +!IF "$(_NMAKE_VER)" == "" +MSVCVER = 4.0 +!ERROR *** Failed to determine version of Visual C++ +!ELSEIF "$(_NMAKE_VER)" == "162" +MSVCVER = 5.0 +!ERROR *** Detected Visual C++ 5.0 - NOT SUPPORTED +!ELSEIF "$(_NMAKE_VER)" == "6.00.8168.0" +MSVCVER = 6.0 +!ERROR *** Detected Visual C++ 6.0 - NOT SUPPORTED +!ELSEIF "$(_NMAKE_VER)" == "7.00.9466" +MSVCVER = 7.0 +!ELSEIF "$(_NMAKE_VER)" == "7.10.3077" +MSVCVER = 7.1 +!ELSEIF "$(_NMAKE_VER)" == "8.00.50727.42" +MSVCVER = 8.0 +!ELSEIF "$(_NMAKE_VER)" == "8.00.50727.762" +MSVCVER = 8.0 +!ELSEIF "$(_NMAKE_VER)" == "9.00.30729.01" +MSVCVER = 9.0 +!ELSE +MSVCVER = 0.0 +!ENDIF + +!IF "$(MSVCVER)" == "0.0" +!MESSAGE *** Cannot determined Visual C++ version +!ERROR *** Aborting make job +!ELSE +!MESSAGE *** Using Microsoft NMAKE version $(_NMAKE_VER) +!MESSAGE *** Using Microsoft Visual C++ version $(MSVCVER) +!ENDIF + +############################################################################### +# Compilation flags for Release and Debug modes + +!IF "$(BUILD_DEBUG)" == "YES" +OPTFLAGS= /nologo /MDd /EHsc /Z7 /W4 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /DDEBUG /D_DEBUG /Fd$(LAS_ROOT)\las.pdb +LAS_LIB = liblas_d.lib +LAS_DLL = liblas_d1.dll +LAS_LIB_DLL = libl1as_i.lib +!ELSE + +# You may need to remove /GR if you are statically linking libLAS +OPTFLAGS=/nologo /MD /EHsc /Ox /GR /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /DNDEBUG +LAS_LIB = liblas.lib +LAS_DLL = liblas1.dll +LAS_LIB_DLL = liblas_i.lib +!ENDIF + +# Check if multiple process build available +!IF "$(MSVCVER)" == "9.0" +MPFLAGS=/MP +!MESSAGE *** Using /MP flag with number of effective processors +!ELSE +MPFLAGS="" +!ENDIF + +CFLAGS= $(MPFLAGS) $(OPTFLAGS) $(INCLUDES) + +!IF "$(GEOTIFF_HOME)" != "" && EXIST("$(GEOTIFF_HOME)") +CFLAGS = $(CFLAGS) /DHAVE_LIBGEOTIFF=1 +!ENDIF + +!IF "$(GDAL_HOME)" != "" && EXIST("$(GDAL_HOME)") +CFLAGS = $(CFLAGS) /DHAVE_GDAL=1 +!IF "$(USE_GDAL_SOURCE_TREE)" == "YES" +CFLAGS = $(CFLAGS) /DHAVE_LIBGEOTIFF=1 +!ENDIF +!ENDIF + +############################################################################### +# Building toolset programs + +# Compiler executable +CC = cl.exe + +# Linker executable +# - Dynamic-Linked Libraries +# $(LINK) /dll +# - Static Libraries (use of lib.exe wrapper is not portable, see VC++ Toolkit 2003) +# $(LINK) /lib +LINK = link.exe + +.c.obj: + $(CC) $(CFLAGS) /c $*.c /Fo$*.obj + +.cpp.obj: + $(CC) $(CFLAGS) /c $*.cpp /Fo$*.obj diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/__init__.py work/libLAS-1.2.1/python/liblas/__init__.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/__init__.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/__init__.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,11 @@ +from core import * +version = get_version() +HAVE_GDAL = bool(las.LAS_IsGDALEnabled()) +HAVE_LIBGEOTIFF = bool(las.LAS_IsLibGeoTIFFEnabled()) + +import file +import point +import header +import vlr +import color +import srs diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/color.py work/libLAS-1.2.1/python/liblas/color.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/color.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/color.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,75 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python Color implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2009, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core +import ctypes + +class Color(object): + def __init__(self, red=0, green=0, blue=0, owned=True, handle=None): + if handle: + self.handle = handle + else: + self.handle = core.las.LASColor_Create() + self.owned = owned + def __del__(self): + if self.owned: + if self.handle and core: + core.las.LASColor_Destroy(self.handle) + + def get_red(self): + return core.las.LASColor_GetRed(self.handle) + def set_red(self, value): + return core.las.LASColor_SetRed(self.handle, value) + red = property(get_red, set_red) + + def get_green(self): + return core.las.LASColor_GetGreen(self.handle) + def set_green(self, value): + return core.las.LASColor_SetGreen(self.handle, value) + green = property(get_green, set_green) + + def get_blue(self): + return core.las.LASColor_GetBlue(self.handle) + def set_blue(self, value): + return core.las.LASColor_SetBlue(self.handle, value) + blue = property(get_blue, set_blue) + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/core.py work/libLAS-1.2.1/python/liblas/core.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/core.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/core.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,629 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python ctypes function calls + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import atexit, os, re, sys +import ctypes +from ctypes.util import find_library + +from ctypes import PyDLL + +class LASException(Exception): + "libLAS exception, indicates a libLAS-related error." + pass + + +def check_return(result, func, cargs): + "Error checking for LASError calls" + if result != 0: + msg = 'LASError in "%s": %s' % (func.__name__, las.LASError_GetLastErrorMsg() ) + las.LASError_Reset() + raise LASException(msg) + return True + +def check_void(result, func, cargs): + "Error checking for void* returns" + if not bool(result): + msg = 'LASError in "%s": %s' % (func.__name__, las.LASError_GetLastErrorMsg() ) + las.LASError_Reset() + raise LASException(msg) + return result + +def check_void_done(result, func, cargs): + "Error checking for void* returns that might be empty with no error" + if las.LASError_GetErrorCount(): + msg = 'LASError in "%s": %s' % (func.__name__, las.LASError_GetLastErrorMsg() ) + las.LASError_Reset() + raise LASException(msg) + + return result + +def check_value(result, func, cargs): + "Error checking proper value returns" + count = las.LASError_GetErrorCount() + if count != 0: + msg = 'LASError in "%s": %s' % (func.__name__, las.LASError_GetLastErrorMsg() ) + las.LASError_Reset() + raise LASException(msg) + return result + +def check_value_free(result, func, cargs): + "Error checking proper value returns" + count = las.LASError_GetErrorCount() + if count != 0: + msg = 'LASError in "%s": %s' % (func.__name__, las.LASError_GetLastErrorMsg() ) + las.LASError_Reset() + raise LASException(msg) + retval = ctypes.string_at(result)[:] + + # these might end up being double frees, I don't know why + # free(result) + return retval + +def free_returned_char_p(result, func, cargs): + + size = ctypes.c_int() + retvalue = ctypes.string_at(result) + + # these might end up being double frees, I don't know why + # free(result) + return retvalue + +if os.name == 'nt': + # stolen from Shapely + # http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/shapely/geos.py + lib_name = 'liblas1.dll' + try: + local_dlls = os.path.abspath(os.__file__ + "../../../DLLs") + original_path = os.environ['PATH'] + os.environ['PATH'] = "%s;%s" % (local_dlls, original_path) + las = ctypes.CDLL(lib_name) + def free(m): + try: + free = ctypes.cdll.msvcrt.free(m) + except WindowsError: + pass + except (ImportError, WindowsError): + raise + + +elif os.name == 'posix': + platform = os.uname()[0] + if platform == 'Darwin': + lib_name = 'liblas.dylib' + free = ctypes.CDLL(find_library('libc')).free + else: + lib_name = 'liblas.so' + free = ctypes.CDLL(find_library('libc.so.6')).free + las = ctypes.CDLL(lib_name) +else: + raise LASException('Unsupported OS "%s"' % os.name) + + + +def get_version(): + return las.LAS_GetVersion() + +version = get_version() + +las.LAS_IsGDALEnabled.restype = ctypes.c_int +las.LAS_IsLibGeoTIFFEnabled.restype = ctypes.c_int + +las.LAS_GetVersion.restype = ctypes.POINTER(ctypes.c_char) +las.LAS_GetVersion.errcheck = free_returned_char_p + +las.LASError_GetLastErrorNum.restype = ctypes.c_int + +las.LASError_GetLastErrorMsg.restype = ctypes.POINTER(ctypes.c_char) +las.LASError_GetLastErrorMsg.errcheck = free_returned_char_p + +las.LASError_GetLastErrorMethod.restype = ctypes.POINTER(ctypes.c_char) +las.LASError_GetLastErrorMethod.errcheck = free_returned_char_p + +las.LASError_GetErrorCount.restype=ctypes.c_int + +las.LASReader_Create.argtypes = [ctypes.c_char_p] +las.LASReader_Create.restype = ctypes.c_void_p +las.LASReader_Create.errcheck = check_void + +las.LASReader_GetNextPoint.restype=ctypes.c_void_p +las.LASReader_GetNextPoint.argtypes = [ctypes.c_void_p] +las.LASReader_GetNextPoint.errcheck = check_void_done + +las.LASReader_GetPointAt.restype = ctypes.c_void_p +las.LASReader_GetPointAt.argtypes = [ctypes.c_void_p, ctypes.c_ulong] +las.LASReader_GetPointAt.errcheck = check_void_done + +las.LASReader_SetSRS.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASReader_SetSRS.errcheck = check_return + +las.LASReader_Destroy.argtypes = [ctypes.c_void_p] +las.LASReader_Destroy.errcheck = check_void_done +las.LASReader_Destroy.restype = None + +las.LASPoint_GetX.restype = ctypes.c_double +las.LASPoint_GetX.argtypes = [ctypes.c_void_p] +las.LASPoint_GetX.errcheck = check_value +las.LASPoint_SetX.restype = ctypes.c_int +las.LASPoint_SetX.argtypes = [ctypes.c_void_p, ctypes.c_double] +las.LASPoint_SetX.errcheck = check_return + +las.LASPoint_GetY.restype = ctypes.c_double +las.LASPoint_GetY.argtypes = [ctypes.c_void_p] +las.LASPoint_GetY.errcheck = check_value +las.LASPoint_SetY.restype = ctypes.c_int +las.LASPoint_SetY.argtypes = [ctypes.c_void_p, ctypes.c_double] +las.LASPoint_SetY.errcheck = check_return + +las.LASPoint_GetZ.restype = ctypes.c_double +las.LASPoint_GetZ.argtypes = [ctypes.c_void_p] +las.LASPoint_GetZ.errcheck = check_value +las.LASPoint_SetZ.restype = ctypes.c_int +las.LASPoint_SetZ.argtypes = [ctypes.c_void_p, ctypes.c_double] +las.LASPoint_SetZ.errcheck = check_return + +las.LASPoint_GetIntensity.restype = ctypes.c_short +las.LASPoint_GetIntensity.argtypes = [ctypes.c_void_p] +las.LASPoint_GetIntensity.errcheck = check_value +las.LASPoint_SetIntensity.restype = ctypes.c_int +las.LASPoint_SetIntensity.argtypes = [ctypes.c_void_p, ctypes.c_short] +las.LASPoint_SetIntensity.errcheck = check_return + +las.LASPoint_GetReturnNumber.restype = ctypes.c_ushort +las.LASPoint_GetReturnNumber.argtypes = [ctypes.c_void_p] +las.LASPoint_GetReturnNumber.errcheck = check_value +las.LASPoint_SetReturnNumber.restype = ctypes.c_int +las.LASPoint_SetReturnNumber.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASPoint_SetReturnNumber.errcheck = check_return + +las.LASPoint_GetNumberOfReturns.restype = ctypes.c_ushort +las.LASPoint_GetNumberOfReturns.argtypes = [ctypes.c_void_p] +las.LASPoint_GetNumberOfReturns.errcheck = check_value +las.LASPoint_SetNumberOfReturns.restype = ctypes.c_int +las.LASPoint_SetNumberOfReturns.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASPoint_SetNumberOfReturns.errcheck = check_return + +las.LASPoint_GetScanDirection.restype = ctypes.c_ushort +las.LASPoint_GetScanDirection.argtypes = [ctypes.c_void_p] +las.LASPoint_GetScanDirection.errcheck = check_value +las.LASPoint_SetScanDirection.restype = ctypes.c_int +las.LASPoint_SetScanDirection.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASPoint_SetScanDirection.errcheck = check_return + +las.LASPoint_GetFlightLineEdge.restype = ctypes.c_ushort +las.LASPoint_GetFlightLineEdge.argtypes = [ctypes.c_void_p] +las.LASPoint_GetFlightLineEdge.errcheck = check_value +las.LASPoint_SetFlightLineEdge.restype = ctypes.c_int +las.LASPoint_SetFlightLineEdge.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASPoint_SetFlightLineEdge.errcheck = check_return + +las.LASPoint_GetScanFlags.restype = ctypes.c_ubyte +las.LASPoint_GetScanFlags.argtypes = [ctypes.c_void_p] +las.LASPoint_GetScanFlags.errcheck = check_value +las.LASPoint_SetScanFlags.restype = ctypes.c_int +las.LASPoint_SetScanFlags.argtypes = [ctypes.c_void_p, ctypes.c_ubyte] +las.LASPoint_SetScanFlags.errcheck = check_return + +las.LASPoint_GetClassification.restype = ctypes.c_ubyte +las.LASPoint_GetClassification.argtypes = [ctypes.c_void_p] +las.LASPoint_GetClassification.errcheck = check_value +las.LASPoint_SetClassification.restype = ctypes.c_int +las.LASPoint_SetClassification.argtypes = [ctypes.c_void_p, ctypes.c_ubyte] +las.LASPoint_SetClassification.errcheck = check_return + +las.LASPoint_GetTime.restype = ctypes.c_double +las.LASPoint_GetTime.argtypes = [ctypes.c_void_p] +las.LASPoint_GetTime.errcheck = check_value +las.LASPoint_SetTime.restype = ctypes.c_int +las.LASPoint_SetTime.argtypes = [ctypes.c_void_p, ctypes.c_double] +las.LASPoint_SetTime.errcheck = check_return + +las.LASPoint_GetScanAngleRank.restype = ctypes.c_int8 +las.LASPoint_GetScanAngleRank.argtypes = [ctypes.c_void_p] +las.LASPoint_GetScanAngleRank.errcheck = check_value +las.LASPoint_SetScanAngleRank.restype = ctypes.c_int +las.LASPoint_SetScanAngleRank.argtypes = [ctypes.c_void_p, ctypes.c_int8] +las.LASPoint_SetScanAngleRank.errcheck = check_return + +las.LASPoint_GetUserData.restype = ctypes.c_ubyte +las.LASPoint_GetUserData.argtypes = [ctypes.c_void_p] +las.LASPoint_GetUserData.errcheck = check_value +las.LASPoint_SetUserData.restype = ctypes.c_int +las.LASPoint_SetUserData.argtypes = [ctypes.c_void_p, ctypes.c_ubyte] +las.LASPoint_SetUserData.errcheck = check_return + +las.LASPoint_Create.restype = ctypes.c_void_p +las.LASPoint_Create.errcheck = check_void + +las.LASPoint_Copy.restype = ctypes.c_void_p +las.LASPoint_Copy.argtypes = [ctypes.c_void_p] +las.LASPoint_Copy.errcheck = check_void + +las.LASPoint_Destroy.argtypes = [ctypes.c_void_p] +las.LASPoint_Destroy.errcheck = check_void_done +las.LASPoint_Destroy.restype = None + +las.LASReader_GetHeader.restype = ctypes.c_void_p +las.LASReader_GetHeader.argtypes = [ctypes.c_void_p] +las.LASReader_GetHeader.errcheck = check_void + +las.LASHeader_Destroy.argtypes = [ctypes.c_void_p] +las.LASHeader_Destroy.errcheck = check_void_done +las.LASHeader_Destroy.restype = None + +las.LASHeader_Copy.restype = ctypes.c_void_p +las.LASHeader_Copy.argtypes = [ctypes.c_void_p] +las.LASHeader_Copy.errcheck = check_void + +las.LASHeader_Create.restype = ctypes.c_void_p +las.LASHeader_Create.errcheck = check_void + +las.LASHeader_GetFileSignature.argtypes = [ctypes.c_void_p] +las.LASHeader_GetFileSignature.errcheck = check_value_free +las.LASHeader_GetFileSignature.restype = ctypes.c_char_p + +las.LASHeader_GetFileSourceId.restype = ctypes.c_ushort +las.LASHeader_GetFileSourceId.argtypes = [ctypes.c_void_p] +las.LASHeader_GetFileSourceId.errcheck = check_value + +las.LASHeader_GetProjectId.argtypes = [ctypes.c_void_p] +las.LASHeader_GetProjectId.errcheck = check_value_free +las.LASHeader_GetProjectId.restype = ctypes.c_char_p + +las.LASHeader_GetVersionMajor.restype = ctypes.c_ubyte +las.LASHeader_GetVersionMajor.argtypes = [ctypes.c_void_p] +las.LASHeader_GetVersionMajor.errcheck = check_value +las.LASHeader_SetVersionMajor.restype = ctypes.c_int +las.LASHeader_SetVersionMajor.argtypes = [ctypes.c_void_p, ctypes.c_ubyte] +las.LASHeader_SetVersionMajor.errcheck = check_return + +las.LASHeader_GetVersionMinor.restype = ctypes.c_ubyte +las.LASHeader_GetVersionMinor.argtypes = [ctypes.c_void_p] +las.LASHeader_GetVersionMinor.errcheck = check_value +las.LASHeader_SetVersionMinor.restype = ctypes.c_int +las.LASHeader_SetVersionMinor.argtypes = [ctypes.c_void_p, ctypes.c_ubyte] +las.LASHeader_SetVersionMinor.errcheck = check_return + +las.LASHeader_GetSystemId.argtypes = [ctypes.c_void_p] +las.LASHeader_GetSystemId.errcheck = check_value_free +las.LASHeader_GetSystemId.restype = ctypes.c_char_p +las.LASHeader_SetSystemId.restype = ctypes.c_int +las.LASHeader_SetSystemId.argtypes = [ctypes.c_void_p, ctypes.c_char_p] +las.LASHeader_SetSystemId.errcheck = check_return + +las.LASHeader_GetSoftwareId.argtypes = [ctypes.c_void_p] +las.LASHeader_GetSoftwareId.errcheck = check_value_free +las.LASHeader_GetSoftwareId.restype = ctypes.c_char_p +las.LASHeader_SetSoftwareId.restype = ctypes.c_int +las.LASHeader_SetSoftwareId.argtypes = [ctypes.c_void_p, ctypes.c_char_p] +las.LASHeader_SetSoftwareId.errcheck = check_return + +las.LASHeader_GetReserved.restype = ctypes.c_short +las.LASHeader_GetReserved.argtypes = [ctypes.c_void_p] +las.LASHeader_GetReserved.errcheck = check_value + +las.LASHeader_GetCreationDOY.restype = ctypes.c_ushort +las.LASHeader_GetCreationDOY.argtypes = [ctypes.c_void_p] +las.LASHeader_GetCreationDOY.errcheck = check_value +las.LASHeader_SetCreationDOY.restype = ctypes.c_int +las.LASHeader_SetCreationDOY.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASHeader_SetCreationDOY.errcheck = check_return + +las.LASHeader_GetCreationYear.restype = ctypes.c_ushort +las.LASHeader_GetCreationYear.argtypes = [ctypes.c_void_p] +las.LASHeader_GetCreationYear.errcheck = check_value +las.LASHeader_SetCreationYear.restype = ctypes.c_int +las.LASHeader_SetCreationYear.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASHeader_SetCreationYear.errcheck = check_return + +las.LASHeader_GetHeaderSize.restype = ctypes.c_ushort +las.LASHeader_GetHeaderSize.argtypes = [ctypes.c_void_p] +las.LASHeader_GetHeaderSize.errcheck = check_value + +las.LASHeader_GetDataOffset.restype = ctypes.c_ulong +las.LASHeader_GetDataOffset.argtypes = [ctypes.c_void_p] +las.LASHeader_GetDataOffset.errcheck = check_value + +las.LASHeader_SetDataOffset.restype = ctypes.c_int +las.LASHeader_SetDataOffset.argtypes = [ctypes.c_void_p, ctypes.c_int] +las.LASHeader_SetDataOffset.errcheck = check_return + +las.LASHeader_GetRecordsCount.restype = ctypes.c_ulong +las.LASHeader_GetRecordsCount.argtypes = [ctypes.c_void_p] +las.LASHeader_GetRecordsCount.errcheck = check_value + +las.LASHeader_GetDataFormatId.restype = ctypes.c_ubyte +las.LASHeader_GetDataFormatId.argtypes = [ctypes.c_void_p] +las.LASHeader_GetDataFormatId.errcheck = check_value + +las.LASHeader_SetDataFormatId.restype = ctypes.c_int +las.LASHeader_SetDataFormatId.argtypes = [ctypes.c_void_p, ctypes.c_int] +las.LASHeader_SetDataFormatId.errcheck = check_return + +las.LASHeader_GetDataRecordLength.restype = ctypes.c_ushort +las.LASHeader_GetDataRecordLength.argtypes = [ctypes.c_void_p] +las.LASHeader_GetDataRecordLength.errcheck = check_value + +las.LASHeader_GetPointRecordsCount.restype = ctypes.c_ulong +las.LASHeader_GetPointRecordsCount.argtypes = [ctypes.c_void_p] +las.LASHeader_GetPointRecordsCount.errcheck = check_value +las.LASHeader_SetPointRecordsCount.restype = ctypes.c_int +las.LASHeader_SetPointRecordsCount.argtypes = [ctypes.c_void_p, ctypes.c_ulong] +las.LASHeader_SetPointRecordsCount.errcheck = check_return + +las.LASHeader_GetPointRecordsByReturnCount.restype = ctypes.c_ulong +las.LASHeader_GetPointRecordsByReturnCount.argtypes = [ctypes.c_void_p, ctypes.c_int] +las.LASHeader_GetPointRecordsByReturnCount.errcheck = check_value +las.LASHeader_SetPointRecordsByReturnCount.restype = ctypes.c_int +las.LASHeader_SetPointRecordsByReturnCount.argtypes = [ctypes.c_void_p, ctypes.c_int, ctypes.c_ulong] +las.LASHeader_SetPointRecordsByReturnCount.errcheck = check_return + +las.LASHeader_GetScaleX.restype = ctypes.c_double +las.LASHeader_GetScaleX.argtypes = [ctypes.c_void_p] +las.LASHeader_GetScaleX.errcheck = check_value +las.LASHeader_GetScaleY.restype = ctypes.c_double +las.LASHeader_GetScaleY.argtypes = [ctypes.c_void_p] +las.LASHeader_GetScaleY.errcheck = check_value +las.LASHeader_GetScaleZ.restype = ctypes.c_double +las.LASHeader_GetScaleZ.argtypes = [ctypes.c_void_p] +las.LASHeader_GetScaleZ.errcheck = check_value +las.LASHeader_SetScale.restype = ctypes.c_int +las.LASHeader_SetScale.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_double, ctypes.c_double] +las.LASHeader_SetScale.errcheck = check_return + +las.LASHeader_GetOffsetX.restype = ctypes.c_double +las.LASHeader_GetOffsetX.argtypes = [ctypes.c_void_p] +las.LASHeader_GetOffsetX.errcheck = check_value +las.LASHeader_GetOffsetY.restype = ctypes.c_double +las.LASHeader_GetOffsetY.argtypes = [ctypes.c_void_p] +las.LASHeader_GetOffsetY.errcheck = check_value +las.LASHeader_GetOffsetZ.restype = ctypes.c_double +las.LASHeader_GetOffsetZ.argtypes = [ctypes.c_void_p] +las.LASHeader_GetOffsetZ.errcheck = check_value +las.LASHeader_SetOffset.restype = ctypes.c_int +las.LASHeader_SetOffset.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_double, ctypes.c_double] +las.LASHeader_SetOffset.errcheck = check_return + +las.LASHeader_GetMinX.restype = ctypes.c_double +las.LASHeader_GetMinX.argtypes = [ctypes.c_void_p] +las.LASHeader_GetMinX.errcheck = check_value +las.LASHeader_GetMinY.restype = ctypes.c_double +las.LASHeader_GetMinY.argtypes = [ctypes.c_void_p] +las.LASHeader_GetMinY.errcheck = check_value +las.LASHeader_GetMinZ.restype = ctypes.c_double +las.LASHeader_GetMinZ.argtypes = [ctypes.c_void_p] +las.LASHeader_GetMinZ.errcheck = check_value +las.LASHeader_SetMin.restype = ctypes.c_int +las.LASHeader_SetMin.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_double, ctypes.c_double] +las.LASHeader_SetMin.errcheck = check_return + +las.LASHeader_GetMaxX.restype = ctypes.c_double +las.LASHeader_GetMaxX.argtypes = [ctypes.c_void_p] +las.LASHeader_GetMaxX.errcheck = check_value +las.LASHeader_GetMaxY.restype = ctypes.c_double +las.LASHeader_GetMaxY.argtypes = [ctypes.c_void_p] +las.LASHeader_GetMaxY.errcheck = check_value +las.LASHeader_GetMaxZ.restype = ctypes.c_double +las.LASHeader_GetMaxZ.argtypes = [ctypes.c_void_p] +las.LASHeader_GetMaxZ.errcheck = check_value +las.LASHeader_SetMax.restype = ctypes.c_int +las.LASHeader_SetMax.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_double, ctypes.c_double] +las.LASHeader_SetMax.errcheck = check_return + +las.LASHeader_GetVLR.argtypes = [ctypes.c_void_p, ctypes.c_int] +las.LASHeader_GetVLR.errcheck = check_void +las.LASHeader_GetVLR.restype = ctypes.c_void_p + +las.LASHeader_DeleteVLR.argtypes = [ctypes.c_void_p, ctypes.c_int] +las.LASHeader_DeleteVLR.errcheck = check_return + +las.LASHeader_AddVLR.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASHeader_AddVLR.errcheck = check_return + +las.LASWriter_Create.restype = ctypes.c_void_p +las.LASWriter_Create.argtypes = [ctypes.c_char_p, ctypes.c_void_p, ctypes.c_int] +las.LASWriter_Create.errcheck = check_void + +las.LASWriter_WritePoint.restype = ctypes.c_int +las.LASWriter_WritePoint.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASWriter_WritePoint.errcheck = check_return + +las.LASWriter_WriteHeader.restype = ctypes.c_int +las.LASWriter_WriteHeader.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASWriter_WriteHeader.errcheck = check_return + +las.LASWriter_SetSRS.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASWriter_SetSRS.errcheck = check_return + +las.LASWriter_Destroy.argtypes = [ctypes.c_void_p] +las.LASWriter_Destroy.errcheck = check_void_done +las.LASWriter_Destroy.restype = None + +las.LASGuid_Destroy.argtypes = [ctypes.c_void_p] +las.LASGuid_Destroy.errcheck = check_void_done +las.LASGuid_Destroy.restype = None + +las.LASGuid_AsString.argtypes = [ctypes.c_void_p] +las.LASGuid_AsString.errcheck = check_value_free +las.LASGuid_AsString.restype = ctypes.c_char_p + +las.LASGuid_Equals.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASGuid_Equals.restype = ctypes.c_int +las.LASGuid_Equals.errcheck = check_value + +las.LASGuid_CreateFromString.argtypes =[ctypes.c_char_p] +las.LASGuid_CreateFromString.errcheck = check_void +las.LASGuid_CreateFromString.restype = ctypes.c_void_p + +las.LASGuid_Create.errcheck = check_void +las.LASGuid_Create.restype = ctypes.c_void_p + +las.LASHeader_GetGUID.argtypes = [ctypes.c_void_p] +las.LASHeader_GetGUID.errcheck = check_void +las.LASHeader_GetGUID.restype = ctypes.c_void_p +las.LASHeader_SetGUID.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASHeader_SetGUID.errcheck = check_value +las.LASHeader_SetGUID.restype = ctypes.c_int + +las.LASVLR_Create.errcheck = check_void +las.LASVLR_Create.restype = ctypes.c_void_p + +las.LASVLR_Destroy.argtypes = [ctypes.c_void_p] +las.LASVLR_Destroy.errcheck = check_void_done +las.LASVLR_Destroy.restype = None + +las.LASVLR_GetUserId.argtypes = [ctypes.c_void_p] +las.LASVLR_GetUserId.errcheck = check_value_free +las.LASVLR_GetUserId.restype = ctypes.c_char_p +las.LASVLR_SetUserId.argtypes = [ctypes.c_void_p, ctypes.c_char_p] +las.LASVLR_SetUserId.errcheck = check_return +las.LASVLR_SetUserId.restype = ctypes.c_int + +las.LASVLR_GetDescription.argtypes = [ctypes.c_void_p] +las.LASVLR_GetDescription.errcheck = check_value_free +las.LASVLR_GetDescription.restype = ctypes.c_char_p +las.LASVLR_SetDescription.argtypes = [ctypes.c_void_p, ctypes.c_char_p] +las.LASVLR_SetDescription.errcheck = check_return +las.LASVLR_SetDescription.restype = ctypes.c_int + +las.LASVLR_GetRecordLength.argtypes = [ctypes.c_void_p] +las.LASVLR_GetRecordLength.errcheck = check_value +las.LASVLR_GetRecordLength.restype = ctypes.c_ushort +las.LASVLR_SetRecordLength.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASVLR_SetRecordLength.errcheck = check_return +las.LASVLR_SetRecordLength.restype = ctypes.c_int + +las.LASVLR_GetRecordId.argtypes = [ctypes.c_void_p] +las.LASVLR_GetRecordId.errcheck = check_value +las.LASVLR_GetRecordId.restype = ctypes.c_ushort +las.LASVLR_SetRecordId.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASVLR_SetRecordId.errcheck = check_return +las.LASVLR_SetRecordId.restype = ctypes.c_int + +las.LASVLR_GetReserved.argtypes = [ctypes.c_void_p] +las.LASVLR_GetReserved.errcheck = check_value +las.LASVLR_GetReserved.restype = ctypes.c_ushort +las.LASVLR_SetReserved.argtypes = [ctypes.c_void_p, ctypes.c_ushort] +las.LASVLR_SetReserved.errcheck = check_return +las.LASVLR_SetReserved.restype = ctypes.c_int + +las.LASVLR_GetData.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_ubyte)] +las.LASVLR_GetData.errcheck = check_value +las.LASVLR_GetData.restype = ctypes.c_int + +las.LASVLR_SetData.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_ubyte)] +las.LASVLR_SetData.errcheck = check_value +las.LASVLR_SetData.restype = ctypes.c_int + + +las.LASColor_Create.errcheck = check_void +las.LASColor_Create.restype = ctypes.c_void_p + +las.LASColor_Destroy.argtypes = [ctypes.c_void_p] +las.LASColor_Destroy.errcheck = check_void_done +las.LASColor_Destroy.restype = None + +las.LASColor_GetRed.restype = ctypes.c_short +las.LASColor_GetRed.argtypes = [ctypes.c_void_p] +las.LASColor_GetRed.errcheck = check_value +las.LASColor_SetRed.restype = ctypes.c_int +las.LASColor_SetRed.argtypes = [ctypes.c_void_p, ctypes.c_short] +las.LASColor_SetRed.errcheck = check_return + +las.LASColor_GetGreen.restype = ctypes.c_short +las.LASColor_GetGreen.argtypes = [ctypes.c_void_p] +las.LASColor_GetGreen.errcheck = check_value +las.LASColor_SetGreen.restype = ctypes.c_int +las.LASColor_SetGreen.argtypes = [ctypes.c_void_p, ctypes.c_short] +las.LASColor_SetGreen.errcheck = check_return + +las.LASColor_GetBlue.restype = ctypes.c_short +las.LASColor_GetBlue.argtypes = [ctypes.c_void_p] +las.LASColor_GetBlue.errcheck = check_value +las.LASColor_SetBlue.restype = ctypes.c_int +las.LASColor_SetBlue.argtypes = [ctypes.c_void_p, ctypes.c_short] +las.LASColor_SetBlue.errcheck = check_return + +las.LASPoint_GetColor.argtypes = [ctypes.c_void_p] +las.LASPoint_GetColor.errcheck = check_void +las.LASPoint_GetColor.restype = ctypes.c_void_p + +las.LASPoint_SetColor.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASPoint_SetColor.errcheck = check_return + +las.LASSRS_Create.errcheck = check_void +las.LASSRS_Create.restype = ctypes.c_void_p + +las.LASSRS_Destroy.argtypes = [ctypes.c_void_p] +las.LASSRS_Destroy.errcheck = check_void_done +las.LASSRS_Destroy.restype = None + +las.LASSRS_GetProj4.argtypes = [ctypes.c_void_p] +las.LASSRS_GetProj4.errcheck = check_value_free +las.LASSRS_GetProj4.restype = ctypes.c_char_p +las.LASSRS_SetProj4.restype = ctypes.c_int +las.LASSRS_SetProj4.argtypes = [ctypes.c_void_p, ctypes.c_char_p] +las.LASSRS_SetProj4.errcheck = check_return + +las.LASSRS_GetWKT.argtypes = [ctypes.c_void_p] +las.LASSRS_GetWKT.errcheck = check_value_free +las.LASSRS_GetWKT.restype = ctypes.c_char_p +las.LASSRS_SetWKT.restype = ctypes.c_int +las.LASSRS_SetWKT.argtypes = [ctypes.c_void_p, ctypes.c_char_p] +las.LASSRS_SetWKT.errcheck = check_return + +las.LASSRS_AddVLR.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASSRS_AddVLR.errcheck = check_value +las.LASSRS_AddVLR.restype = ctypes.c_int + +las.LASSRS_GetVLR.argtypes = [ctypes.c_void_p, ctypes.c_int] +las.LASSRS_GetVLR.errcheck = check_void +las.LASSRS_GetVLR.restype = ctypes.c_void_p + +las.LASSRS_GetVLRCount.argtypes = [ctypes.c_void_p] +las.LASSRS_GetVLRCount.restype = ctypes.c_int + +las.LASHeader_GetSRS.argtypes = [ctypes.c_void_p] +las.LASHeader_GetSRS.errcheck = check_void +las.LASHeader_GetSRS.restype = ctypes.c_void_p + +las.LASHeader_SetSRS.argtypes = [ctypes.c_void_p, ctypes.c_void_p] +las.LASHeader_SetSRS.errcheck = check_return diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/file.py work/libLAS-1.2.1/python/liblas/file.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/file.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/file.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,158 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python LASFile implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core +import header as lasheader +import point + +import os +import types + +files = {'append':[], 'write':[],'read':[]} +import sys + +class File(object): + def __init__(self, filename, header=None, mode='r'): + self.filename = os.path.abspath(filename) + self._header = header + self.handle = None + self._mode = mode + + # print self.filename + # print sys.stderr.write('%s %s %s'%(files, self.filename, mode)) + # sys.stderr.flush() + #check in the registry if we already have the file open + if mode=='r': + for f in files['write'] + files['append']: + if f == self.filename: + raise core.LASException("File %s is already open for write. Close the file or delete the reference to it" % filename) + else: + for f in files['read']: + if f == self.filename: + raise core.LASException("File %s is already open for read. Close the file or delete the reference to it" % filename) + self.open() + + def open(self): + if self._mode == 'r' or self._mode =='rb': + self.handle = core.las.LASReader_Create(self.filename) + self.mode = 0 + self._header = lasheader.Header(handle = core.las.LASReader_GetHeader(self.handle)) + files['read'].append(self.filename) + if self._mode == 'w' and '+' not in self._mode: + if not self._header: + self._header = lasheader.Header(handle = core.las.LASHeader_Create()) + self.handle = core.las.LASWriter_Create(self.filename, self._header.handle, 1) + self.mode = 1 + files['write'].append(self.filename) + if '+' in self._mode and 'r' not in self._mode: + if not self._header: + reader = core.las.LASReader_Create(self.filename) + self._header = lasheader.Header(handle = core.las.LASReader_GetHeader(reader)) + core.las.LASReader_Destroy(reader) + self.handle = core.las.LASWriter_Create(self.filename, self._header.handle, 2) + self.mode = 2 + files['append'].append(self.filename) + def __del__(self): + if not self.handle or not core: return + self.close() + + def close(self): + if self.mode == 0 : + core.las.LASReader_Destroy(self.handle) + files['read'].remove(self.filename) + else: + try: + files['append'].remove(self.filename) + except: + files['write'].remove(self.filename) + core.las.LASWriter_Destroy(self.handle) + + self._header = None + self.handle = None + + def set_srs(self, value): + if self.mode == 0 : + return core.las.LASReader_SetSRS(self.handle, value.handle) + else: + return core.las.LASWriter_SetSRS(self.handle, value.handle) + + def get_header(self): + """Returns the liblas.header.Header for the file""" + return self._header + def set_header(self, header): + + # append mode + if mode == 2: + core.las.LASWriter_Destroy(self.handle) + self.handle = core.las.LASWriter_Create(self.handle, header, 2) + self._header = header + return True + raise core.LASException("The header can only be set after file creation for files in append mode") + header = property(get_header) + + def read(self, location): + if self.mode == 0: + return point.Point(handle=core.las.LASReader_GetPointAt(self.handle, location), owned= False, copy=True) + + def __iter__(self): + if self.mode == 0: + self.at_end = False + p = core.las.LASReader_GetNextPoint(self.handle) + while p and not self.at_end: + yield point.Point(handle=p, owned= False, copy=True) + p = core.las.LASReader_GetNextPoint(self.handle) + if not p: + self.at_end = True + else: + self.close() + self.open() + + def __len__(self): + return self.header.point_records_count + + def write(self, pt): + if not isinstance(pt, point.Point): + raise core.LASException('cannot write %s, it must be of type liblas.point.Point' % pt) + if self.mode == 1 or self.mode == 2: + core.las.LASWriter_WritePoint(self.handle, pt.handle) + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/guid.py work/libLAS-1.2.1/python/liblas/guid.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/guid.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/guid.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,68 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python LASGUID implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core + +class GUID(object): + def __init__(self, key=None, handle=None): + self.handle = None + if handle: + self.handle = handle + else: + if not key: + self.handle = core.las.LASGuid_Create() + else: + self.handle = core.las.LASGuid_CreateFromString(key) + def __del__(self): + if self.handle: + core.las.LASGuid_Destroy(self.handle) + + def __str__(self): + return core.las.LASGuid_AsString(self.handle) + + def __eq__(self, other): + if isinstance(other, GUID): + return bool(core.las.LASGuid_Equals(self.handle, other.handle)) + raise core.LASException("GUID can only be compared to other GUIDs, not %s" % type(other)) + + def __repr__(self): + return self.__str__() \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/header.py work/libLAS-1.2.1/python/liblas/header.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/header.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/header.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,380 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python LASHeader implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core +import datetime +import guid +import vlr +import srs + +def leap_year(year): + if (year % 400) == 0: + return True + elif (year % 100) == 0: + return True + elif (year % 4) == 0: + return False + return False + +class Header(object): + def __init__(self, owned=True, handle=None): + if handle: + self.handle = handle + else: + self.handle = core.las.LASHeader_Create() + self.owned = owned + def __del__(self): + if self.owned: + if self.handle and core: + core.las.LASHeader_Destroy(self.handle) + + def get_filesignature(self): + """Returns the file signature for the file. It should always be LASF""" + return core.las.LASHeader_GetFileSignature(self.handle) + file_signature = property(get_filesignature) + + def get_filesourceid(self): + return core.las.LASHeader_GetFileSourceId(self.handle) + filesource_id = property(get_filesourceid) + + def get_projectid(self): + """Returns the ProjectID/GUID for the file. libLAS does not currently support setting this value from Python""" + return core.las.LASHeader_GetProjectId(self.handle) + project_id = property(get_projectid) + + def get_guid(self): + """Returns the GUID for the file as a liblas.guid.GUID""" + return guid.GUID(handle=core.las.LASHeader_GetGUID(self.handle)) + def set_guid(self, value): + """Sets the GUID for the file. It must be a liblas.guid.GUID""" + return core.las.LASHeader_SetGUID(self.handle, value.handle) + guid = property(get_guid, set_guid) + + def get_majorversion(self): + """Returns the major version for the file. Expect this value to always be 1""" + return core.las.LASHeader_GetVersionMajor(self.handle) + def set_majorversion(self, value): + """Sets the major version for the file. Only the value 1 is accepted at this time""" + return core.las.LASHeader_SetVersionMajor(self.handle, value) + major_version = property(get_majorversion, set_majorversion) + + def get_minorversion(self): + """Returns the minor version of the file. Expect this value to always be 0, 1, or 2""" + return core.las.LASHeader_GetVersionMinor(self.handle) + def set_minorversion(self, value): + """Sets the minor version of the file. The value should be 0 for 1.0 LAS files and 1 for 1.1 LAS files""" + return core.las.LASHeader_SetVersionMinor(self.handle, value) + minor_version = property(get_minorversion, set_minorversion) + + def get_systemid(self): + """Returns the system identifier specified in the file""" + return core.las.LASHeader_GetSystemId(self.handle) + def set_systemid(self, value): + """Sets the system identifier. The value is truncated to 31 characters""" + return core.las.LASHeader_SetSystemId(self.handle, value[0:31]) + system_id = property(get_systemid, set_systemid) + + def get_softwareid(self): + """Returns the software identifier specified in the file""" + return core.las.LASHeader_GetSoftwareId(self.handle) + def set_softwareid(self, value): + """Sets the software identifier. + + The value is truncated to 31 characters. + + Parameters + ---------- + value : a string that will automatically be truncated to 31 characters + + Example + ------- + >>> h.software_id + 'libLAS 1.0' + >>> h.software_id = 'hobu' + >>> h.software_id + 'hobu' + >>> h.software_id = 'hobu'*9 + >>> h.software_id + 'hobuhobuhobuhobuhobuhobuhobuhob' + """ + return core.las.LASHeader_SetSoftwareId(self.handle, value[0:31]) + software_id = property(get_softwareid, set_softwareid) + + def get_date(self): + """Return the header's date as a datetime.datetime. If no date is set in the + header, None is returned. + + Note that dates in LAS headers are not transitive because the header + only stores the year and the day number. + """ + day = core.las.LASHeader_GetCreationDOY(self.handle) + year = core.las.LASHeader_GetCreationYear(self.handle) + if year == 0 and day == 0: + return None + if not leap_year(year): + return datetime.datetime(year,1,1)+datetime.timedelta(day) + else: + return datetime.datetime(year,1,1)+datetime.timedelta(day-1) + def set_date(self, value=datetime.datetime.now()): + """Set the header's date from a datetime.datetime instance. + + Parameters + ---------- + value : datetime.datetime instance or none to use the current time + + Example + ------- + >>> t = datetime.datetime(2008,3,19) + >>> h.date = t + >>> h.date + datetime.datetime(2008, 3, 19, 0, 0) + """ + delta = value - datetime.datetime(value.year,1,1) + if not leap_year(value.year): + core.las.LASHeader_SetCreationDOY(self.handle, delta.days) + else: + core.las.LASHeader_SetCreationDOY(self.handle, delta.days + 1) + core.las.LASHeader_SetCreationYear(self.handle, value.year) + date = property(get_date, set_date) + + def get_headersize(self): + """Return the size of the header block of the LAS file in bytes. + + Should not be needed in Python land + """ + return core.las.LASHeader_GetHeaderSize(self.handle) + header_size = property(get_headersize) + + def get_dataoffset(self): + """Returns the location in bytes of where the data block of the LAS file starts""" + return core.las.LASHeader_GetDataOffset(self.handle) + def set_dataoffset(self, value): + """Sets the data offset + + Any space between this value and the end of the VLRs will be written with 0's + """ + return core.las.LASHeader_SetDataOffset(self.handle, value) + data_offset = property(get_dataoffset, set_dataoffset) + + def get_recordscount(self): + """Returns the number of user-defined header records in the header. + User-defined records are not really supported at this time in libLAS""" + return core.las.LASHeader_GetRecordsCount(self.handle) + records_count = property(get_recordscount) + + def get_dataformatid(self): + """Gets the point format value + + A value of 1 means the format is 1.1 compatible and includes a time + value on the points. A value of 0 means the format is 1.0 compatible. + """ + return core.las.LASHeader_GetDataFormatId(self.handle) + def set_dataformatid(self, value): + """Sets the point format value + + It can be 3, 2, 1, or 0. + """ + if value not in [3, 2,1,0]: + raise core.LASException("Format ID must be 3, 2, 1, or 0") + return core.las.LASHeader_SetDataFormatId(self.handle, value) + dataformat_id = property(get_dataformatid, set_dataformatid) + + def get_datarecordlength(self): + return core.las.LASHeader_GetDataRecordLength(self.handle) + data_record_length = property(get_datarecordlength) + + def get_pointrecordscount(self): + """Returns the expected number of point records in the file. + + Note that this value can be grossly out of sync with the + actual number of points in the file. Do not depend on it for + anything significant (like picking iteration locations in the file :) + """ + return core.las.LASHeader_GetPointRecordsCount(self.handle) + def set_pointrecordscount(self, value): + """Sets the number of point records expected in the file""" + return core.las.LASHeader_SetPointRecordsCount(self.handle, value) + point_records_count = property(get_pointrecordscount, set_pointrecordscount) + + def get_pointrecordsbyreturncount(self): + """Gets the histogram of point records by return number for returns 0...8 + + Example + ------- + + >>> h.point_return_count + [0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L] + + """ + output = [] + for i in range(8): + output.append(core.las.LASHeader_GetPointRecordsByReturnCount(self.handle, i)) + return output + def set_pointrecordsbyreturncount(self, value): + """Sets the histogram of point records by return number from a list of returns 0..8 + + Example + ------- + + >>> h.point_return_count = [1341235L, 3412341222L, 0L, 0L, 4321L, 0L, 0L, 0L] + >>> h.point_return_count + [1341235L, 3412341222L, 0L, 0L, 4321L, 0L, 0L, 0L] + + """ + for i in value[0:7]: + core.las.LASHeader_SetPointRecordsByReturnCount(self.handle, value.index(i), i) + point_return_count = property(get_pointrecordsbyreturncount, set_pointrecordsbyreturncount) + + def get_scale(self): + """Gets the scale factors in [x, y, z] for the point data. + + libLAS uses this header value when reading/writing raw point data to the file. + If you change it in the middle of writing data, expect the unexpected. + + Example + ------- + + >>> h.scale + [0.01, 0.01, 0.01] + """ + x = core.las.LASHeader_GetScaleX(self.handle) + y = core.las.LASHeader_GetScaleY(self.handle) + z = core.las.LASHeader_GetScaleZ(self.handle) + return [x,y,z] + def set_scale(self, value): + """Sets the scale factors in [x, y, z] for the point data. + + Example + ------- + + >>> h.scale = [0.5, 0.5, 0.001] + >>> h.scale + [0.5, 0.5, 0.001] + """ + return core.las.LASHeader_SetScale(self.handle, value[0], value[1], value[2]) + scale = property(get_scale, set_scale) + + def get_offset(self): + """Gets the offset factors in [x, y, z] for the point data. + + libLAS uses this header value when reading/writing raw point data to the file. + If you change it in the middle of writing data, expect the unexpected. + + Example + ------- + + >>> h.offset + [0.0, 0.0, 0.0] + """ + x = core.las.LASHeader_GetOffsetX(self.handle) + y = core.las.LASHeader_GetOffsetY(self.handle) + z = core.las.LASHeader_GetOffsetZ(self.handle) + return [x,y,z] + def set_offset(self, value): + """Sets the offset factors in [x, y, z] for the point data. + + Example + ------- + + >>> h.offset = [32, 32, 256] + >>> h.offset + [32.0, 32.0, 256.0] + """ + return core.las.LASHeader_SetOffset(self.handle, value[0], value[1], value[2]) + offset = property(get_offset, set_offset) + + def get_min(self): + """Gets the minimum values of [x, y, z] for the data. + + Example + ------- + + >>> h.min + [0.0, 0.0, 0.0] + """ + x = core.las.LASHeader_GetMinX(self.handle) + y = core.las.LASHeader_GetMinY(self.handle) + z = core.las.LASHeader_GetMinZ(self.handle) + return [x,y,z] + def set_min(self, value): + """Sets the minimum values of [x, y, z] for the data. + + Example + ------- + + >>> h.min = [33452344.2333, 523442.344, -90.993] + >>> h.min + [33452344.2333, 523442.34399999998, -90.992999999999995] + """ + return core.las.LASHeader_SetMin(self.handle, value[0], value[1], value[2]) + min = property(get_min, set_min) + + def get_max(self): + x = core.las.LASHeader_GetMaxX(self.handle) + y = core.las.LASHeader_GetMaxY(self.handle) + z = core.las.LASHeader_GetMaxZ(self.handle) + return [x,y,z] + def set_max(self, value): + """Sets the maximum values of [x, y, z] for the data. + + Example + ------- + + >>> h.max = [33452344.2333, 523442.344, -90.993] + >>> h.max + [33452344.2333, 523442.34399999998, -90.992999999999995] + """ + return core.las.LASHeader_SetMax(self.handle, value[0], value[1], value[2]) + max = property(get_max, set_max) + + + def GetVLR(self, value): + return vlr.VLR(handle=core.las.LASHeader_GetVLR(self.handle, value)) + + def DeleteVLR(self, value): + core.las.LASHeader_DeleteVLR(self.handle, value) + + def get_srs(self): + return srs.SRS(handle=core.las.LASHeader_GetSRS(self.handle)) + def set_srs(self, value): + return core.las.LASHeader_SetSRS(self.handle, value.handle) + srs = property(get_srs, set_srs) \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/point.py work/libLAS-1.2.1/python/liblas/point.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/point.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/point.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,232 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python LASPoint implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core +import datetime +import time +import math +import color + +class Point(object): + def __init__(self, owned=True, handle=None, copy=False): + if handle: + if copy: + self.handle = core.las.LASPoint_Copy(handle) + else: + self.handle = handle + else: + self.handle = core.las.LASPoint_Create() + if not copy: + self.owned = owned + else: + self.owned = True + def __del__(self): + if self.owned: + if self.handle and core: + core.las.LASPoint_Destroy(self.handle) + + def get_x(self): + """Returns the X coordinate of the LAS point. + + You are expected to properly de-scale the point according to the offset + and the X scale if it is a free-standing point. When points are + written to a LAS file, they will be scaled according to the header + parameters + """ + return core.las.LASPoint_GetX(self.handle) + def set_x(self, value): + """Sets the X coordinate of the LAS point to a floating point value.""" + return core.las.LASPoint_SetX(self.handle, value) + x = property(get_x, set_x) + + def get_y(self): + """Returns the Y coordinate of the LAS point. + + You are expected to properly de-scale the point according to the offset + and the Y scale if it is a free-standing point. When points are + written to a LAS file, they will be scaled according to the header + parameters + """ + return core.las.LASPoint_GetY(self.handle) + def set_y(self, value): + """Sets the Y coordinate of the LAS point to a floating point value.""" + return core.las.LASPoint_SetY(self.handle, value) + y = property(get_y, set_y) + + def get_z(self): + """Returns the Z coordinate of the LAS point. + + You are expected to properly de-scale the point according to the offset + and the Z scale if it is a free-standing point. When points are + written to a LAS file, they will be scaled according to the header + parameters + """ + return core.las.LASPoint_GetZ(self.handle) + def set_z(self, value): + """Sets the Z coordinate of the LAS point to a floating point value.""" + return core.las.LASPoint_SetZ(self.handle, value) + z = property(get_z, set_z) + + def get_return_number(self): + """Returns the return number of the point""" + return core.las.LASPoint_GetReturnNumber(self.handle) + def set_return_number(self, value): + """Sets the return number of the point to an integer""" + core.las.LASPoint_SetReturnNumber(self.handle, value) + return_number = property(get_return_number, set_return_number) + + def get_number_of_returns(self): + """Returns the number of returns for the point""" + return core.las.LASPoint_GetNumberOfReturns(self.handle) + def set_number_of_returns(self, value): + """Sets the number of returns for the point""" + core.las.LASPoint_SetNumberOfReturns(self.handle, value) + number_of_returns = property(get_number_of_returns, set_number_of_returns) + + def get_scan_direction(self): + """Returns the scan direction angle for the point""" + return core.las.LASPoint_GetScanDirection(self.handle) + def set_scan_direction(self, value): + """Sets the scan direction angle as an integer for the point""" + core.las.LASPoint_SetScanDirection(self.handle, value) + scan_direction = property(get_scan_direction, set_scan_direction) + + def get_flightline_edge(self): + """Denotes whether the point is a flight line edge""" + return core.las.LASPoint_GetFlightLineEdge(self.handle) + def set_flightline_edge(self, value): + """Sets the flightline edge as an integer for the point. Must be 0 (not an edge) or 1 (an edge)""" + core.las.LASPoint_SetFlightLineEdge(self.handle, value) + flightline_edge = property(get_flightline_edge, set_flightline_edge) + + def get_scan_flags(self): + """Returns the raw scan flags for the point. + See the LAS 1.0 or 1.1 specification for information how to interpret + """ + return core.las.LASPoint_GetScanFlags(self.handle) + def set_scan_flags(self, value): + """Sets the raw scan flags for the point. + See the LAS 1.0 or 1.1 specification for information how to interpret or + use the convenience functions like flightline_edge, scan_direction, etc. + """ + core.las.LASPoint_SetScanFlags(self.handle, value) + scan_flags = property(get_scan_flags, set_scan_flags) + + def get_classification(self): + return core.las.LASPoint_GetClassification(self.handle) + def set_classification(self, value): + core.las.LASPoint_SetClassification(self.handle, value) + classification = property(get_classification, set_classification) + + def get_scan_angle_rank(self): + """Returns the scan angle rank of the point. It will be between -90 and 90""" + return core.las.LASPoint_GetScanAngleRank(self.handle) + def set_scan_angle_rank(self, value): + """Sets the scan angle rank of the point. It must be between -90 and 90""" + core.las.LASPoint_SetScanAngleRank(self.handle, value) + scan_angle = property(get_scan_angle_rank, set_scan_angle_rank) + + def get_user_data(self): + return core.las.LASPoint_GetUserData(self.handle) + def set_user_data(self, value): + core.las.LASPoint_SetUserData(self.handle, value) + user_data = property(get_user_data, set_user_data) + + def get_intensity(self): + return core.las.LASPoint_GetIntensity(self.handle) + def set_intensity(self, value): + core.las.LASPoint_SetIntensity(self.handle, value) + intensity = property(get_intensity, set_intensity) + + def get_time(self): + t = core.las.LASPoint_GetTime(self.handle) + floor = math.floor(t) + ms = float(t) - floor + + # clip to 999999 + ms = int(round(ms* 1000000 )) + if ms > 999999: + ms = 999999 + + lt = time.gmtime(t) + value = datetime.datetime(lt[0],lt[1],lt[2],lt[3],lt[4],lt[5],ms) + return value + + def set_time(self, value): + """ + Sets the time of the point from a datetime value + + Parameters + ---------- + value : datetime.datetime instance or none to use the current time + + Example + ------- + >>> td = datetime.timedelta(hours=6) # my timezone is -6 + >>> t = datetime.datetime(2008,3,19) -td + >>> p.time = t + >>> p.time + datetime.datetime(2008, 3, 19, 0, 0) + """ + t = time.mktime(value.timetuple()) + + ms = value.microsecond + t = float(t) + ms * 0.000001 + core.las.LASPoint_SetTime(self.handle,t) + time = property(get_time, set_time) + + def get_color(self): + return color.Color(handle=core.las.LASPoint_GetColor(self.handle)) + + def set_color(self, value): + return core.las.LASPoint_SetColor(self.handle, value.handle) + color = property(get_color, set_color) + + def descale(self, header): + self.x = (self.x - header.offset[0]) / header.scale[0] + self.y = (self.y - header.offset[1]) / header.scale[1] + self.z = (self.z - header.offset[2]) / header.scale[2] + + def scale(self, header): + self.x = self.x + header.scale[0] + header.offset[0] + self.y = self.y + header.scale[1] + header.offset[1] + self.z = self.z + header.scale[2] + header.offset[2] diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/srs.py work/libLAS-1.2.1/python/liblas/srs.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/srs.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/srs.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,78 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python SRS implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2009, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core +import ctypes +import vlr + +class SRS(object): + def __init__(self, owned=True, handle=None): + if handle: + self.handle = handle + else: + self.handle = core.las.LASSRS_Create() + self.owned = owned + def __del__(self): + if self.owned: + if self.handle and core: + core.las.LASSRS_Destroy(self.handle) + + def get_wkt(self): + return core.las.LASSRS_GetWKT(self.handle) + def set_wkt(self, value): + return core.las.LASSRS_SetWKT(self.handle, value) + wkt = property(get_wkt, set_wkt) + + def get_proj4(self): + return core.las.LASSRS_GetProj4(self.handle) + def set_proj4(self, value): + return core.las.LASSRS_SetProj4(self.handle, value) + proj4 = property(get_proj4, set_proj4) + + def AddVLR(self, vlr): + return core.las.LASSRS_AddVLR(self.handle, vlr.handle) + + def GetVLR(self, value): + return vlr.VLR(handle=core.las.LASSRS_GetVLR(self.handle, value)) + + def vlr_count(self): + return core.las.LASSRS_GetVLRCount(self.handle) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/vlr.py work/libLAS-1.2.1/python/liblas/vlr.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/liblas/vlr.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/liblas/vlr.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,98 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Python VLR implementation + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + """ +import core +import ctypes + +class VLR(object): + def __init__(self, owned=True, handle=None): + if handle: + self.handle = handle + else: + self.handle = core.las.LASVLR_Create() + self.owned = owned + def __del__(self): + if self.owned: + if self.handle and core: + core.las.LASVLR_Destroy(self.handle) + + def get_userid(self): + return core.las.LASVLR_GetUserId(self.handle) + def set_userid(self, value): + return core.las.LASVLR_SetUserId(self.handle, value) + userid = property(get_userid, set_userid) + + def get_description(self): + return core.las.LASVLR_GetDescription(self.handle) + def set_description(self, value): + return core.las.LASVLR_SetDescription(self.handle, value) + description = property(get_description, set_description) + + def get_recordlength(self): + return core.las.LASVLR_GetRecordLength(self.handle) + def set_recordlength(self, value): + return core.las.LASVLR_SetRecordLength(self.handle, value) + recordlength = property(get_recordlength, set_recordlength) + + def get_recordid(self): + return core.las.LASVLR_GetRecordId(self.handle) + def set_recordid(self, value): + return core.las.LASVLR_SetRecordId(self.handle, value) + recordid = property(get_recordid, set_recordid) + + def get_reserved(self): + return core.las.LASVLR_GetReserved(self.handle) + def set_reserved(self, value): + return core.las.LASVLR_SetReserved(self.handle, value) + reserved = property(get_reserved, set_reserved) + + def get_data(self): + length = self.recordlength + data = (ctypes.c_ubyte * length)() + core.las.LASVLR_GetData(self.handle, data) + return data + + def set_data(self, data): + pdata = ctypes.cast(data, ctypes.POINTER(ctypes.c_ubyte)) + core.las.LASVLR_SetData(self.handle, pdata, self.recordlength) + data = property(get_data, set_data) + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/setup.py work/libLAS-1.2.1/python/setup.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/setup.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/setup.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,54 @@ +""" +$Id$ + +""" +from setuptools import setup, Extension +from sys import version_info + +try: + readme = file('../README','rb').read() +except: + readme = '' + +# Require ctypes egg only for Python < 2.5 +install_requires = ['setuptools'] +if version_info[:2] < (2,5): + install_requires.append('ctypes') + +import os + +version = '1.2.1' + +if os.name == 'nt': + # Windows NT library + lib_name = 'liblas1.dll' + data_files=[('DLLs', ['DLLs/%s'% lib_name, 'c:\\osgeo4w\\bin\\geotiff.dll','c:\\osgeo4w\\bin\\libtiff.dll','c:\\osgeo4w\\bin\\zlib_osgeo.dll','c:\\osgeo4w\\bin\\jpeg_osgeo.dll']),] +else: + data_files = None + +setup(name = 'libLAS', + version = version, + description = 'LAS 1.0/1.1/1.2 LiDAR data format translation', + license = 'BSD', + keywords = 'DEM elevation LIDAR', + author = 'Howard Butler', + author_email = 'hobu.inc@gmail.com', + maintainer = 'Howard Butler', + maintainer_email = 'hobu.inc@gmail.com', + url = 'http://liblas.org', + data_files = data_files, + long_description = readme, + packages = ['liblas'], + install_requires = install_requires, + test_suite = 'tests.test_suite', + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Scientific/Engineering :: GIS', + ], +) + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/__init__.py work/libLAS-1.2.1/python/tests/__init__.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/__init__.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/__init__.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1 @@ +from test_doctests import test_suite diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/File.txt work/libLAS-1.2.1/python/tests/File.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/File.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/File.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,216 @@ + >>> from liblas import file + >>> f = file.File('../test/data/TO_core_last_clip.las') + + >>> f.header # doctest: +ELLIPSIS + + + >>> f.header.point_records_count + 8L + + >>> header = f.header + >>> p = f.read(0) + >>> p.x, p.y, p.z + (630262.30000000005, 4834500.0, 51.530000000000001) + + >>> p = f.read(6) + >>> p.x, p.y, p.z + (630320.95999999996, 4834500.0, 55.009999999999998) + + >>> f2 = file.File('../test/data/TO_core_last_clip.las') + >>> p2 = f2.read(6) + >>> p.x, p.y, p.z + (630320.95999999996, 4834500.0, 55.009999999999998) + >>> f2.close() + >>> del f2 + + >>> points = [] + >>> for i in f: + ... points.append(i) + ... print i # doctest: +ELLIPSIS + + + + + + + + + + >>> len(points) + 8 + + >>> for p in points: + ... print p.x, p.y + 630262.3 4834500.0 + 630282.45 4834500.0 + 630300.08 4834500.0 + 630346.83 4834500.0 + 630327.59 4834500.0 + 630323.57 4834500.0 + 630320.96 4834500.0 + 630280.89 4834500.0 + + >>> points = [] + >>> for i in f: + ... points.append(i) + ... print i # doctest: +ELLIPSIS + + + + + + + + + + + >>> len(points) + 8 + + >>> del f + + >>> f = file.File('junk.las', mode="w", header=header) + >>> sum(header.offset) + 0.0 + >>> header.min + [630262.30000000005, 4834500.0, 50.899999999999999] + + >>> for i in points: + ... f.write(i) + + >>> pts = file.File('junk.las') + Traceback (most recent call last): + ... + LASException: File junk.las is already open for write. Close the file or delete the reference to it + + >>> f.close() + >>> f.header + + >>> del f + >>> f = file.File('junk.las', mode='w+', header=header) + + >>> for i in points: + ... f.write(i) + + >>> f.close() + + >>> f = file.File('junk.las') + >>> cnt = 0 + >>> for i in f: + ... cnt += 1 + + >>> cnt + 16 + + >>> buffered_header = f.header + >>> del f + + >>> buffered_header.data_offset = 1024 + >>> f3 = file.File('junk2.las',mode='w',header=buffered_header) + + >>> f3.header.data_offset + 1024L + + >>> for i in points: + ... f3.write(i) + + >>> f3.close() + + >>> del f3 + +The header's offset will change +=2 because of the 1.0 +requirement to write pad bytes at the end of the header + + >>> f = file.File('junk2.las') + >>> f.header.data_offset + 1026L + + >>> points = [] + >>> for i in f: + ... points.append(i) + ... print i # doctest: +ELLIPSIS + + + + + + + + + + >>> for g in points: + ... print int(g.x), int(g.y) + 630262 4834500 + 630282 4834500 + 630300 4834500 + 630346 4834500 + 630327 4834500 + 630323 4834500 + 630320 4834500 + 630280 4834500 + +Now try writing a 1.2 version of the junk2.las file above to ensure that +the data_offset *doesn't* change at all + + >>> buffered_header.data_offset = 1024 + >>> buffered_header.minor_version = 2 + >>> f3 = file.File('junk3.las',mode='w',header=buffered_header) + + >>> f3.header.data_offset + 1024L + + >>> for i in points: + ... f3.write(i) + + >>> f3.close() + + >>> del f3 + + >>> f = file.File('junk3.las') + >>> f.header.data_offset + 1024L + + >>> points = [] + >>> for i in f: + ... points.append(i) + ... print i # doctest: +ELLIPSIS + + + + + + + + + + >>> for g in points: + ... print int(g.x), int(g.y) + 630262 4834500 + 630282 4834500 + 630300 4834500 + 630346 4834500 + 630327 4834500 + 630323 4834500 + 630320 4834500 + 630280 4834500 + + >>> import os + >>> os.remove('junk.las') + >>> os.remove('junk2.las') + >>> os.remove('junk3.las') + + >>> f = file.File('junk.las', mode="w", header=header) + >>> import liblas.core + >>> liblas.core.las.LASWriter_Destroy(f.handle) + >>> print 'destroyed once' + destroyed once + >>> f.handle = None + >>> liblas.core.las.LASWriter_Destroy(f.handle) + Traceback (most recent call last): + ... + LASException: LASError in "LASWriter_Destroy": Pointer 'hWriter' is NULL in 'LASWriter_Destroy'. + + >>> import os + >>> os.remove('junk.las') + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/GUID.txt work/libLAS-1.2.1/python/tests/GUID.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/GUID.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/GUID.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,18 @@ + >>> from liblas import guid + >>> from liblas import header + + >>> g2 = guid.GUID(key='8388f1b8-aa1b-4108-bca3-6bc68e7b062e') + >>> g2 + 8388f1b8-aa1b-4108-bca3-6bc68e7b062e + + >>> header = header.Header() + >>> header.guid = g2 + >>> header.guid + 8388f1b8-aa1b-4108-bca3-6bc68e7b062e + >>> header.project_id + '8388f1b8-aa1b-4108-bca3-6bc68e7b062e' + + >>> g3 = guid.GUID(key='8388f1b8-aa1b-4108-bca3-6bc68e7b062e') + >>> g2 == g3 + True + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/Header.txt work/libLAS-1.2.1/python/tests/Header.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/Header.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/Header.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,118 @@ + + >>> from liblas import header + >>> import liblas + + >>> h = header.Header() + + >>> h.dataformat_id + 0 + + >>> h.scale + [0.01, 0.01, 0.01] + + >>> h.min + [0.0, 0.0, 0.0] + + >>> h.max + [0.0, 0.0, 0.0] + + >>> h.offset + [0.0, 0.0, 0.0] + + >>> h.major_version + 1 + + >>> h.minor_version + 2 + + >>> import datetime + >>> td = datetime.timedelta(hours=5) # my timezone is GMT-5 + >>> now = datetime.datetime.now() + >>> today = datetime.datetime(now.year, now.month,now.day) + + >>> if now.hour > 19: + ... x = h.date - td + ... else: + ... x = h.date + + >>> d = datetime.datetime(x.year, x.month, x.day) + +# >>> import pdb +# >>> pdb.set_trace() + + >>> d == today + True + >>> t = datetime.datetime(2008,3,19) + >>> h.date = t + >>> h.date + datetime.datetime(2008, 3, 19, 0, 0) + + >>> h.software_id + 'libLAS 1.2' + >>> h.software_id = 'hobu' + >>> h.software_id + 'hobu' + >>> h.software_id = 'hobu'*9 + >>> h.software_id + 'hobuhobuhobuhobuhobuhobuhobuhob' + + >>> h.system_id + 'libLAS' + >>> h.system_id = 'Python' + >>> h.system_id + 'Python' + + >>> h.max = [33452344.2333, 523442.344, -90.993] + >>> h.max + [33452344.2333, 523442.34399999998, -90.992999999999995] + + >>> h.min = [33452344.2333, 523442.344, -90.993] + >>> h.min + [33452344.2333, 523442.34399999998, -90.992999999999995] + + >>> h.offset = [32, 32, 256] + >>> h.offset + [32.0, 32.0, 256.0] + + >>> h.scale = [0.5, 0.5, 0.001] + >>> h.scale + [0.5, 0.5, 0.001] + + >>> h.point_return_count + [0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L] + + >>> h.point_return_count = [1341235L, 3412341222L, 0L, 0L, 4321L, 0L, 0L, 0L] + >>> h.point_return_count + [1341235L, 3412341222L, 0L, 0L, 4321L, 0L, 0L, 0L] + + >>> h.point_records_count + 0L + + >>> h.point_records_count = 42 + >>> h.point_records_count + 42L + + >>> h.records_count + 0L + + >>> h.header_size + 227 + + >>> def test_srs(): + ... s = h.srs + ... if not liblas.HAVE_GDAL: + ... return s.proj4 == '+to_meter=1.0000000000' + ... if liblas.HAVE_GDAL: + ... return s.proj4 == '' + ... return False + + >>> test_srs() + True + + >>> h.data_offset + 227L + + >>> h.data_offset = 742 + >>> h.data_offset + 742L + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/Point.txt work/libLAS-1.2.1/python/tests/Point.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/Point.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/Point.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,86 @@ + + >>> from liblas import point + >>> p = point.Point() + + >>> p.x + 0.0 + >>> p.x = 1.0 + >>> p.x + 1.0 + + >>> p.y + 0.0 + >>> p.y = 1.0 + >>> p.y + 1.0 + + >>> p.z + 0.0 + >>> p.z = 1.0 + >>> p.z + 1.0 + + >>> p.return_number + 0 + >>> p.return_number = 3 + >>> p.return_number + 3 + + >>> p.number_of_returns + 0 + >>> p.number_of_returns = 4 + >>> p.number_of_returns + 4 + + >>> p.flightline_edge + 0 + >>> p.flightline_edge = 1 + >>> p.flightline_edge + 1 + + >>> p.scan_flags + 163 + + >>> p.classification + 0 + >>> p.classification = 3 + >>> p.classification + 3 + + >>> p.user_data + 0 + >>> p.user_data = 163446 + >>> p.user_data + 118 + + >>> p.scan_angle + 0 + >>> p.scan_angle = 45 + >>> p.scan_angle + 45 + + >>> import datetime + >>> td = datetime.timedelta(hours=5) # my timezone is GMT-5 + >>> t = datetime.datetime(2008,3,19,23,45,45,13434) - td + >>> p.time = t + >>> p.time + datetime.datetime(2008, 3, 19, 23, 45, 45, 13434) + >>> p.time.microsecond + 13434 + + >>> p.intensity + 0 + >>> p.intensity = 120 + >>> p.intensity + 120 + + >>> c = p.color + >>> c.red + 0 + >>> c.red = 124 + >>> c.red + 124 + + >>> p.color = c + >>> p.color.red + 124 \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/SRS.txt work/libLAS-1.2.1/python/tests/SRS.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/SRS.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/SRS.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,108 @@ + >>> from liblas import srs + >>> from liblas import point + >>> import liblas + >>> s = srs.SRS() + >>> s.proj4 + '' + >>> s.proj4 = '+proj=utm +zone=15 +ellps=WGS84 +datum=WGS84 +units=m +no_defs' + + >>> def test_srs(): + ... if not liblas.HAVE_LIBGEOTIFF: + ... return True + ... if not liblas.HAVE_GDAL: + ... return s.proj4 == '+proj=tmerc +lat_0=0.000000000 +lon_0=-93.000000000 +k=0.999600 +x_0=500000.000 +y_0=0.000 +ellps=WGS84 +units=m ' + ... if liblas.HAVE_GDAL: + ... return s.proj4 == '+proj=utm +zone=15 +ellps=WGS84 +datum=WGS84 +units=m +no_defs ' + ... return False + + >>> test_srs() + True + + >>> from liblas import file + >>> f = file.File('../test/data/1.2_3.las',mode='r') + >>> s = f.header.srs + >>> def test_srs(): + ... if not liblas.HAVE_LIBGEOTIFF: + ... return True + ... if not liblas.HAVE_GDAL: + ... return s.wkt == '' + ... if liblas.HAVE_GDAL: + ... return s.wkt == """PROJCS["NAD83 / UTM zone 15N",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.2572221010002,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4269"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-93],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26915"]]""" + ... return False + + >>> test_srs() + True + + +# ... s2.wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]""" +# ... s2.wkt = """PROJCS["NAD83 / UTM zone 16N",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-87],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],AUTHORITY["EPSG","26916"],AXIS["Easting",EAST],AXIS["Northing",NORTH]]""" + + >>> def test_srs_2(): + ... if not liblas.HAVE_LIBGEOTIFF: + ... return True + ... if not liblas.HAVE_GDAL: + ... return True + ... if liblas.HAVE_GDAL: + ... s2 = srs.SRS() + ... s2.wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]""" + ... p = f.read(0) + ... p.descale(f.header) + ... if int(p.x) != 47069244: return False + ... f.set_srs(s2) + ... p = f.read(0) + ... p.descale(f.header) + ... if not s2.vlr_count() == 3: return False + ... if not s2.GetVLR(0).recordlength == 64: return False + ... return int(round(p.x)) == -93 and int(round(p.y)) == 90 + ... return False + + >>> test_srs_2() + True + + >>> del f + + >>> f = file.File('../test/data/1.2_3.las',mode='r') + >>> f.header.data_offset + 438L + >>> utm_wkt = """PROJCS["NAD83 / UTM zone 15N",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.2572221010002,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4269"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-93],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26915"]]""" + + >>> dd_wkt = """GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]""" + >>> s_dd = srs.SRS() + >>> s_dd.wkt = dd_wkt + >>> s_utm = srs.SRS() + >>> s_utm.wkt = utm_wkt + >>> p = f.read(0) + >>> origx, origy = p.x, p.y + >>> origx, origy + (470692.44, 4602888.9000000004) + >>> f.set_srs(s_dd) + True + >>> p = f.read(0) + >>> p.descale(f.header) + >>> p.x, p.y + (-92.999999999999972, 89.999999999999972) + >>> dd_header = f.header + >>> dd_header.scale = [0.000001,0.000001,0.000001] + >>> dd_header.srs = s_dd + >>> f_project = file.File('junk_srs_project.las',mode='w',header=dd_header) + >>> dd_header.srs.proj4 + '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ' + >>> f_project.write(p);f_project.write(p);f_project.write(p) + >>> f_project.close() + >>> del f_project + >>> f3 = file.File('junk_srs_project.las') + >>> f3.header.data_offset + 476L + >>> s_utm = srs.SRS() + >>> s_utm.wkt = utm_wkt + >>> p3 = f3.read(1) + >>> p3.x, p3.y + (-92.999999000000003, 89.999999000000003) + >>> p3 = f3.read(0) + >>> p3.x,p3.y + (-92.999999000000003, 89.999999000000003) + >>> import os + >>> os.remove('junk_srs_project.las') + + + \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/test_doctests.py work/libLAS-1.2.1/python/tests/test_doctests.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/test_doctests.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/test_doctests.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,76 @@ +""" +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A script to marshal .txt files into Python doctests + * Author: Sean C. Gillies, sgillies@frii.com + * + ****************************************************************************** + * + * This file is from the Shapely project: + * http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/tests/test_doctests.py + * + * Copyright (c) 2007, Sean C. Gillies + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Sean C. Gillies nor the names of + * its contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + **** +""" + +import doctest +import unittest +import glob +import os + +optionflags = (doctest.REPORT_ONLY_FIRST_FAILURE | + doctest.NORMALIZE_WHITESPACE | + doctest.ELLIPSIS) + +def list_doctests(): + return [filename + for filename + in glob.glob(os.path.join(os.path.dirname(__file__), '*.txt'))] + +def open_file(filename, mode='r'): + """Helper function to open files from within the tests package.""" + return open(os.path.join(os.path.dirname(__file__), filename), mode) + +def setUp(test): + test.globs.update(dict( + open_file = open_file, + )) + +def test_suite(): + return unittest.TestSuite( + [doctest.DocFileSuite(os.path.basename(filename), + optionflags=optionflags, + setUp=setUp) + for filename + in list_doctests()]) + +if __name__ == "__main__": + runner = unittest.TextTestRunner(verbosity=1) + runner.run(test_suite()) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/VLR.txt work/libLAS-1.2.1/python/tests/VLR.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/python/tests/VLR.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/python/tests/VLR.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,117 @@ + >>> from liblas import vlr + >>> v = vlr.VLR() + >>> v.reserved + 0 + >>> v.recordid + 0 + >>> v.recordid = 2 + >>> v.recordid + 2 + >>> v.userid + '' + >>> v.userid = 'liblas.org' + >>> v.userid + 'liblas.org' + + >>> v.description + '' + >>> v.description = 'libLAS' + >>> v.description + 'libLAS' + + >>> v.recordlength = 256 + >>> v.recordlength + 256 + + >>> import ctypes + >>> data = (ctypes.c_ubyte * 256)() + >>> data[10] + 0 + + >>> for i in range(256): + ... data[i] = 2+i + + >>> data[10] + 12 + >>> v.data = data + +# Ensure we can round trip the data + >>> [data[i] for i in range(10)] + [2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + >>> [v.data[i] for i in range(10)] + [2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + +# Ensure poking one array doesn't affect the other + >>> data[1] = 32 + >>> v.data = data + >>> data[1] = 3 + >>> v.data[1] + 32 + >>> data[1] + 3 + + >>> [v.data[i] for i in range(10)] + [2, 32, 4, 5, 6, 7, 8, 9, 10, 11] + + >>> import liblas + +# >>> liblas.HAVE_GDAL +# >>> liblas.HAVE_LIBGEOTIFF + + >>> from liblas import file + >>> f = file.File('../test/data/srs.las') + >>> h = f.header + >>> h.records_count + 3L + + >>> def test_srs(): + ... s = h.srs + ... if not liblas.HAVE_LIBGEOTIFF: + ... return True + ... if not liblas.HAVE_GDAL: + ... return s.proj4 == '+proj=utm +zone=17 +ellps=WGS84 +units=m ' + ... if liblas.HAVE_GDAL: + ... return s.proj4 == '+proj=utm +zone=17 +ellps=WGS84 +datum=WGS84 +units=m +no_defs ' + ... return False + + >>> test_srs() + True + + + >>> v = h.GetVLR(0) + >>> v.recordid + 34735 + >>> v.userid + 'LASF_Projection' + + >>> data = v.data + >>> len(data) + 72 + >>> data[6] + 8 + + # Deleting a VLR shouldn't change the offset + >>> h.data_offset + 759L + >>> h.DeleteVLR(0) + >>> h.data_offset + 759L + + >>> del f + + >>> f = file.File('../test/data/srs.las') + >>> h = f.header + >>> f2 = file.File('junk_srs.las',mode='w',header=h) + >>> for p in f: + ... f2.write(p) + + >>> f2.close() + >>> del f2 + + >>> f3 = file.File('junk_srs.las') + >>> f3.header.records_count + 3L + >>> f3.header.data_offset + 761L + >>> import os + >>> os.remove('junk_srs.las') \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/README work/libLAS-1.2.1/README --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/README 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/README 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,220 @@ + +libLAS - LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset +============================================================================== + +libLAS is a C/C++ library for reading and writing ASPRS LAS versions 1.0, 1.1 and 1.2 +data. The LAS format is a sequential binary format used to store data from sensors +and as intermediate processing storage by some `LiDAR`_-related applications. + +libLAS is available under the terms of the `BSD License`_. It builds on work +by `Martin Isenburg and Jonathan Shewchuk`_ of the University of North +Carolina in their `LAStools`_ project by replacing the base C++ library +with new development and porting Martin's tools this new code. + +libLAS' initial development was supported by the `IGSB`_ of the Iowa DNR +for use in its state-wide `LIDAR`_ project. + + +Download +------------------------------------------------------------------------------ + +The 1.2.1 version of libLAS can be downloaded from http://liblas.org/wiki/1.2.1 + +Older releases may be obtained from http://liblas.org/wiki/Releases + +Binaries +.............................................................................. + + +Windows binaries of libLAS are provided in two forms. The easiest form is +to obtain `OSGeo4W`_ and select the libLAS package to install. Alternatively, +you can download a Windows package with full spatial reference support from +the release page. GDAL support is only provided with the `OSGeo4W`_ package, however. + +Linux, Mac OS X, and Solaris binaries are not provided. The source code +uses the standard GNU autotools/automake stack for compilation and installation. + + +Documentation +------------------------------------------------------------------------------ + +`LAStools`_ / libLAS Command-line Utilities +.............................................................................. + +* `lasinfo`_ +* `lasmerge`_ +* `las2las`_ +* `las2txt`_ +* `txt2las`_ +* `las2ogr`_ + +Software Development with libLAS +.............................................................................. + +* `FOSS4G 2008`_ presentation that provides a basic overview of the design and philosophy of libLAS +* `ASPRS Workshop Demo`_ by Jason Woolard of NOAA describing how to use libLAS with Python +* `Tutorials`_ - tutorials on using libLAS from C++, Python and .NET/Mono languages +* `LAS C API`_- doxygen docs that describe the libLAS C API +* `dotnetLibLAS API`_ - docs for the .NET API +* `LAS Doxygen Docs`_ - doxygen docs of the entire C/C++ API +* `LAS Format Elements`_ - comparison of elements of LAS Format 1.0 and 1.1 +* `Software`_ - a list of geospatial software with reading and writing capabilities of LAS Format +* `Resources`_ - a list of general LiDAR/LAS resources + +LAS Format Specifications +.............................................................................. + +The LAS Format Standard is maintained by `ASPRS Standards Committee`_. LAS +format standard documents are available in PDF format: + +* `LAS 1.2 Format Standard`_ (2008-09-02) +* `LAS 1.1 Format Standard`_ (2005-05-07) +* `LAS 1.0 Format Standard`_ (2003-05-09) + +License +------------------------------------------------------------------------------ + +libLAS is available under the terms of the `BSD License`_. +See `License`_ for a copy. + +FAQ +------------------------------------------------------------------------------ + +The FAQ is available from http://liblas.org/wiki/FAQ + +Features of libLAS +------------------------------------------------------------------------------ + +Open Source +.............................................................................. + +libLAS is open source software. You can embed it in your own applications +(and even resell it) as long as you follow the crediting restriction of the BSD +license. See `License`_ for more detail. + +Multiple APIs +.............................................................................. + +libLAS has C, C++, .NET, and Python APIs. + +Spatial Reference System Support +.............................................................................. + +Linked against a 1.2.5+ version of `libgeotiff`_, you can set and get the spatial reference +systems of LAS files using simple `proj.4`_ coordinate system definitions. +Alternatively, with libLAS 1.2, you can link against `GDAL`_ to be able to +manipulate spatial references using WKT. + +Simple Variable Length Record Abstraction +.............................................................................. + +libLAS provides a sensible abstraction for working with variable length records (VLR) +in LAS files, and it transparently manages the VLRs related to spatial referencing +systems for you. + +Command-line Utilities +.............................................................................. + +libLAS provides ports of the `LAStools`_ utilities by Martin Isenburg for doing +things like translating from one version of the LAS format to another, inspecting +header information, and translating LAS data to and from text. + +Cross-platform operation +.............................................................................. + +libLAS is known to work on all editions of Microsoft Visual C++ 7.1+ (Windows) and +GCC 4.1+ (Mac OS X and Linux) platforms on both big- and little-endian architectures. + + +Development +------------------------------------------------------------------------------ + +Authors +.............................................................................. + +The libLAS development team are: + + * `Howard Butler`_ + * `Mateusz Loskot`_ + * `Phil Vachon`_ + * Martin Vales + * `Frank Warmerdam`_ + +Special thanks to `Martin Isenburg and Jonathan Shewchuk`_ for their +`LAStools`_ pioneering implementation of the ASPRS LAS standard that made +development of the libLAS library possible. + +Subversion Tree +.............................................................................. + +The SVN repository URL is available at http://liblas.org/svn + +:: + + svn checkout http://liblas.org/svn/trunk/ + +Information about Trac +.............................................................................. + +* `Trac `_ Open Source Project +* `TracGuide `_ - Built-in Documentation +* `TracFaq `_ - Frequently Asked Questions +* `TracSupport `_ - Trac Support +* `reStructuredText Support in Trac `_ + + +Community +------------------------------------------------------------------------------ + +IRC +.............................................................................. + +Find the libLAS developers on IRC on #liblas at `Freenode`_. + +Mailing Lists +.............................................................................. + +* liblas-devel - http://lists.osgeo.org/mailman/listinfo/liblas-devel +* liblas-commits - http://lists.osgeo.org/mailman/listinfo/liblas-commits + + +.. _`LIDAR`: http://en.wikipedia.org/wiki/LIDAR +.. _`IGSB`: http://www.igsb.uiowa.edu/ +.. _`Martin Isenburg`: http://www.cs.unc.edu/~isenburg/ +.. _`LAStools`: http://www.cs.unc.edu/~isenburg/lastools/ +.. _`Martin Isenburg and Jonathan Shewchuk`: http://www.cs.unc.edu/~isenburg/lastools/ +.. _`LAS Format`: http://www.lasformat.org/ +.. _`LAS 1.2 Format Standard`: http://liblas.org/raw-attachment/wiki/WikiStart/asprs_las_format_v12.pdf +.. _`LAS 1.1 Format Standard`: http://liblas.org/raw-attachment/wiki/WikiStart/asprs_las_format_v11.pdf +.. _`LAS 1.0 Format Standard`: http://liblas.org/raw-attachment/wiki/WikiStart/asprs_las_format_v10.pdf +.. _`ASPRS Standards Committee`: http://www.asprs.org/society/committees/standards/lidar_exchange_format.html +.. _`Howard Butler`: http://hobu.biz +.. _`Mateusz Loskot`: http://mateusz.loskot.net +.. _`Phil Vachon`: http://www.geoscan.info +.. _`Frank Warmerdam`: http://home.gdal.org/warmerda/ +.. _`BSD license`: http://www.opensource.org/licenses/bsd-license.php +.. _`LAS Format Elements`: http://liblas.org/wiki/LASElements +.. _`Tutorials`: http://liblas.org/wiki/Tutorial +.. _`Software`: http://liblas.org/wiki/Software +.. _`Resources`: http://liblas.org/wiki/Resources +.. _`License`: http://liblas.org/wiki/License +.. _`las2las`: http://liblas.org/browser/trunk/doc/las2las.txt +.. _`las2txt`: http://liblas.org/browser/trunk/doc/las2txt.txt +.. _`lasinfo`: http://liblas.org/browser/trunk/doc/lasinfo.txt +.. _`lasmerge`: http://liblas.org/browser/trunk/doc/lasmerge.txt +.. _`txt2las`: http://liblas.org/browser/trunk/doc/txt2las.txt +.. _`las2ogr`: http://liblas.org/browser/trunk/doc/las2ogr.txt +.. _`Freenode`: http://freenode.net +.. _`Library Design`: http://liblas.org/wiki/LibraryDesign +.. _`FOSS4G 2008`: http://liblas.org/raw-attachment/wiki/WikiStart/liblas_foss4g_2008.pdf +.. _`LAS C API`: http://liblas.org/doxygen/liblas_8h.html +.. _`LAS Doxygen Docs`: http://liblas.org/doxygen/ +.. _`How To Release libLAS`: http://liblas.org/wiki/HowToRelease +.. _`libgeotiff`: http://www.remotesensing.org/geotiff/geotiff.html +.. _`7/28/2008`: http://lists.maptools.org/pipermail/geotiff/2008-July/000501.html +.. _`proj.4`: http://proj.maptools.org/ +.. _`GDAL`: http://www.gdal.org +.. _`OSGeo4W`: http://wiki.osgeo.org/wiki/OSGeo_Win32_Installer +.. _`dotnetLibLAS API`: http://liblas.org/wiki/dotnetapi +.. _`FOSS4G 2008`: http://liblas.org/raw-attachment/wiki/WikiStart/liblas_foss4g_2008.pdf +.. _`ASPRS Workshop Demo`: http://liblas.org/raw-attachment/wiki/WikiStart/ASPRS-Workshop-NOAA-Demo.pdf \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/CMakeLists.txt work/libLAS-1.2.1/src/CMakeLists.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/CMakeLists.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,101 @@ +# $Id$ +# +# Build the libLAS library subproject +# + +SET( LIBLAS_INCLUDE_DIR ../include/liblas ) + +SET( LIBLAS_HPP + ../include/liblas/cstdint.hpp + ../include/liblas/guid.hpp + ../include/liblas/iterator.hpp + ../include/liblas/laserror.hpp + ../include/liblas/lasfile.hpp + ../include/liblas/lasheader.hpp + ../include/liblas/laspoint.hpp + ../include/liblas/lasvariablerecord.hpp + ../include/liblas/lasreader.hpp + ../include/liblas/lasvariablerecord.hpp + ../include/liblas/laswriter.hpp + ../include/liblas/liblas.hpp + ../include/liblas/lasspatialreference.hpp +) + +SET( LIBLAS_DETAIL_HPP + ../include/liblas/detail/endian.hpp + ../include/liblas/detail/file.hpp + ../include/liblas/detail/fwd.hpp + ../include/liblas/detail/reader.hpp + ../include/liblas/detail/reader10.hpp + ../include/liblas/detail/reader11.hpp + ../include/liblas/detail/reader12.hpp + ../include/liblas/detail/sha1.hpp + ../include/liblas/detail/sharedptr.hpp + ../include/liblas/detail/timer.hpp + ../include/liblas/detail/utility.hpp + ../include/liblas/detail/writer.hpp + ../include/liblas/detail/writer10.hpp + ../include/liblas/detail/writer11.hpp + ../include/liblas/detail/writer12.hpp +) + +SET( LIBLAS_CPP + laserror.cpp + laspoint.cpp + lasheader.cpp + lasrecordheader.cpp + lasreader.cpp + laswriter.cpp + lasfile.cpp + lasspatialreference.cpp +) + +SET( LIBLAS_DETAIL_CPP + detail/reader.cpp + detail/reader10.cpp + detail/reader11.cpp + detail/reader12.cpp + detail/writer.cpp + detail/writer10.cpp + detail/writer11.cpp + detail/writer12.cpp + detail/file.cpp +) + +SET( LIBLAS_SOURCES + ${LIBLAS_HPP} + ${LIBLAS_DETAIL_HPP} + ${LIBLAS_CPP} + ${LIBLAS_DETAIL_CPP} +) + +SET( LIBLAS_C_SOURCES + ../include/liblas/capi/las_config.h + ../include/liblas/capi/las_version.h + ../include/liblas/capi/liblas.h + las_c_api.cpp +) + +SOURCE_GROUP( "cmake" FILES CMakeLists.txt ) +SOURCE_GROUP( "Header Files" FILES ${LIBLAS_HPP} ${LIBLAS_DETAIL_HPP} ) +SOURCE_GROUP( "Source Files" FILES ${LIBLAS_CPP} ${LIBLAS_DETAIL_CPP} ) + +# Diable Visual C++ language extensions when building libLAS library +IF (WIN32) + ADD_DEFINITIONS( /Za ) +ENDIF (WIN32) + +INCLUDE_DIRECTORIES( + ../include + ${GEOTIFF_INCLUDE_DIR} +) + +# Static library with libLAS C++ core +ADD_LIBRARY( ${LIBLAS_LIB_NAME} STATIC ${LIBLAS_SOURCES} ) + +# Shared library with libLAS C API +ADD_LIBRARY( ${LIBLAS_C_LIB_NAME} SHARED ${LIBLAS_C_SOURCES} ) +TARGET_LINK_LIBRARIES( ${LIBLAS_C_LIB_NAME} + ${LIBLAS_LIB_NAME} + ${GEOTIFF_LIBRARY} +) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/file.cpp work/libLAS-1.2.1/src/detail/file.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/file.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/file.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,195 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A composite class to handle read/write operations + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace liblas { namespace detail { + +FileImpl::FileImpl(std::string const& filename) + : m_mode(0), m_filename(filename), + m_istrm(0), m_ostrm(0), m_reader(0), m_writer(0) +{ + if (filename == "stdin") + { + m_istrm = &std::cin; + } + else + { + std::ios::openmode const mode = std::ios::in | std::ios::binary; + m_istrm = new std::ifstream(m_filename.c_str(), mode); + + if (!m_istrm->good()) + { + delete m_istrm; + throw_no_file_error(); + } + } + + // TODO: apply RAII + assert(0 != m_istrm); + m_reader = new LASReader(*m_istrm); + m_header = m_reader->GetHeader(); + + assert(0 == m_ostrm); +} + +FileImpl::FileImpl(std::string const& filename, LASHeader const& header, int mode) + : m_mode(mode), m_filename(filename), + m_istrm(0), m_ostrm(0), m_reader(0), m_writer(0), m_header(header) +{ + if (filename == "stdout") + { + m_ostrm = &std::cout; + } + else + { + std::ios::openmode m; + if ( (mode > 2) || (mode < 1)) { + throw std::runtime_error("File mode must be eWrite or eAppend"); + } + + // append mode + if (mode == 2) { + m = std::ios::out | std::ios::in | std::ios::binary | std::ios::ate; + } + // write mode + else { + m = std::ios::out | std::ios::binary | std::ios::ate; + } + m_ostrm = new std::ofstream(m_filename.c_str(), m); + + if (!m_ostrm->good()) + { + delete m_ostrm; + throw_no_file_error(); + } + } + + // TODO: apply RAII + assert(0 != m_ostrm); + m_writer = new LASWriter(*m_ostrm, m_header); + + assert(0 == m_istrm); +} + +FileImpl::~FileImpl() +{ + // NOTE: The order of destruction is very important. + // reader/writer first, then streams. + // In other words, kill clients first, suppliers afterwards. + + if (m_istrm != &std::cin && 0 != m_istrm) + { + assert(0 == m_writer); + assert(0 == m_ostrm); + delete m_reader; + m_reader = 0; + delete m_istrm; + m_istrm = 0; + } + + if (m_ostrm != &std::cout && 0 != m_ostrm) + { + assert(0 == m_reader); + assert(0 == m_istrm); + delete m_writer; + m_writer = 0; + delete m_ostrm; + m_ostrm = 0; + } +} + +std::string FileImpl::GetName() const +{ + return m_filename; +} + +int FileImpl::GetMode() const +{ + return m_mode; +} + +LASHeader const& FileImpl::GetHeader() const +{ + return m_header; +} + +LASReader& FileImpl::GetReader() +{ + if (0 == m_reader) + { + // TODO: Define specialized exception type for this error + std::string msg("Reader is file write-only: " + m_filename); + throw std::runtime_error(msg); + } + + return (*m_reader); +} + +LASWriter& FileImpl::GetWriter() +{ + if (0 == m_writer) + { + // TODO: Define specialized exception type for this error + std::string msg("Writer is file read-only: " + m_filename); + throw std::runtime_error(msg); + } + + return (*m_writer); +} + +void FileImpl::throw_no_file_error() const +{ + // TODO: Define specialized exception type for this error + // for example: liblas::open_error or liblas::no_file_error + std::string msg("can not open file " + m_filename); + throw std::runtime_error(msg); +} + +}} // namespace liblas::detail diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader.cpp work/libLAS-1.2.1/src/detail/reader.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/reader.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,282 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: Reader implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +// +// // GeoTIFF +// #ifdef HAVE_LIBGEOTIFF +// #include +// #include +// #include "geo_normalize.h" +// #include "geo_simpletags.h" +// #include "geovalues.h" +// #endif // HAVE_LIBGEOTIFF + +#ifdef HAVE_GDAL +#include +#endif + +// std +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { + +Reader::Reader(std::istream& ifs) : + m_ifs(ifs), m_size(0), m_current(0), + m_transform(0), m_in_ref(0), m_out_ref(0) +{ +} + +Reader::~Reader() +{ +#ifdef HAVE_GDAL + if (m_transform) + { + OCTDestroyCoordinateTransformation(m_transform); + } + if (m_in_ref) + { + OSRDestroySpatialReference(m_in_ref); + } + if (m_out_ref) + { + OSRDestroySpatialReference(m_out_ref); + } + +#endif +} + +std::istream& Reader::GetStream() const +{ + return m_ifs; +} + +void Reader::FillPoint(PointRecord& record, LASPoint& point) +{ + + point.SetX(record.x); + point.SetY(record.y); + point.SetZ(record.z); + + if (m_transform) + { + Project(point); + } + + point.SetIntensity(record.intensity); + point.SetScanFlags(record.flags); + point.SetClassification(record.classification); + point.SetScanAngleRank(record.scan_angle_rank); + point.SetUserData(record.user_data); + point.SetPointSourceID(record.point_source_id); +} + +bool Reader::ReadVLR(LASHeader& header) +{ + VLRHeader vlrh = { 0 }; + + m_ifs.seekg(header.GetHeaderSize(), std::ios::beg); + uint32_t count = header.GetRecordsCount(); + header.SetRecordsCount(0); + for (uint32_t i = 0; i < count; ++i) + { + read_n(vlrh, m_ifs, sizeof(VLRHeader)); + + uint16_t length = vlrh.recordLengthAfterHeader; + if (length < 1) + { + throw std::domain_error("VLR record length must be at least 1 byte long"); + } + std::vector data; + data.resize(length); + + read_n(data.front(), m_ifs, length); + + LASVariableRecord vlr; + vlr.SetReserved(vlrh.reserved); + vlr.SetUserId(std::string(vlrh.userId)); + vlr.SetDescription(std::string(vlrh.description)); + vlr.SetRecordLength(vlrh.recordLengthAfterHeader); + vlr.SetRecordId(vlrh.recordId); + vlr.SetData(data); + + header.AddVLR(vlr); + } + return true; +} + +bool Reader::ReadGeoreference(LASHeader& header) +{ + std::vector vlrs; + for (uint16_t i = 0; i < header.GetRecordsCount(); ++i) + { + LASVariableRecord record = header.GetVLR(i); + vlrs.push_back(record); + } + + LASSpatialReference srs(vlrs); + header.SetSRS(srs); + + // keep a copy on the reader in case we're going to reproject data + // on the way out. + m_in_srs = srs; + + return true; +} + +void Reader::Reset(LASHeader const& header) +{ + m_ifs.clear(); + m_ifs.seekg(0); + + // Reset sizes and set internal cursor to the beginning of file. + m_current = 0; + m_size = header.GetPointRecordsCount(); +} + +void Reader::SetSRS(const LASSpatialReference& srs) +{ + m_out_srs = srs; +#ifdef HAVE_GDAL + m_in_ref = OSRNewSpatialReference(0); + m_out_ref = OSRNewSpatialReference(0); + + int result = OSRSetFromUserInput(m_in_ref, m_in_srs.GetWKT().c_str()); + if (result != OGRERR_NONE) + { + std::ostringstream msg; + msg << "Could not import input spatial reference for Reader::" << CPLGetLastErrorMsg() << result; + std::string message(msg.str()); + throw std::runtime_error(message); + } + + result = OSRSetFromUserInput(m_out_ref, m_out_srs.GetWKT().c_str()); + if (result != OGRERR_NONE) + { + std::ostringstream msg; + msg << "Could not import output spatial reference for Reader::" << CPLGetLastErrorMsg() << result; + std::string message(msg.str()); + throw std::runtime_error(message); + } + + m_transform = OCTNewCoordinateTransformation( m_in_ref, m_out_ref); + +#endif +} + +void Reader::Project(LASPoint& point) +{ +#ifdef HAVE_GDAL + + int ret = 0; + double x = point.GetX(); + double y = point.GetY(); + double z = point.GetZ(); + + ret = OCTTransform(m_transform, 1, &x, &y, &z); + if (!ret) + { + std::ostringstream msg; + msg << "Could not project point for Reader::" << CPLGetLastErrorMsg() << ret; + std::string message(msg.str()); + throw std::runtime_error(message); + } + + point.SetX(x); + point.SetY(y); + point.SetZ(z); +#else + UNREFERENCED_PARAMETER(point); +#endif +} + +Reader* ReaderFactory::Create(std::istream& ifs) +{ + if (!ifs) + { + throw std::runtime_error("input stream state is invalid"); + } + + // Determine version of given LAS file and + // instantiate appropriate reader. + uint8_t verMajor = 0; + uint8_t verMinor = 0; + ifs.seekg(24, std::ios::beg); + detail::read_n(verMajor, ifs, 1); + detail::read_n(verMinor, ifs, 1); + + if (1 == verMajor && 0 == verMinor) + { + return new v10::ReaderImpl(ifs); + } + else if (1 == verMajor && 1 == verMinor) + { + return new v11::ReaderImpl(ifs); + } + else if (1 == verMajor && 2 == verMinor) + { + return new v12::ReaderImpl(ifs); + } + else if (2 == verMajor && 0 == verMinor ) + { + // TODO: LAS 2.0 read/write support + throw std::runtime_error("LAS 2.0+ file detected but unsupported"); + } + + throw std::runtime_error("LAS file of unknown version"); +} + + +void ReaderFactory::Destroy(Reader* p) +{ + delete p; + p = 0; +} + +}} // namespace liblas::detail diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader10.cpp work/libLAS-1.2.1/src/detail/reader10.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader10.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/reader10.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,288 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.0 reader implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include + +// std +#include +#include +#include +#include // std::size_t, std::free +#include + +namespace liblas { namespace detail { namespace v10 { + +ReaderImpl::ReaderImpl(std::istream& ifs) : Base(ifs) +{ +} + +std::size_t ReaderImpl::GetVersion() const +{ + return eLASVersion10; +} + +bool ReaderImpl::ReadHeader(LASHeader& header) +{ + using detail::read_n; + + // Helper variables + uint8_t n1 = 0; + uint16_t n2 = 0; + uint32_t n4 = 0; + double x1 = 0; + double y1 = 0; + double z1 = 0; + double x2 = 0; + double y2 = 0; + double z2 = 0; + std::string buf; + std::string fsig; + + m_ifs.seekg(0); + + // 1. File Signature + read_n(fsig, m_ifs, 4); + header.SetFileSignature(fsig); + + // 2. Reserved + // This data must always contain Zeros. + read_n(n4, m_ifs, sizeof(n4)); + + // 3-6. GUID data + uint32_t d1 = 0; + uint16_t d2 = 0; + uint16_t d3 = 0; + uint8_t d4[8] = { 0 }; + read_n(d1, m_ifs, sizeof(d1)); + read_n(d2, m_ifs, sizeof(d2)); + read_n(d3, m_ifs, sizeof(d3)); + read_n(d4, m_ifs, sizeof(d4)); + liblas::guid g(d1, d2, d3, d4); + header.SetProjectId(g); + + // 7. Version major + read_n(n1, m_ifs, sizeof(n1)); + header.SetVersionMajor(n1); + + // 8. Version minor + read_n(n1, m_ifs, sizeof(n1)); + header.SetVersionMinor(n1); + + // 9. System ID + read_n(buf, m_ifs, 32); + header.SetSystemId(buf); + + // 10. Generating Software ID + read_n(buf, m_ifs, 32); + header.SetSoftwareId(buf); + + // 11. Flight Date Julian + read_n(n2, m_ifs, sizeof(n2)); + header.SetCreationDOY(n2); + + // 12. Year + read_n(n2, m_ifs, sizeof(n2)); + header.SetCreationYear(n2); + + // 13. Header Size + // NOTE: Size of the stanard header block must always be 227 bytes + read_n(n2, m_ifs, sizeof(n2)); + + // 14. Offset to data + read_n(n4, m_ifs, sizeof(n4)); + if (n4 < header.GetHeaderSize()) + { + // TODO: Move this test to LASHeader::Validate() + throw std::domain_error("offset to point data smaller than header size"); + } + header.SetDataOffset(n4); + + // 15. Number of variable length records + read_n(n4, m_ifs, sizeof(n4)); + header.SetRecordsCount(n4); + + // 16. Point Data Format ID + read_n(n1, m_ifs, sizeof(n1)); + if (n1 == LASHeader::ePointFormat0) { + header.SetDataFormatId(LASHeader::ePointFormat0); + } + else if (n1 == LASHeader::ePointFormat1) { + header.SetDataFormatId(LASHeader::ePointFormat1); + } + else if (n1 == LASHeader::ePointFormat2) { + header.SetDataFormatId(LASHeader::ePointFormat2); + } + else if (n1 == LASHeader::ePointFormat3) { + header.SetDataFormatId(LASHeader::ePointFormat3); + } + else { + throw std::domain_error("invalid point data format"); + } + + // 17. Point Data Record Length + // NOTE: No need to set record length because it's + // determined on basis of point data format. + read_n(n2, m_ifs, sizeof(n2)); + + // 18. Number of point records + read_n(n4, m_ifs, sizeof(n4)); + header.SetPointRecordsCount(n4); + + // 19. Number of points by return + std::vector::size_type const srbyr = 5; + uint32_t rbyr[srbyr] = { 0 }; + read_n(rbyr, m_ifs, sizeof(rbyr)); + for (std::size_t i = 0; i < srbyr; ++i) + { + header.SetPointRecordsByReturnCount(i, rbyr[i]); + } + + // 20-22. Scale factors + read_n(x1, m_ifs, sizeof(x1)); + read_n(y1, m_ifs, sizeof(y1)); + read_n(z1, m_ifs, sizeof(z1)); + header.SetScale(x1, y1, z1); + + // 23-25. Offsets + read_n(x1, m_ifs, sizeof(x1)); + read_n(y1, m_ifs, sizeof(y1)); + read_n(z1, m_ifs, sizeof(z1)); + header.SetOffset(x1, y1, z1); + + // 26-27. Max/Min X + read_n(x1, m_ifs, sizeof(x1)); + read_n(x2, m_ifs, sizeof(x2)); + + // 28-29. Max/Min Y + read_n(y1, m_ifs, sizeof(y1)); + read_n(y2, m_ifs, sizeof(y2)); + + // 30-31. Max/Min Z + read_n(z1, m_ifs, sizeof(z1)); + read_n(z2, m_ifs, sizeof(z2)); + + header.SetMax(x1, y1, z1); + header.SetMin(x2, y2, z2); + + Reset(header); + + return true; +} + +bool ReaderImpl::ReadNextPoint(LASPoint& point, const LASHeader& header) +{ + // Read point data record format 0 + + // TODO: Replace with compile-time assert + + detail::PointRecord record; + double t=0; + + assert(LASHeader::ePointSize0 == sizeof(record)); + + if (0 == m_current) + { + m_ifs.clear(); + m_ifs.seekg(header.GetDataOffset(), std::ios::beg); + } + + if (m_current < m_size) + { + try + { + detail::read_n(record, m_ifs, sizeof(PointRecord)); + ++m_current; + } + catch (std::out_of_range const& e) // we reached the end of the file + { + std::cerr << e.what() << std::endl; + return false; + } + + Reader::FillPoint(record, point); + point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + } + return true; + } + + return false; +} + +bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) +{ + // Read point data record format 0 + + // TODO: Replace with compile-time assert + double t=0; + detail::PointRecord record; + assert(LASHeader::ePointSize0 == sizeof(record)); + + if (m_size <= n) + return false; + std::streamsize pos = (static_cast(n) * header.GetDataRecordLength()) + header.GetDataOffset(); + + m_ifs.clear(); + m_ifs.seekg(pos, std::ios::beg); + detail::read_n(record, m_ifs, sizeof(record)); + + Reader::FillPoint(record, point); + point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); + + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + } + + return true; +} + +}}} // namespace liblas::detail::v10 + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader11.cpp work/libLAS-1.2.1/src/detail/reader11.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader11.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/reader11.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,295 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.1 reader implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include + +// std +#include +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { namespace v11 { + +ReaderImpl::ReaderImpl(std::istream& ifs) : Base(ifs) +{ +} + +std::size_t ReaderImpl::GetVersion() const +{ + return eLASVersion11; +} + +bool ReaderImpl::ReadHeader(LASHeader& header) +{ + using detail::read_n; + + // Helper variables + uint8_t n1 = 0; + uint16_t n2 = 0; + uint32_t n4 = 0; + double x1 = 0; + double y1 = 0; + double z1 = 0; + double x2 = 0; + double y2 = 0; + double z2 = 0; + std::string buf; + std::string fsig; + + m_ifs.seekg(0); + + // 1. File Signature + read_n(fsig, m_ifs, 4); + header.SetFileSignature(fsig); + + // 2. File Source ID + read_n(n2, m_ifs, sizeof(n2)); + header.SetFileSourceId(n2); + + // 3. Reserved + // This data must always contain Zeros. + read_n(n2, m_ifs, sizeof(n2)); + + // 4-7. Project ID + uint32_t d1 = 0; + uint16_t d2 = 0; + uint16_t d3 = 0; + uint8_t d4[8] = { 0 }; + read_n(d1, m_ifs, sizeof(d1)); + read_n(d2, m_ifs, sizeof(d2)); + read_n(d3, m_ifs, sizeof(d3)); + read_n(d4, m_ifs, sizeof(d4)); + liblas::guid g(d1, d2, d3, d4); + header.SetProjectId(g); + + // 8. Version major + read_n(n1, m_ifs, sizeof(n1)); + header.SetVersionMajor(n1); + + // 9. Version minor + read_n(n1, m_ifs, sizeof(n1)); + header.SetVersionMinor(n1); + + // 10. System ID + read_n(buf, m_ifs, 32); + header.SetSystemId(buf); + + // 11. Generating Software ID + read_n(buf, m_ifs, 32); + header.SetSoftwareId(buf); + + // 12. File Creation Day of Year + read_n(n2, m_ifs, sizeof(n2)); + header.SetCreationDOY(n2); + + // 13. File Creation Year + read_n(n2, m_ifs, sizeof(n2)); + header.SetCreationYear(n2); + + // 14. Header Size + // NOTE: Size of the stanard header block must always be 227 bytes + read_n(n2, m_ifs, sizeof(n2)); + + // 15. Offset to data + read_n(n4, m_ifs, sizeof(n4)); + if (n4 < header.GetHeaderSize()) + { + // TODO: Move this test to LASHeader::Validate() + throw std::domain_error("offset to point data smaller than header size"); + } + header.SetDataOffset(n4); + + // 16. Number of variable length records + read_n(n4, m_ifs, sizeof(n4)); + header.SetRecordsCount(n4); + + // 17. Point Data Format ID + read_n(n1, m_ifs, sizeof(n1)); + if (n1 == LASHeader::ePointFormat0) { + header.SetDataFormatId(LASHeader::ePointFormat0); + } + else if (n1 == LASHeader::ePointFormat1) { + header.SetDataFormatId(LASHeader::ePointFormat1); + } + else if (n1 == LASHeader::ePointFormat2) { + header.SetDataFormatId(LASHeader::ePointFormat2); + } + else if (n1 == LASHeader::ePointFormat3) { + header.SetDataFormatId(LASHeader::ePointFormat3); + } + else { + throw std::domain_error("invalid point data format"); + } + + // 18. Point Data Record Length + // NOTE: No need to set record length because it's + // determined on basis of point data format. + read_n(n2, m_ifs, sizeof(n2)); + + // 19. Number of point records + read_n(n4, m_ifs, sizeof(n4)); + header.SetPointRecordsCount(n4); + + // 20. Number of points by return + std::vector::size_type const srbyr = 5; + uint32_t rbyr[srbyr] = { 0 }; + read_n(rbyr, m_ifs, sizeof(rbyr)); + for (std::size_t i = 0; i < srbyr; ++i) + { + header.SetPointRecordsByReturnCount(i, rbyr[i]); + } + + // 21-23. Scale factors + read_n(x1, m_ifs, sizeof(x1)); + read_n(y1, m_ifs, sizeof(y1)); + read_n(z1, m_ifs, sizeof(z1)); + header.SetScale(x1, y1, z1); + + // 24-26. Offsets + read_n(x1, m_ifs, sizeof(x1)); + read_n(y1, m_ifs, sizeof(y1)); + read_n(z1, m_ifs, sizeof(z1)); + header.SetOffset(x1, y1, z1); + + // 27-28. Max/Min X + read_n(x1, m_ifs, sizeof(x1)); + read_n(x2, m_ifs, sizeof(x2)); + + // 29-30. Max/Min Y + read_n(y1, m_ifs, sizeof(y1)); + read_n(y2, m_ifs, sizeof(y2)); + + // 31-32. Max/Min Z + read_n(z1, m_ifs, sizeof(z1)); + read_n(z2, m_ifs, sizeof(z2)); + + header.SetMax(x1, y1, z1); + header.SetMin(x2, y2, z2); + + m_ifs.seekg(header.GetDataOffset(), std::ios::beg); + + Reset(header); + + return true; +} + +bool ReaderImpl::ReadNextPoint(LASPoint& point, const LASHeader& header) +{ + // Read point data record format 0 + + // TODO: Replace with compile-time assert + + double t = 0; + detail::PointRecord record; + assert(LASHeader::ePointSize0 == sizeof(record)); + + if (0 == m_current) + { + m_ifs.clear(); + m_ifs.seekg(header.GetDataOffset(), std::ios::beg); + } + + if (m_current < m_size) + { + try + { + detail::read_n(record, m_ifs, sizeof(PointRecord)); + ++m_current; + } + catch (std::out_of_range const& e) // we reached the end of the file + { + std::cerr << e.what() << std::endl; + return false; + } + + Reader::FillPoint(record, point); + point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + } + return true; + } + + return false; +} + + +bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) +{ + // Read point data record format 0 + + // TODO: Replace with compile-time assert + + double t = 0; + detail::PointRecord record; + assert(LASHeader::ePointSize0 == sizeof(record)); + + if (m_size <= n) + return false; + + std::streamsize pos = (static_cast(n) * header.GetDataRecordLength()) + header.GetDataOffset(); + + m_ifs.clear(); + m_ifs.seekg(pos, std::ios::beg); + detail::read_n(record, m_ifs, sizeof(record)); + + Reader::FillPoint(record, point); + point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + } + return true; +} + + +}}} // namespace liblas::detail::v11 + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader12.cpp work/libLAS-1.2.1/src/detail/reader12.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/reader12.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/reader12.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,360 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.2 reader implementation for C++ libLAS + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +// std +#include +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { namespace v12 { + +ReaderImpl::ReaderImpl(std::istream& ifs) : Base(ifs) +{ +} + +std::size_t ReaderImpl::GetVersion() const +{ + return eLASVersion12; +} + +bool ReaderImpl::ReadHeader(LASHeader& header) +{ + using detail::read_n; + + // Helper variables + uint8_t n1 = 0; + uint16_t n2 = 0; + uint32_t n4 = 0; + double x1 = 0; + double y1 = 0; + double z1 = 0; + double x2 = 0; + double y2 = 0; + double z2 = 0; + std::string buf; + std::string fsig; + + m_ifs.seekg(0); + + // 1. File Signature + read_n(fsig, m_ifs, 4); + header.SetFileSignature(fsig); + + // 2. File Source ID + read_n(n2, m_ifs, sizeof(n2)); + header.SetFileSourceId(n2); + + // 3. Reserved + // This data must always contain Zeros. + read_n(n2, m_ifs, sizeof(n2)); + + // 4-7. Project ID + uint32_t d1 = 0; + uint16_t d2 = 0; + uint16_t d3 = 0; + uint8_t d4[8] = { 0 }; + read_n(d1, m_ifs, sizeof(d1)); + read_n(d2, m_ifs, sizeof(d2)); + read_n(d3, m_ifs, sizeof(d3)); + read_n(d4, m_ifs, sizeof(d4)); + liblas::guid g(d1, d2, d3, d4); + header.SetProjectId(g); + + // 8. Version major + read_n(n1, m_ifs, sizeof(n1)); + header.SetVersionMajor(n1); + + // 9. Version minor + read_n(n1, m_ifs, sizeof(n1)); + header.SetVersionMinor(n1); + + // 10. System ID + read_n(buf, m_ifs, 32); + header.SetSystemId(buf); + + // 11. Generating Software ID + read_n(buf, m_ifs, 32); + header.SetSoftwareId(buf); + + // 12. File Creation Day of Year + read_n(n2, m_ifs, sizeof(n2)); + header.SetCreationDOY(n2); + + // 13. File Creation Year + read_n(n2, m_ifs, sizeof(n2)); + header.SetCreationYear(n2); + + // 14. Header Size + // NOTE: Size of the standard header block must always be 227 bytes + read_n(n2, m_ifs, sizeof(n2)); + + // 15. Offset to data + read_n(n4, m_ifs, sizeof(n4)); + if (n4 < header.GetHeaderSize()) + { + // TODO: Move this test to LASHeader::Validate() + throw std::domain_error("offset to point data smaller than header size"); + } + header.SetDataOffset(n4); + + // 16. Number of variable length records + read_n(n4, m_ifs, sizeof(n4)); + header.SetRecordsCount(n4); + + // 17. Point Data Format ID + read_n(n1, m_ifs, sizeof(n1)); + if (n1 == LASHeader::ePointFormat0) + { + header.SetDataFormatId(LASHeader::ePointFormat0); + } + else if (n1 == LASHeader::ePointFormat1) + { + header.SetDataFormatId(LASHeader::ePointFormat1); + } + else if (n1 == LASHeader::ePointFormat2) + { + header.SetDataFormatId(LASHeader::ePointFormat2); + } + else if (n1 == LASHeader::ePointFormat3) + { + header.SetDataFormatId(LASHeader::ePointFormat3); + } + else + { + throw std::domain_error("invalid point data format"); + } + + // 18. Point Data Record Length + // NOTE: No need to set record length because it's + // determined on basis of point data format. + read_n(n2, m_ifs, sizeof(n2)); + + // 19. Number of point records + read_n(n4, m_ifs, sizeof(n4)); + header.SetPointRecordsCount(n4); + + // 20. Number of points by return + std::vector::size_type const srbyr = 5; + uint32_t rbyr[srbyr] = { 0 }; + read_n(rbyr, m_ifs, sizeof(rbyr)); + for (std::size_t i = 0; i < srbyr; ++i) + { + header.SetPointRecordsByReturnCount(i, rbyr[i]); + } + + // 21-23. Scale factors + read_n(x1, m_ifs, sizeof(x1)); + read_n(y1, m_ifs, sizeof(y1)); + read_n(z1, m_ifs, sizeof(z1)); + header.SetScale(x1, y1, z1); + + // 24-26. Offsets + read_n(x1, m_ifs, sizeof(x1)); + read_n(y1, m_ifs, sizeof(y1)); + read_n(z1, m_ifs, sizeof(z1)); + header.SetOffset(x1, y1, z1); + + // 27-28. Max/Min X + read_n(x1, m_ifs, sizeof(x1)); + read_n(x2, m_ifs, sizeof(x2)); + + // 29-30. Max/Min Y + read_n(y1, m_ifs, sizeof(y1)); + read_n(y2, m_ifs, sizeof(y2)); + + // 31-32. Max/Min Z + read_n(z1, m_ifs, sizeof(z1)); + read_n(z2, m_ifs, sizeof(z2)); + + header.SetMax(x1, y1, z1); + header.SetMin(x2, y2, z2); + + m_ifs.seekg(header.GetDataOffset(), std::ios::beg); + + Reset(header); + + return true; +} + +bool ReaderImpl::ReadNextPoint(LASPoint& point, LASHeader const& header) +{ + // Read point data record format 0 + + // TODO: Replace with compile-time assert + + double t = 0; + uint16_t red = 0; + uint16_t blue = 0; + uint16_t green = 0; + LASColor color; + + detail::PointRecord record; + assert(LASHeader::ePointSize0 == sizeof(record)); + + if (0 == m_current) + { + m_ifs.clear(); + m_ifs.seekg(header.GetDataOffset(), std::ios::beg); + } + + if (m_current < m_size) + { + try + { + detail::read_n(record, m_ifs, sizeof(PointRecord)); + ++m_current; + } + catch (std::out_of_range const& e) // we reached the end of the file + { + std::cerr << e.what() << std::endl; + return false; + } + + Reader::FillPoint(record, point); + point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) + { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + } + else if (header.GetDataFormatId() == LASHeader::ePointFormat2) + { + detail::read_n(red, m_ifs, sizeof(uint16_t)); + detail::read_n(green, m_ifs, sizeof(uint16_t)); + detail::read_n(blue, m_ifs, sizeof(uint16_t)); + color.SetRed(red); + color.SetBlue(blue); + color.SetGreen(green); + point.SetColor(color); + } + else if (header.GetDataFormatId() == LASHeader::ePointFormat3) + { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + detail::read_n(red, m_ifs, sizeof(uint16_t)); + detail::read_n(green, m_ifs, sizeof(uint16_t)); + detail::read_n(blue, m_ifs, sizeof(uint16_t)); + color.SetRed(red); + color.SetBlue(blue); + color.SetGreen(green); + point.SetColor(color); + } + + return true; + } + + return false; +} + +bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, LASHeader const& header) +{ + // Read point data record format 0 + + // TODO: Replace with compile-time assert + + double t = 0; + uint16_t red = 0; + uint16_t blue = 0; + uint16_t green = 0; + LASColor color; + + detail::PointRecord record; + assert(LASHeader::ePointSize0 == sizeof(record)); + + if (m_size <= n) + { + return false; + } + + std::streamsize pos = (static_cast(n) * header.GetDataRecordLength()) + header.GetDataOffset(); + + m_ifs.clear(); + m_ifs.seekg(pos, std::ios::beg); + detail::read_n(record, m_ifs, sizeof(record)); + + Reader::FillPoint(record, point); + point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) + { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + } + else if (header.GetDataFormatId() == LASHeader::ePointFormat2) + { + detail::read_n(red, m_ifs, sizeof(uint16_t)); + detail::read_n(blue, m_ifs, sizeof(uint16_t)); + detail::read_n(green, m_ifs, sizeof(uint16_t)); + color.SetRed(red); + color.SetBlue(blue); + color.SetGreen(green); + point.SetColor(color); + } + else if (header.GetDataFormatId() == LASHeader::ePointFormat3) + { + detail::read_n(t, m_ifs, sizeof(double)); + point.SetTime(t); + detail::read_n(red, m_ifs, sizeof(uint16_t)); + detail::read_n(blue, m_ifs, sizeof(uint16_t)); + detail::read_n(green, m_ifs, sizeof(uint16_t)); + color.SetRed(red); + color.SetBlue(blue); + color.SetGreen(green); + point.SetColor(color); + } + + + return true; +} + +}}} // namespace liblas::detail::v11 + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer.cpp work/libLAS-1.2.1/src/detail/writer.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/writer.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,253 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS writer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_GDAL +#include +#endif + + +// std +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { + +Writer::Writer(std::ostream& ofs) : m_ofs(ofs), m_transform(0), m_in_ref(0), m_out_ref(0) +{ +} + +Writer::~Writer() +{ +#ifdef HAVE_GDAL + if (m_transform) { + OCTDestroyCoordinateTransformation(m_transform); + } + if (m_in_ref) { + OSRDestroySpatialReference(m_in_ref); + } + if (m_out_ref) { + OSRDestroySpatialReference(m_out_ref); + } +#endif +} + +std::ostream& Writer::GetStream() const +{ + return m_ofs; +} + + +void Writer::FillPointRecord(PointRecord& record, const LASPoint& point, const LASHeader& header) +{ + if (m_transform) { + // let's just copy the point for now. + LASPoint p = LASPoint(point); + Project(p); + record.x = static_cast((p.GetX() - header.GetOffsetX()) / header.GetScaleX()); + record.y = static_cast((p.GetY() - header.GetOffsetY()) / header.GetScaleY()); + record.z = static_cast((p.GetZ() - header.GetOffsetZ()) / header.GetScaleZ()); + } else { + record.x = static_cast((point.GetX() - header.GetOffsetX()) / header.GetScaleX()); + record.y = static_cast((point.GetY() - header.GetOffsetY()) / header.GetScaleY()); + record.z = static_cast((point.GetZ() - header.GetOffsetZ()) / header.GetScaleZ()); + } + + record.intensity = point.GetIntensity(); + record.flags = point.GetScanFlags(); + record.classification = point.GetClassification(); + record.scan_angle_rank = point.GetScanAngleRank(); + record.user_data = point.GetUserData(); + record.point_source_id = point.GetPointSourceID(); +} + +uint32_t Writer::WriteVLR(LASHeader const& header) +{ + // If this function returns a value, it is the size that the header's + // data offset must be increased by in order for the VLRs to fit in + // the header. + m_ofs.seekp(header.GetHeaderSize(), std::ios::beg); + + // if the VLRs won't fit because the data offset is too + // small, we need to throw an error. + uint32_t vlr_total_size = 0; + + // Calculate a new data offset size + for (uint32_t i = 0; i < header.GetRecordsCount(); ++i) + { + LASVariableRecord vlr = header.GetVLR(i); + vlr_total_size += vlr.GetTotalSize(); + } + + int32_t difference = header.GetDataOffset() - (vlr_total_size + header.GetHeaderSize()); + + if (difference < 0) + { + return difference; + } + + for (uint32_t i = 0; i < header.GetRecordsCount(); ++i) + { + LASVariableRecord vlr = header.GetVLR(i); + + detail::write_n(m_ofs, vlr.GetReserved(), sizeof(uint16_t)); + detail::write_n(m_ofs, vlr.GetUserId(true).c_str(), 16); + detail::write_n(m_ofs, vlr.GetRecordId(), sizeof(uint16_t)); + detail::write_n(m_ofs, vlr.GetRecordLength(), sizeof(uint16_t)); + detail::write_n(m_ofs, vlr.GetDescription(true).c_str(), 32); + std::vector const& data = vlr.GetData(); + std::streamsize const size = static_cast(data.size()); + detail::write_n(m_ofs, data.front(), size); + } + + // if we had more room than we need for the VLRs, we need to pad that with + // 0's. We must also not forget to add the 1.0 pad bytes to the end of this + // but the impl should be the one doing that, not us. + if (difference > 0) { + detail::write_n(m_ofs, "\0", difference); + } + return 0; +} + + +void Writer::SetSRS(const LASSpatialReference& srs ) +{ + m_out_srs = srs; +#ifdef HAVE_GDAL + m_in_ref = OSRNewSpatialReference(0); + m_out_ref = OSRNewSpatialReference(0); + + int result = OSRSetFromUserInput(m_in_ref, m_in_srs.GetWKT().c_str()); + if (result != OGRERR_NONE) + { + std::ostringstream msg; + msg << "Could not import input spatial reference for Writer::" << CPLGetLastErrorMsg() << result; + std::string message(msg.str()); + throw std::runtime_error(message); + } + + result = OSRSetFromUserInput(m_out_ref, m_out_srs.GetWKT().c_str()); + if (result != OGRERR_NONE) + { + std::ostringstream msg; + msg << "Could not import output spatial reference for Writer::" << CPLGetLastErrorMsg() << result; + std::string message(msg.str()); + throw std::runtime_error(message); + } + + m_transform = OCTNewCoordinateTransformation( m_in_ref, m_out_ref); + +#endif +} + +void Writer::Project(LASPoint& p) +{ +#ifdef HAVE_GDAL + + int ret = 0; + double x = p.GetX(); + double y = p.GetY(); + double z = p.GetZ(); + + ret = OCTTransform(m_transform, 1, &x, &y, &z); + + if (!ret) { + std::ostringstream msg; + msg << "Could not project point for Writer::" << CPLGetLastErrorMsg() << ret; + std::string message(msg.str()); + throw std::runtime_error(message); + } + + p.SetX(x); + p.SetY(y); + p.SetZ(z); +#else + UNREFERENCED_PARAMETER(p); +#endif +} +Writer* WriterFactory::Create(std::ostream& ofs, LASHeader const& header) +{ + if (!ofs) + { + throw std::runtime_error("output stream state is invalid"); + } + + // Select writer implementation based on requested LAS version. + uint8_t major = header.GetVersionMajor(); + uint8_t minor = header.GetVersionMinor(); + + if (1 == major && 0 == minor) + { + return new v10::WriterImpl(ofs); + } + if (1 == major && 1 == minor) + { + return new v11::WriterImpl(ofs); + } + if (1 == major && 2 == minor) + { + return new v12::WriterImpl(ofs); + } + else if (2 == major && 0 == minor) + { + // TODO: LAS 2.0 read/write support + throw std::runtime_error("LAS 2.0 file detected but unsupported"); + } + + throw std::runtime_error("LAS file of unknown version"); +} + +void WriterFactory::Destroy(Writer* p) +{ + delete p; + p = 0; +} + +}} // namespace liblas::detail diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer10.cpp work/libLAS-1.2.1/src/detail/writer10.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer10.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/writer10.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,273 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.0 writer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +// std +#include +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { namespace v10 { + +WriterImpl::WriterImpl(std::ostream& ofs) : + Base(ofs), m_pointCount(0) +{ +} + +std::size_t WriterImpl::GetVersion() const +{ + return eLASVersion10; +} + +void WriterImpl::WriteHeader(LASHeader& header) +{ + uint8_t n1 = 0; + uint16_t n2 = 0; + uint32_t n4 = 0; + + // Rewrite the georeference VLR entries if they exist + header.SetGeoreference(); + + // Seek to the beginning + m_ofs.seekp(0, std::ios::beg); + std::ios::pos_type beginning = m_ofs.tellp(); + + // Seek to the end + m_ofs.seekp(0, std::ios::end); + std::ios::pos_type end = m_ofs.tellp(); + + // Figure out how many points we already have. Each point record + // should be 20 bytes long, and header.GetDataOffset tells + // us the location to start counting points from. + + // This test should only be true if we were opened in both + // std::ios::in *and* std::ios::out, otherwise it should return false + // and we won't adjust the point count. + + if ((beginning != end) && ((uint32_t)end != 0)) { + m_pointCount = ((uint32_t) end - header.GetDataOffset())/header.GetDataRecordLength(); + + // Position to the beginning of the file to start writing the header + m_ofs.seekp(0, std::ios::beg); + } + + // 1. File Signature + std::string const filesig(header.GetFileSignature()); + assert(filesig.size() == 4); + detail::write_n(m_ofs, filesig, 4); + + // 2. Reserved + n4 = header.GetReserved(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 3-6. GUID data + uint32_t d1 = 0; + uint16_t d2 = 0; + uint16_t d3 = 0; + uint8_t d4[8] = { 0 }; + liblas::guid g = header.GetProjectId(); + g.output_data(d1, d2, d3, d4); + detail::write_n(m_ofs, d1, sizeof(d1)); + detail::write_n(m_ofs, d2, sizeof(d2)); + detail::write_n(m_ofs, d3, sizeof(d3)); + detail::write_n(m_ofs, d4, sizeof(d4)); + + // 7. Version major + n1 = header.GetVersionMajor(); + assert(1 == n1); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 8. Version minor + n1 = header.GetVersionMinor(); + assert(0 == n1); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 9. System ID + std::string sysid(header.GetSystemId(true)); + assert(sysid.size() == 32); + detail::write_n(m_ofs, sysid, 32); + + // 10. Generating Software ID + std::string softid(header.GetSoftwareId(true)); + assert(softid.size() == 32); + detail::write_n(m_ofs, softid, 32); + + // 11. Flight Date Julian + n2 = header.GetCreationDOY(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 12. Year + n2 = header.GetCreationYear(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 13. Header Size + n2 = header.GetHeaderSize(); + assert(227 <= n2); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 14. Offset to data + // Because we are 1.0, we must also add pad bytes to the end of the + // header. This means resetting the dataoffset +=2, but we + // don't want to change the header's actual offset until after we + // write the VLRs or else we'll be off by 2 when we write the pad + // bytes + n4 = header.GetDataOffset() + 2; + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 15. Number of variable length records + // TODO: This value must be updated after new variable length record is added. + n4 = header.GetRecordsCount(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 16. Point Data Format ID + n1 = static_cast(header.GetDataFormatId()); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 17. Point Data Record Length + n2 = header.GetDataRecordLength(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 18. Number of point records + // This value is updated if necessary, see UpdateHeader function. + n4 = header.GetPointRecordsCount(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 19. Number of points by return + std::vector::size_type const srbyr = 5; + std::vector const& vpbr = header.GetPointRecordsByReturnCount(); + assert(vpbr.size() <= srbyr); + uint32_t pbr[srbyr] = { 0 }; + std::copy(vpbr.begin(), vpbr.end(), pbr); + detail::write_n(m_ofs, pbr, sizeof(pbr)); + + // 20-22. Scale factors + detail::write_n(m_ofs, header.GetScaleX(), sizeof(double)); + detail::write_n(m_ofs, header.GetScaleY(), sizeof(double)); + detail::write_n(m_ofs, header.GetScaleZ(), sizeof(double)); + + // 23-25. Offsets + detail::write_n(m_ofs, header.GetOffsetX(), sizeof(double)); + detail::write_n(m_ofs, header.GetOffsetY(), sizeof(double)); + detail::write_n(m_ofs, header.GetOffsetZ(), sizeof(double)); + + // 26-27. Max/Min X + detail::write_n(m_ofs, header.GetMaxX(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinX(), sizeof(double)); + + // 28-29. Max/Min Y + detail::write_n(m_ofs, header.GetMaxY(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinY(), sizeof(double)); + + // 30-31. Max/Min Z + detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinZ(), sizeof(double)); + + // If WriteVLR returns a value, it is because the header's + // offset is not large enough to contain the VLRs. The value + // it returns is the number of bytes we must increase the header + // by in order for it to contain the VLRs. + + int32_t difference = WriteVLR(header); + if (difference < 0) { + header.SetDataOffset(header.GetDataOffset() + abs(difference) ); + WriteVLR(header); + } + + // Write the pad bytes. + uint8_t const sgn1 = 0xCC; + uint8_t const sgn2 = 0xDD; + detail::write_n(m_ofs, sgn1, sizeof(uint8_t)); + detail::write_n(m_ofs, sgn2, sizeof(uint8_t)); + + // We can now reset the header's offset to +=2. If we monkeypatched + // the offset because we were too small to write the VLRs, this will + // end up being header.GetDataOffset() + difference + 2 (see above). + header.SetDataOffset(header.GetDataOffset() + 2); + + // Make sure to rewrite the dataoffset in the header portion now that + // we've changed it. + std::streamsize const current_pos = m_ofs.tellp(); + std::streamsize const offset_pos = 96; + m_ofs.seekp(offset_pos, std::ios::beg); + detail::write_n(m_ofs, header.GetDataOffset() , sizeof(header.GetDataOffset())); + m_ofs.seekp(current_pos, std::ios::beg); + + // If we already have points, we're going to put it at the end of the file. + // If we don't have any points, we're going to leave it where it is. + if (m_pointCount != 0) + m_ofs.seekp(0, std::ios::end); +} + +void WriterImpl::UpdateHeader(LASHeader const& header) +{ + if (m_pointCount != header.GetPointRecordsCount()) + { + // Skip to first byte of number of point records data member + std::streamsize const dataPos = 107; + m_ofs.seekp(dataPos, std::ios::beg); + + detail::write_n(m_ofs, m_pointCount , sizeof(m_pointCount)); + } +} + +void WriterImpl::WritePointRecord(LASPoint const& point, const LASHeader& header) +{ + // TODO: Static assert would be better + + double t = 0; + assert(LASHeader::ePointSize0 == sizeof(m_record)); + Writer::FillPointRecord(m_record, point, header); + detail::write_n(m_ofs, m_record, sizeof(m_record)); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) { + t = point.GetTime(); + detail::write_n(m_ofs, t, sizeof(double)); + } + ++m_pointCount; +} + +}}} // namespace liblas::detail::v10 diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer11.cpp work/libLAS-1.2.1/src/detail/writer11.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer11.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/writer11.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,264 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.1 writer implementation for C++ libLAS + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +// std +#include +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { namespace v11 { + +WriterImpl::WriterImpl(std::ostream& ofs) : + Base(ofs), m_pointCount(0) +{ +} + +std::size_t WriterImpl::GetVersion() const +{ + return eLASVersion11; +} + +void WriterImpl::WriteHeader(LASHeader& header) +{ + uint8_t n1 = 0; + uint16_t n2 = 0; + uint32_t n4 = 0; + + // Rewrite the georeference VLR entries if they exist + header.SetGeoreference(); + + // Seek to the beginning + m_ofs.seekp(0, std::ios::beg); + std::ios::pos_type beginning = m_ofs.tellp(); + + // Seek to the end + m_ofs.seekp(0, std::ios::end); + std::ios::pos_type end = m_ofs.tellp(); + + // Figure out how many points we already have. Each point record + // should be 20 bytes long, and header.GetDataOffset tells + // us the location to start counting points from. + + // This test should only be true if we were opened in both + // std::ios::in *and* std::ios::out, otherwise it should return false + // and we won't adjust the point count. + + if (beginning != end) { + m_pointCount = ((uint32_t) end - header.GetDataOffset())/header.GetDataRecordLength(); + + // Position to the beginning of the file to start writing the header + m_ofs.seekp(0, std::ios::beg); + } + + // 1. File Signature + std::string const filesig(header.GetFileSignature()); + assert(filesig.size() == 4); + detail::write_n(m_ofs, filesig, 4); + + // 2. File Source ID + n2 = header.GetFileSourceId(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 3. Reserved + n2 = header.GetReserved(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 4-7. GUID data + uint32_t d1 = 0; + uint16_t d2 = 0; + uint16_t d3 = 0; + uint8_t d4[8] = { 0 }; + liblas::guid g = header.GetProjectId(); + g.output_data(d1, d2, d3, d4); + detail::write_n(m_ofs, d1, sizeof(d1)); + detail::write_n(m_ofs, d2, sizeof(d2)); + detail::write_n(m_ofs, d3, sizeof(d3)); + detail::write_n(m_ofs, d4, sizeof(d4)); + + // 8. Version major + n1 = header.GetVersionMajor(); + assert(1 == n1); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 9. Version minor + n1 = header.GetVersionMinor(); + assert(1 == n1); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 10. System ID + std::string const sysid(header.GetSystemId(true)); + assert(sysid.size() == 32); + detail::write_n(m_ofs, sysid, 32); + + // 11. Generating Software ID + std::string const softid(header.GetSoftwareId(true)); + assert(softid.size() == 32); + detail::write_n(m_ofs, softid, 32); + + // 12. File Creation Day of Year + n2 = header.GetCreationDOY(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 13. File Creation Year + n2 = header.GetCreationYear(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 14. Header Size + n2 = header.GetHeaderSize(); + assert(227 <= n2); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 15. Offset to data + // At this point, no variable length records are written, + // so data offset is equal to header size (227) + // TODO: This value must be updated after new variable length record is added. + n4 = header.GetDataOffset(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 16. Number of variable length records + // TODO: This value must be updated after new variable length record is added. + n4 = header.GetRecordsCount(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 17. Point Data Format ID + n1 = static_cast(header.GetDataFormatId()); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 18. Point Data Record Length + n2 = header.GetDataRecordLength(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 19. Number of point records + // This value is updated if necessary, see UpdateHeader function. + n4 = header.GetPointRecordsCount(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 20. Number of points by return + std::vector::size_type const srbyr = 5; + std::vector const& vpbr = header.GetPointRecordsByReturnCount(); + assert(vpbr.size() <= srbyr); + uint32_t pbr[srbyr] = { 0 }; + std::copy(vpbr.begin(), vpbr.end(), pbr); + detail::write_n(m_ofs, pbr, sizeof(pbr)); + + // 21-23. Scale factors + detail::write_n(m_ofs, header.GetScaleX(), sizeof(double)); + detail::write_n(m_ofs, header.GetScaleY(), sizeof(double)); + detail::write_n(m_ofs, header.GetScaleZ(), sizeof(double)); + + // 24-26. Offsets + detail::write_n(m_ofs, header.GetOffsetX(), sizeof(double)); + detail::write_n(m_ofs, header.GetOffsetY(), sizeof(double)); + detail::write_n(m_ofs, header.GetOffsetZ(), sizeof(double)); + + // 27-28. Max/Min X + detail::write_n(m_ofs, header.GetMaxX(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinX(), sizeof(double)); + + // 29-30. Max/Min Y + detail::write_n(m_ofs, header.GetMaxY(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinY(), sizeof(double)); + + // 31-32. Max/Min Z + detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinZ(), sizeof(double)); + + // If WriteVLR returns a value, it is because the header's + // offset is not large enough to contain the VLRs. The value + // it returns is the number of bytes we must increase the header + // by in order for it to contain the VLRs. + int32_t difference = WriteVLR(header); + if (difference < 0) { + header.SetDataOffset(header.GetDataOffset() + abs(difference) ); + WriteVLR(header); + + // Make sure to rewrite the dataoffset in the header portion now that + // we've changed it. + std::streamsize const current_pos = m_ofs.tellp(); + std::streamsize const offset_pos = 96; + m_ofs.seekp(offset_pos, std::ios::beg); + detail::write_n(m_ofs, header.GetDataOffset() , sizeof(header.GetDataOffset())); + m_ofs.seekp(current_pos, std::ios::beg); + } + + // If we already have points, we're going to put it at the end of the file. + // If we don't have any points, we're going to leave it where it is. + if (m_pointCount != 0) + m_ofs.seekp(0, std::ios::end); +} + +void WriterImpl::UpdateHeader(LASHeader const& header) +{ + if (m_pointCount != header.GetPointRecordsCount()) + { + // Skip to first byte of number of point records data member + std::streamsize const dataPos = 107; + m_ofs.seekp(dataPos, std::ios::beg); + + detail::write_n(m_ofs, m_pointCount , sizeof(m_pointCount)); + } +} + +void WriterImpl::WritePointRecord(LASPoint const& point, const LASHeader& header) +{ + // TODO: Static assert would be better + + double t = 0; + assert(LASHeader::ePointSize0 == sizeof(m_record)); + Writer::FillPointRecord(m_record, point, header); + detail::write_n(m_ofs, m_record, sizeof(m_record)); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) { + t = point.GetTime(); + detail::write_n(m_ofs, t, sizeof(double)); + } + ++m_pointCount; +} + +}}} // namespace liblas::detail::v11 + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer12.cpp work/libLAS-1.2.1/src/detail/writer12.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/detail/writer12.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/detail/writer12.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,298 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS 1.2 writer implementation for C++ libLAS + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +// std +#include +#include +#include +#include // std::size_t +#include + +namespace liblas { namespace detail { namespace v12 { + +WriterImpl::WriterImpl(std::ostream& ofs) : + Base(ofs), m_pointCount(0) +{ +} + +std::size_t WriterImpl::GetVersion() const +{ + return eLASVersion12; +} + +void WriterImpl::WriteHeader(LASHeader& header) +{ + uint8_t n1 = 0; + uint16_t n2 = 0; + uint32_t n4 = 0; + + // Rewrite the georeference VLR entries if they exist + header.SetGeoreference(); + + // Seek to the beginning + m_ofs.seekp(0, std::ios::beg); + std::ios::pos_type beginning = m_ofs.tellp(); + + // Seek to the end + m_ofs.seekp(0, std::ios::end); + std::ios::pos_type end = m_ofs.tellp(); + + // Figure out how many points we already have. Each point record + // should be 20 bytes long, and header.GetDataOffset tells + // us the location to start counting points from. + + // This test should only be true if we were opened in both + // std::ios::in *and* std::ios::out, otherwise it should return false + // and we won't adjust the point count. + + if (beginning != end) + { + m_pointCount = static_cast(end) - header.GetDataOffset(); + m_pointCount /= header.GetDataRecordLength(); + + // Position to the beginning of the file to start writing the header + m_ofs.seekp(0, std::ios::beg); + } + + // 1. File Signature + std::string const filesig(header.GetFileSignature()); + assert(filesig.size() == 4); + detail::write_n(m_ofs, filesig, 4); + + // 2. File Source ID + n2 = header.GetFileSourceId(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 3. Reserved + n2 = header.GetReserved(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 4-7. GUID data + uint32_t d1 = 0; + uint16_t d2 = 0; + uint16_t d3 = 0; + uint8_t d4[8] = { 0 }; + liblas::guid g = header.GetProjectId(); + g.output_data(d1, d2, d3, d4); + detail::write_n(m_ofs, d1, sizeof(d1)); + detail::write_n(m_ofs, d2, sizeof(d2)); + detail::write_n(m_ofs, d3, sizeof(d3)); + detail::write_n(m_ofs, d4, sizeof(d4)); + + // 8. Version major + n1 = header.GetVersionMajor(); + assert(1 == n1); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 9. Version minor + n1 = header.GetVersionMinor(); + assert(2 == n1); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 10. System ID + std::string const sysid(header.GetSystemId(true)); + assert(sysid.size() == 32); + detail::write_n(m_ofs, sysid, 32); + + // 11. Generating Software ID + std::string const softid(header.GetSoftwareId(true)); + assert(softid.size() == 32); + detail::write_n(m_ofs, softid, 32); + + // 12. File Creation Day of Year + n2 = header.GetCreationDOY(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 13. File Creation Year + n2 = header.GetCreationYear(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 14. Header Size + n2 = header.GetHeaderSize(); + assert(227 <= n2); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 15. Offset to data + // At this point, no variable length records are written, + // so data offset is equal to header size (227) + // TODO: This value must be updated after new variable length record is added. + n4 = header.GetDataOffset(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 16. Number of variable length records + // TODO: This value must be updated after new variable length record is added. + n4 = header.GetRecordsCount(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 17. Point Data Format ID + n1 = static_cast(header.GetDataFormatId()); + detail::write_n(m_ofs, n1, sizeof(n1)); + + // 18. Point Data Record Length + n2 = header.GetDataRecordLength(); + detail::write_n(m_ofs, n2, sizeof(n2)); + + // 19. Number of point records + // This value is updated if necessary, see UpdateHeader function. + n4 = header.GetPointRecordsCount(); + detail::write_n(m_ofs, n4, sizeof(n4)); + + // 20. Number of points by return + std::vector::size_type const srbyr = 5; + std::vector const& vpbr = header.GetPointRecordsByReturnCount(); + assert(vpbr.size() <= srbyr); + uint32_t pbr[srbyr] = { 0 }; + std::copy(vpbr.begin(), vpbr.end(), pbr); + detail::write_n(m_ofs, pbr, sizeof(pbr)); + + // 21-23. Scale factors + detail::write_n(m_ofs, header.GetScaleX(), sizeof(double)); + detail::write_n(m_ofs, header.GetScaleY(), sizeof(double)); + detail::write_n(m_ofs, header.GetScaleZ(), sizeof(double)); + + // 24-26. Offsets + detail::write_n(m_ofs, header.GetOffsetX(), sizeof(double)); + detail::write_n(m_ofs, header.GetOffsetY(), sizeof(double)); + detail::write_n(m_ofs, header.GetOffsetZ(), sizeof(double)); + + // 27-28. Max/Min X + detail::write_n(m_ofs, header.GetMaxX(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinX(), sizeof(double)); + + // 29-30. Max/Min Y + detail::write_n(m_ofs, header.GetMaxY(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinY(), sizeof(double)); + + // 31-32. Max/Min Z + detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double)); + detail::write_n(m_ofs, header.GetMinZ(), sizeof(double)); + + // If WriteVLR returns a value, it is because the header's + // offset is not large enough to contain the VLRs. The value + // it returns is the number of bytes we must increase the header + // by in order for it to contain the VLRs. + int32_t difference = WriteVLR(header); + if (difference < 0) { + header.SetDataOffset(header.GetDataOffset() + abs(difference) ); + WriteVLR(header); + + // Make sure to rewrite the dataoffset in the header portion now that + // we've changed it. + std::streamsize const current_pos = m_ofs.tellp(); + std::streamsize const offset_pos = 96; + m_ofs.seekp(offset_pos, std::ios::beg); + detail::write_n(m_ofs, header.GetDataOffset() , sizeof(header.GetDataOffset())); + m_ofs.seekp(current_pos, std::ios::beg); + } + + // If we already have points, we're going to put it at the end of the file. + // If we don't have any points, we're going to leave it where it is. + if (m_pointCount != 0) + { + m_ofs.seekp(0, std::ios::end); + } +} + +void WriterImpl::UpdateHeader(LASHeader const& header) +{ + if (m_pointCount != header.GetPointRecordsCount()) + { + // Skip to first byte of number of point records data member + std::streamsize const dataPos = 107; + m_ofs.seekp(dataPos, std::ios::beg); + + detail::write_n(m_ofs, m_pointCount , sizeof(m_pointCount)); + } +} + +void WriterImpl::WritePointRecord(LASPoint const& point, LASHeader const& header) +{ + // TODO: Static assert would be better + + double t = 0; + uint16_t red = 0; + uint16_t blue = 0; + uint16_t green = 0; + LASColor color; + + assert(LASHeader::ePointSize0 == sizeof(m_record)); + Writer::FillPointRecord(m_record, point, header); + detail::write_n(m_ofs, m_record, sizeof(m_record)); + + if (header.GetDataFormatId() == LASHeader::ePointFormat1) + { + t = point.GetTime(); + detail::write_n(m_ofs, t, sizeof(double)); + } + else if (header.GetDataFormatId() == LASHeader::ePointFormat2) + { + color = point.GetColor(); + red = color.GetRed(); + green = color.GetGreen(); + blue = color.GetBlue(); + detail::write_n(m_ofs, red, sizeof(uint16_t)); + detail::write_n(m_ofs, green, sizeof(uint16_t)); + detail::write_n(m_ofs, blue, sizeof(uint16_t)); + } + else if (header.GetDataFormatId() == LASHeader::ePointFormat3) + { + t = point.GetTime(); + detail::write_n(m_ofs, t, sizeof(double)); + color = point.GetColor(); + red = color.GetRed(); + green = color.GetGreen(); + blue = color.GetBlue(); + detail::write_n(m_ofs, red, sizeof(uint16_t)); + detail::write_n(m_ofs, green, sizeof(uint16_t)); + detail::write_n(m_ofs, blue, sizeof(uint16_t)); + } + + + ++m_pointCount; +} + +}}} // namespace liblas::detail::v12 + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/gt_citation.cpp work/libLAS-1.2.1/src/gt_citation.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/gt_citation.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/gt_citation.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,479 @@ +/****************************************************************************** + * $Id$ + * + * Project: GeoTIFF Driver + * Purpose: Implements special parsing of Imagine citation strings, and + * to encode PE String info in citation fields as needed. + * Author: Xiuguang Zhou (ESRI) + * + ****************************************************************************** + * Copyright (c) 2008, Xiuguang Zhou (ESRI) + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************/ + +#include "cpl_port.h" +#include "cpl_string.h" + +#include "geo_normalize.h" +#include "geovalues.h" +#include "ogr_spatialref.h" + + +#define nCitationNameTypes 9 +typedef enum +{ + CitCsName = 0, + CitPcsName = 1, + CitProjectionName = 2, + CitLUnitsName = 3, + CitGcsName = 4, + CitDatumName = 5, + CitEllipsoidName = 6, + CitPrimemName = 7, + CitAUnitsName = 8 +} CitationNameType; + +char* ImagineCitationTranslation(const char* psCitation, geokey_t keyID); +char** CitationStringParse(const char* psCitation); +void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName); +void SetGeogCSCitation(GTIF * psGTIF, OGRSpatialReference *poSRS, char* angUnitName, int nDatum, short nSpheroid); +OGRBoolean SetCitationToSRS(GTIF* hGTIF, char* szCTString, int nCTStringLen, + geokey_t geoKey, OGRSpatialReference* poSRS, OGRBoolean* linearUnitIsSet); +void GetGeogCSFromCitation(char* szGCSName, int nGCSName, + geokey_t geoKey, + char **ppszGeogName, + char **ppszDatumName, + char **ppszPMName, + char **ppszSpheroidName, + char **ppszAngularUnits); + +/************************************************************************/ +/* ImagineCitationTranslation() */ +/* */ +/* Translate ERDAS Imagine GeoTif citation */ +/************************************************************************/ +char* ImagineCitationTranslation(const char* psCitation, geokey_t keyID) +{ + char* ret = NULL; + if(!psCitation) + return ret; + if(EQUALN(psCitation, "IMAGINE GeoTIFF Support", strlen("IMAGINE GeoTIFF Support"))) + { + CPLString osName; + + // this is a handle IMAGING style citation + const char* p = NULL; + p = strchr(psCitation, '$'); + if(p) + p = strchr(p, '\n'); + if(p) + p++; + const char* p1 = NULL; + if(p) + p1 = strchr(p, '\n'); + if(p && p1) + { + switch (keyID) + { + case PCSCitationGeoKey: + osName = "PCS Name = "; + break; + case GTCitationGeoKey: + osName = "CS Name = "; + break; + case GeogCitationGeoKey: + if(!strstr(p, "Unable to")) + osName = "GCS Name = "; + break; + default: + break; + } + if(strlen(osName)>0) + { + osName.append(p, p1-p); + osName += "|"; + } + } + p = strstr(psCitation, "Projection Name = "); + if(p) + { + p += strlen("Projection Name = "); + p1 = strchr(p, '\n'); + if(!p1) + p1 = strchr(p, '\0'); + } + if(p && p1) + { + osName.append(p, p1-p); + osName += "|"; + } + p = strstr(psCitation, "Datum = "); + if(p) + { + p += strlen("Datum = "); + p1 = strchr(p, '\n'); + if(!p1) + p1 = strchr(p, '\0'); + } + if(p && p1) + { + osName += "Datum = "; + osName.append(p, p1-p); + osName += "|"; + } + p = strstr(psCitation, "Ellipsoid = "); + if(p) + { + p += strlen("Ellipsoid = "); + p1 = strchr(p, '\n'); + if(!p1) + p1 = strchr(p, '\0'); + } + if(p && p1) + { + osName += "Ellipsoid = "; + osName.append(p, p1-p); + osName += "|"; + } + p = strstr(psCitation, "Units = "); + if(p) + { + p += strlen("Units = "); + p1 = strchr(p, '\n'); + if(!p1) + p1 = strchr(p, '\0'); + } + if(p && p1) + { + osName += "LUnits = "; + osName.append(p, p1-p); + osName += "|"; + } + if(strlen(osName) > 0) + { + ret = CPLStrdup(osName); + } + } + return ret; +} + +/************************************************************************/ +/* CitationStringParse() */ +/* */ +/* Parse a Citation string */ +/************************************************************************/ +char** CitationStringParse(const char* psCitation) +{ + char ** ret = NULL; + if(!psCitation) + return ret; + + ret = (char **) CPLCalloc(sizeof(char*), nCitationNameTypes); + const char* pDelimit = NULL; + const char* pStr = psCitation; + CPLString osName; + int nCitationLen = strlen(psCitation); + OGRBoolean nameFound = FALSE; + while((pStr-psCitation+1)< nCitationLen) + { + if( (pDelimit = strstr(pStr, "|")) ) + { + osName = ""; + osName.append(pStr, pDelimit-pStr); + pStr = pDelimit+1; + } + else + { + osName = pStr; + pStr += strlen(pStr); + } + const char* name = osName.c_str(); + if( strstr(name, "PCS Name = ") ) + { + if (!ret[CitPcsName]) + ret[CitPcsName] = CPLStrdup(name+strlen("PCS Name = ")); + nameFound = TRUE; + } + if(strstr(name, "Projection Name = ")) + { + if (!ret[CitProjectionName]) + ret[CitProjectionName] = CPLStrdup(name+strlen("Projection Name = ")); + nameFound = TRUE; + } + if(strstr(name, "LUnits = ")) + { + if (!ret[CitLUnitsName]) + ret[CitLUnitsName] = CPLStrdup(name+strlen("LUnits = ")); + nameFound = TRUE; + } + if(strstr(name, "GCS Name = ")) + { + if (!ret[CitGcsName]) + ret[CitGcsName] = CPLStrdup(name+strlen("GCS Name = ")); + nameFound = TRUE; + } + if(strstr(name, "Datum = ")) + { + if (!ret[CitDatumName]) + ret[CitDatumName] = CPLStrdup(name+strlen("Datum = ")); + nameFound = TRUE; + } + if(strstr(name, "Ellipsoid = ")) + { + if (!ret[CitEllipsoidName]) + ret[CitEllipsoidName] = CPLStrdup(name+strlen("Ellipsoid = ")); + nameFound = TRUE; + } + if(strstr(name, "Primem = ")) + { + if (!ret[CitPrimemName]) + ret[CitPrimemName] = CPLStrdup(name+strlen("Primem = ")); + nameFound = TRUE; + } + if(strstr(name, "AUnits = ")) + { + if (!ret[CitAUnitsName]) + ret[CitAUnitsName] = CPLStrdup(name+strlen("AUnits = ")); + nameFound = TRUE; + } + } + if(!nameFound) + { + CPLFree( ret ); + ret = (char**)NULL; + } + return ret; +} + +/************************************************************************/ +/* SetLinearUnitCitation() */ +/* */ +/* Set linear unit Citation string */ +/************************************************************************/ +void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName) +{ + char szName[512]; + CPLString osCitation; + int n = 0; + if( GTIFKeyGet( psGTIF, PCSCitationGeoKey, szName, 0, sizeof(szName) ) ) + n = strlen(szName); + if(n>0) + { + osCitation = szName; + if(osCitation[n-1] != '|') + osCitation += "|"; + osCitation += "LUnits = "; + osCitation += pszLinearUOMName; + osCitation += "|"; + } + else + { + osCitation = "LUnits = "; + osCitation += pszLinearUOMName; + } + GTIFKeySet( psGTIF, PCSCitationGeoKey, TYPE_ASCII, 0, osCitation.c_str() ); + return; +} + +/************************************************************************/ +/* SetGeogCSCitation() */ +/* */ +/* Set geogcs Citation string */ +/************************************************************************/ +void SetGeogCSCitation(GTIF * psGTIF, OGRSpatialReference *poSRS, char* angUnitName, int nDatum, short nSpheroid) +{ + int bRewriteGeogCitation = FALSE; + char szName[256]; + CPLString osCitation; + size_t n = 0; + if( GTIFKeyGet( psGTIF, GeogCitationGeoKey, szName, 0, sizeof(szName) ) ) + n = strlen(szName); + if (n == 0) + return; + + if(!EQUALN(szName, "GCS Name = ", strlen("GCS Name = "))) + { + osCitation = "GCS Name = "; + osCitation += szName; + } + else + { + osCitation = szName; + } + + if(nDatum == KvUserDefined ) + { + const char* datumName = poSRS->GetAttrValue( "DATUM" ); + if(datumName && strlen(datumName) > 0) + { + osCitation += "|Datum = "; + osCitation += datumName; + bRewriteGeogCitation = TRUE; + } + } + if(nSpheroid == KvUserDefined ) + { + const char* spheroidName = poSRS->GetAttrValue( "SPHEROID" ); + if(spheroidName && strlen(spheroidName) > 0) + { + osCitation += "|Ellipsoid = "; + osCitation += spheroidName; + bRewriteGeogCitation = TRUE; + } + } + + const char* primemName = poSRS->GetAttrValue( "PRIMEM" ); + if(primemName && strlen(primemName) > 0) + { + osCitation += "|Primem = "; + osCitation += primemName; + bRewriteGeogCitation = TRUE; + + double primemValue = poSRS->GetPrimeMeridian(NULL); + if(angUnitName && !EQUAL(angUnitName, "Degree")) + { + double aUnit = poSRS->GetAngularUnits(NULL); + primemValue *= aUnit; + } + GTIFKeySet( psGTIF, GeogPrimeMeridianLongGeoKey, TYPE_DOUBLE, 1, + primemValue ); + } + if(angUnitName && strlen(angUnitName) > 0 && !EQUAL(angUnitName, "Degree")) + { + osCitation += "|AUnits = "; + osCitation += angUnitName; + bRewriteGeogCitation = TRUE; + } + + if (osCitation[strlen(osCitation) - 1] != '|') + osCitation += "|"; + + if (bRewriteGeogCitation) + GTIFKeySet( psGTIF, GeogCitationGeoKey, TYPE_ASCII, 0, osCitation.c_str() ); + + return; +} + +/************************************************************************/ +/* SetCitationToSRS() */ +/* */ +/* Parse and set Citation string to SRS */ +/************************************************************************/ +OGRBoolean SetCitationToSRS(GTIF* hGTIF, char* szCTString, int nCTStringLen, + geokey_t geoKey, OGRSpatialReference* poSRS, OGRBoolean* linearUnitIsSet) +{ + OGRBoolean ret = FALSE; + *linearUnitIsSet = FALSE; + char* imgCTName = ImagineCitationTranslation(szCTString, geoKey); + if(imgCTName) + { + strncpy(szCTString, imgCTName, nCTStringLen); + szCTString[nCTStringLen-1] = '\0'; + CPLFree( imgCTName ); + } + char** ctNames = CitationStringParse(szCTString); + if(ctNames) + { + if( poSRS->GetRoot() == NULL) + poSRS->SetNode( "PROJCS", "unnamed" ); + if(ctNames[CitPcsName]) + { + poSRS->SetNode( "PROJCS", ctNames[CitPcsName] ); + ret = TRUE; + } + else if(geoKey != GTCitationGeoKey) + { + char szPCSName[128]; + if( GTIFKeyGet( hGTIF, GTCitationGeoKey, szPCSName, 0, sizeof(szPCSName) ) ) + { + poSRS->SetNode( "PROJCS", szPCSName ); + ret = TRUE; + } + } + + if(ctNames[CitProjectionName]) + poSRS->SetProjection( ctNames[CitProjectionName] ); + + if(ctNames[CitLUnitsName]) + { + double unitSize; + if (GTIFKeyGet(hGTIF, ProjLinearUnitSizeGeoKey, &unitSize, 0, + sizeof(unitSize) )) + { + poSRS->SetLinearUnits( ctNames[CitLUnitsName], unitSize); + *linearUnitIsSet = TRUE; + } + } + for(int i= 0; i= 'A' && pszDatum[i] <= 'Z') + && !(pszDatum[i] >= 'a' && pszDatum[i] <= 'z') + && !(pszDatum[i] >= '0' && pszDatum[i] <= '9') ) + { + pszDatum[i] = '_'; + } + } + +/* -------------------------------------------------------------------- */ +/* Remove repeated and trailing underscores. */ +/* -------------------------------------------------------------------- */ + for( i = 1, j = 0; pszDatum[i] != '\0'; i++ ) + { + if( pszDatum[j] == '_' && pszDatum[i] == '_' ) + continue; + + pszDatum[++j] = pszDatum[i]; + } + if( pszDatum[j] == '_' ) + pszDatum[j] = '\0'; + else + pszDatum[j+1] = '\0'; + +/* -------------------------------------------------------------------- */ +/* Search for datum equivelences. Specific massaged names get */ +/* mapped to OpenGIS specified names. */ +/* -------------------------------------------------------------------- */ + for( i = 0; papszDatumEquiv[i] != NULL; i += 2 ) + { + if( EQUAL(*ppszDatum,papszDatumEquiv[i]) ) + { + CPLFree( *ppszDatum ); + *ppszDatum = CPLStrdup( papszDatumEquiv[i+1] ); + return; + } + } +} + +/************************************************************************/ +/* GTIFCleanupImageineNames() */ +/* */ +/* Erdas Imagine sometimes emits big copyright messages, and */ +/* other stuff into citations. These can be pretty messy when */ +/* turned into WKT, so we try to trim and clean the strings */ +/* somewhat. */ +/************************************************************************/ + +/* For example: + GTCitationGeoKey (Ascii,215): "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 16109 $ $Date: 2009-01-18 05:34:57 -0600 (Sun, 18 Jan 2009) $\nProjection Name = UTM\nUnits = meters\nGeoTIFF Units = meters" + + GeogCitationGeoKey (Ascii,267): "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 16109 $ $Date: 2009-01-18 05:34:57 -0600 (Sun, 18 Jan 2009) $\nUnable to match Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)" + + PCSCitationGeoKey (Ascii,214): "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 16109 $ $Date: 2009-01-18 05:34:57 -0600 (Sun, 18 Jan 2009) $\nUTM Zone 10N\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)" + +*/ + +static void GTIFCleanupImagineNames( char *pszCitation ) + +{ + if( strstr(pszCitation,"IMAGINE GeoTIFF") == NULL ) + return; + +/* -------------------------------------------------------------------- */ +/* First, we skip past all the copyright, and RCS stuff. We */ +/* assume that this will have a "$" at the end of it all. */ +/* -------------------------------------------------------------------- */ + char *pszSkip; + + for( pszSkip = pszCitation + strlen(pszCitation) - 1; + pszSkip != pszCitation && *pszSkip != '$'; + pszSkip-- ) {} + + if( *pszSkip == '$' ) + pszSkip++; + + memmove( pszCitation, pszSkip, strlen(pszSkip)+1 ); + +/* -------------------------------------------------------------------- */ +/* Convert any newlines into spaces, they really gum up the */ +/* WKT. */ +/* -------------------------------------------------------------------- */ + int i; + + for( i = 0; pszCitation[i] != '\0'; i++ ) + { + if( pszCitation[i] == '\n' ) + pszCitation[i] = ' '; + } +} + +/************************************************************************/ +/* GTIFGetOGISDefn() */ +/************************************************************************/ + +char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) + +{ + OGRSpatialReference oSRS; + +/* -------------------------------------------------------------------- */ +/* Handle non-standard coordinate systems as LOCAL_CS. */ +/* -------------------------------------------------------------------- */ + if( psDefn->Model != ModelTypeProjected + && psDefn->Model != ModelTypeGeographic ) + { + char *pszWKT; + char szPeStr[2400]; + + /** check if there is a pe string citation key **/ + if( GTIFKeyGet( hGTIF, PCSCitationGeoKey, szPeStr, 0, sizeof(szPeStr) ) && + strstr(szPeStr, "ESRI PE String = " ) ) + { + pszWKT = CPLStrdup( szPeStr + strlen("ESRI PE String = ") ); + return pszWKT; + } + else + { + char *pszUnitsName = NULL; + char szPCSName[300]; + int nKeyCount = 0; + int anVersion[3]; + + if( hGTIF != NULL ) + GTIFDirectoryInfo( hGTIF, anVersion, &nKeyCount ); + + if( nKeyCount > 0 ) // Use LOCAL_CS if we have any geokeys at all. + { + // Handle citation. + strcpy( szPCSName, "unnamed" ); + if( !GTIFKeyGet( hGTIF, GTCitationGeoKey, szPCSName, + 0, sizeof(szPCSName) ) ) + GTIFKeyGet( hGTIF, GeogCitationGeoKey, szPCSName, + 0, sizeof(szPCSName) ); + + GTIFCleanupImagineNames( szPCSName ); + oSRS.SetLocalCS( szPCSName ); + + // Handle units + GTIFGetUOMLengthInfo( psDefn->UOMLength, &pszUnitsName, NULL ); + + if( pszUnitsName != NULL && psDefn->UOMLength != KvUserDefined ) + { + oSRS.SetLinearUnits( pszUnitsName, psDefn->UOMLengthInMeters ); + oSRS.SetAuthority( "LOCAL_CS|UNIT", "EPSG", psDefn->UOMLength); + } + else + oSRS.SetLinearUnits( "unknown", psDefn->UOMLengthInMeters ); + + GTIFFreeMemory( pszUnitsName ); + } + oSRS.exportToWkt( &pszWKT ); + + return pszWKT; + } + } + +/* -------------------------------------------------------------------- */ +/* If this is a projected SRS we set the PROJCS keyword first */ +/* to ensure that the GEOGCS will be a child. */ +/* -------------------------------------------------------------------- */ + OGRBoolean linearUnitIsSet = FALSE; + if( psDefn->Model == ModelTypeProjected ) + { + char szCTString[512]; + strcpy( szCTString, "unnamed" ); + if( psDefn->PCS != KvUserDefined ) + { + char *pszPCSName = NULL; + + GTIFGetPCSInfo( psDefn->PCS, &pszPCSName, NULL, NULL, NULL ); + + oSRS.SetNode( "PROJCS", pszPCSName ? pszPCSName : "unnamed" ); + if ( pszPCSName ) + GTIFFreeMemory( pszPCSName ); + + oSRS.SetAuthority( "PROJCS", "EPSG", psDefn->PCS ); + } + else if(hGTIF && GTIFKeyGet( hGTIF, PCSCitationGeoKey, szCTString, 0, + sizeof(szCTString)) ) + { + SetCitationToSRS(hGTIF, szCTString, sizeof(szCTString), + PCSCitationGeoKey, &oSRS, &linearUnitIsSet); + } + else + { + if( hGTIF ) + { + GTIFKeyGet( hGTIF, GTCitationGeoKey, szCTString, 0, sizeof(szCTString) ); + if(!SetCitationToSRS(hGTIF, szCTString, sizeof(szCTString), + GTCitationGeoKey, &oSRS, &linearUnitIsSet)) + oSRS.SetNode( "PROJCS", szCTString ); + } + else + oSRS.SetNode( "PROJCS", szCTString ); + } + } + +/* ==================================================================== */ +/* Setup the GeogCS */ +/* ==================================================================== */ + char *pszGeogName = NULL; + char *pszDatumName = NULL; + char *pszPMName = NULL; + char *pszSpheroidName = NULL; + char *pszAngularUnits = NULL; + double dfInvFlattening=0.0, dfSemiMajor=0.0; + char szGCSName[512]; + OGRBoolean aUnitGot = FALSE; + + if( !GTIFGetGCSInfo( psDefn->GCS, &pszGeogName, NULL, NULL, NULL ) + && hGTIF != NULL + && GTIFKeyGet( hGTIF, GeogCitationGeoKey, szGCSName, 0, + sizeof(szGCSName)) ) + GetGeogCSFromCitation(szGCSName, sizeof(szGCSName), + GeogCitationGeoKey, + &pszGeogName, &pszDatumName, + &pszPMName, &pszSpheroidName, + &pszAngularUnits); + + if( !pszDatumName ) + GTIFGetDatumInfo( psDefn->Datum, &pszDatumName, NULL ); + if( !pszSpheroidName ) + GTIFGetEllipsoidInfo( psDefn->Ellipsoid, &pszSpheroidName, NULL, NULL ); + else + { + GTIFKeyGet(hGTIF, GeogSemiMajorAxisGeoKey, &(psDefn->SemiMajor), 0, 1 ); + GTIFKeyGet(hGTIF, GeogInvFlatteningGeoKey, &dfInvFlattening, 0, 1 ); + } + if( !pszPMName ) + GTIFGetPMInfo( psDefn->PM, &pszPMName, NULL ); + else + GTIFKeyGet(hGTIF, GeogPrimeMeridianLongGeoKey, &(psDefn->PMLongToGreenwich), 0, 1 ); + + if( !pszAngularUnits ) + { + GTIFGetUOMAngleInfo( psDefn->UOMAngle, &pszAngularUnits, NULL ); + if( pszAngularUnits == NULL ) + pszAngularUnits = CPLStrdup("unknown"); + } + else + { + GTIFKeyGet(hGTIF, GeogAngularUnitSizeGeoKey, &(psDefn->UOMAngleInDegrees), 0, 1 ); + aUnitGot = TRUE; + } + + if( pszDatumName != NULL ) + WKTMassageDatum( &pszDatumName ); + + dfSemiMajor = psDefn->SemiMajor; + if( dfSemiMajor == 0.0 ) + { + pszSpheroidName = CPLStrdup("unretrievable - using WGS84"); + dfSemiMajor = SRS_WGS84_SEMIMAJOR; + dfInvFlattening = SRS_WGS84_INVFLATTENING; + } + else if( dfInvFlattening == 0.0 && ((psDefn->SemiMinor / psDefn->SemiMajor) < 0.99999999999999999 + || (psDefn->SemiMinor / psDefn->SemiMajor) > 1.00000000000000001 ) ) + { + dfInvFlattening = -1.0 / (psDefn->SemiMinor/psDefn->SemiMajor - 1.0); + + /* Take official inverse flattening definition in the WGS84 case */ + if (dfSemiMajor == SRS_WGS84_SEMIMAJOR && + fabs(dfInvFlattening - SRS_WGS84_INVFLATTENING) < 1e-10) + dfInvFlattening = SRS_WGS84_INVFLATTENING; + } + if(!pszGeogName || strlen(pszGeogName) == 0) + pszGeogName = CPLStrdup( pszDatumName ); + if(aUnitGot) + oSRS.SetGeogCS( pszGeogName, pszDatumName, + pszSpheroidName, dfSemiMajor, dfInvFlattening, + pszPMName, + psDefn->PMLongToGreenwich / psDefn->UOMAngleInDegrees, + pszAngularUnits, + psDefn->UOMAngleInDegrees ); + else + oSRS.SetGeogCS( pszGeogName, pszDatumName, + pszSpheroidName, dfSemiMajor, dfInvFlattening, + pszPMName, + psDefn->PMLongToGreenwich / psDefn->UOMAngleInDegrees, + pszAngularUnits, + psDefn->UOMAngleInDegrees * 0.0174532925199433 ); + + if( psDefn->GCS != KvUserDefined && psDefn->GCS > 0 ) + oSRS.SetAuthority( "GEOGCS", "EPSG", psDefn->GCS ); + + if( psDefn->Datum != KvUserDefined ) + oSRS.SetAuthority( "DATUM", "EPSG", psDefn->Datum ); + + if( psDefn->Ellipsoid != KvUserDefined ) + oSRS.SetAuthority( "SPHEROID", "EPSG", psDefn->Ellipsoid ); + + CPLFree( pszGeogName ); + CPLFree( pszDatumName ); + GTIFFreeMemory( pszPMName ); + GTIFFreeMemory( pszSpheroidName ); + GTIFFreeMemory( pszAngularUnits ); + +/* ==================================================================== */ +/* Handle projection parameters. */ +/* ==================================================================== */ + if( psDefn->Model == ModelTypeProjected ) + { +/* -------------------------------------------------------------------- */ +/* Make a local copy of parms, and convert back into the */ +/* angular units of the GEOGCS and the linear units of the */ +/* projection. */ +/* -------------------------------------------------------------------- */ + double adfParm[10]; + int i; + + for( i = 0; i < MIN(10,psDefn->nParms); i++ ) + adfParm[i] = psDefn->ProjParm[i]; + + for( ; i < 10; i++ ) + adfParm[i] = 0.0; + + if(!aUnitGot) + { + adfParm[0] *= psDefn->UOMAngleInDegrees; + adfParm[1] *= psDefn->UOMAngleInDegrees; + adfParm[2] *= psDefn->UOMAngleInDegrees; + adfParm[3] *= psDefn->UOMAngleInDegrees; + } + int unitCode = 0; + GTIFKeyGet(hGTIF, ProjLinearUnitsGeoKey, &unitCode, 0, 1 ); + if(unitCode != KvUserDefined) + { + adfParm[5] /= psDefn->UOMLengthInMeters; + adfParm[6] /= psDefn->UOMLengthInMeters; + } + +/* -------------------------------------------------------------------- */ +/* Translation the fundamental projection. */ +/* -------------------------------------------------------------------- */ + switch( psDefn->CTProjection ) + { + case CT_TransverseMercator: + oSRS.SetTM( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_TransvMercator_SouthOriented: + oSRS.SetTMSO( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_Mercator: + oSRS.SetMercator( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_ObliqueStereographic: + oSRS.SetOS( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_Stereographic: + oSRS.SetOS( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_ObliqueMercator: /* hotine */ + oSRS.SetHOM( adfParm[0], adfParm[1], + adfParm[2], adfParm[3], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_EquidistantConic: + oSRS.SetEC( adfParm[0], adfParm[1], + adfParm[2], adfParm[3], + adfParm[5], adfParm[6] ); + break; + + case CT_CassiniSoldner: + oSRS.SetCS( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_Polyconic: + oSRS.SetPolyconic( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_AzimuthalEquidistant: + oSRS.SetAE( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_MillerCylindrical: + oSRS.SetMC( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_Equirectangular: + oSRS.SetEquirectangular2( adfParm[0], adfParm[1], + adfParm[2], + adfParm[5], adfParm[6] ); + break; + + case CT_Gnomonic: + oSRS.SetGnomonic( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_LambertAzimEqualArea: + oSRS.SetLAEA( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_Orthographic: + oSRS.SetOrthographic( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_Robinson: + oSRS.SetRobinson( adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_Sinusoidal: + oSRS.SetSinusoidal( adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_VanDerGrinten: + oSRS.SetVDG( adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_PolarStereographic: + oSRS.SetPS( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_LambertConfConic_2SP: + oSRS.SetLCC( adfParm[2], adfParm[3], + adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_LambertConfConic_1SP: + oSRS.SetLCC1SP( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); + break; + + case CT_AlbersEqualArea: + oSRS.SetACEA( adfParm[0], adfParm[1], + adfParm[2], adfParm[3], + adfParm[5], adfParm[6] ); + break; + + case CT_NewZealandMapGrid: + oSRS.SetNZMG( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + + case CT_CylindricalEqualArea: + oSRS.SetCEA( adfParm[0], adfParm[1], + adfParm[5], adfParm[6] ); + break; + } + +/* -------------------------------------------------------------------- */ +/* Set projection units. */ +/* -------------------------------------------------------------------- */ + if(!linearUnitIsSet) + { + char *pszUnitsName = NULL; + + GTIFGetUOMLengthInfo( psDefn->UOMLength, &pszUnitsName, NULL ); + + if( pszUnitsName != NULL && psDefn->UOMLength != KvUserDefined ) + { + oSRS.SetLinearUnits( pszUnitsName, psDefn->UOMLengthInMeters ); + oSRS.SetAuthority( "PROJCS|UNIT", "EPSG", psDefn->UOMLength ); + } + else + oSRS.SetLinearUnits( "unknown", psDefn->UOMLengthInMeters ); + + GTIFFreeMemory( pszUnitsName ); + } + } + +/* -------------------------------------------------------------------- */ +/* Return the WKT serialization of the object. */ +/* -------------------------------------------------------------------- */ + char *pszWKT; + + oSRS.FixupOrdering(); + + if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) + return pszWKT; + else + return NULL; +} + +/************************************************************************/ +/* OGCDatumName2EPSGDatumCode() */ +/************************************************************************/ + +static int OGCDatumName2EPSGDatumCode( const char * pszOGCName ) + +{ + FILE *fp; + char **papszTokens; + int nReturn = KvUserDefined; + +/* -------------------------------------------------------------------- */ +/* Do we know it as a built in? */ +/* -------------------------------------------------------------------- */ + if( EQUAL(pszOGCName,"NAD27") + || EQUAL(pszOGCName,"North_American_Datum_1927") ) + return Datum_North_American_Datum_1927; + else if( EQUAL(pszOGCName,"NAD83") + || EQUAL(pszOGCName,"North_American_Datum_1983") ) + return Datum_North_American_Datum_1983; + else if( EQUAL(pszOGCName,"WGS84") || EQUAL(pszOGCName,"WGS_1984") + || EQUAL(pszOGCName,"WGS 84")) + return Datum_WGS84; + else if( EQUAL(pszOGCName,"WGS72") || EQUAL(pszOGCName,"WGS_1972") ) + return Datum_WGS72; + +/* -------------------------------------------------------------------- */ +/* Open the table if possible. */ +/* -------------------------------------------------------------------- */ + fp = VSIFOpen( CSVFilename("gdal_datum.csv"), "r" ); + if( fp == NULL ) + fp = VSIFOpen( CSVFilename("datum.csv"), "r" ); + + if( fp == NULL ) + return nReturn; + +/* -------------------------------------------------------------------- */ +/* Discard the first line with field names. */ +/* -------------------------------------------------------------------- */ + CSLDestroy( CSVReadParseLine( fp ) ); + +/* -------------------------------------------------------------------- */ +/* Read lines looking for our datum. */ +/* -------------------------------------------------------------------- */ + for( papszTokens = CSVReadParseLine( fp ); + CSLCount(papszTokens) > 2 && nReturn == KvUserDefined; + papszTokens = CSVReadParseLine( fp ) ) + { + WKTMassageDatum( papszTokens + 1 ); + + if( EQUAL(papszTokens[1], pszOGCName) ) + nReturn = atoi(papszTokens[0]); + + CSLDestroy( papszTokens ); + } + + CSLDestroy( papszTokens ); + VSIFClose( fp ); + + return nReturn; +} + +/************************************************************************/ +/* GTIFSetFromOGISDefn() */ +/* */ +/* Write GeoTIFF projection tags from an OGC WKT definition. */ +/************************************************************************/ + +int GTIFSetFromOGISDefn( GTIF * psGTIF, const char *pszOGCWKT ) + +{ + OGRSpatialReference *poSRS; + int nPCS = KvUserDefined; + OGRErr eErr; + OGRBoolean peStrStored = FALSE; + + GTIFKeySet(psGTIF, GTRasterTypeGeoKey, TYPE_SHORT, 1, + RasterPixelIsArea); + +/* -------------------------------------------------------------------- */ +/* Create an OGRSpatialReference object corresponding to the */ +/* string. */ +/* -------------------------------------------------------------------- */ + poSRS = new OGRSpatialReference(); + if( poSRS->importFromWkt((char **) &pszOGCWKT) != OGRERR_NONE ) + { + delete poSRS; + return FALSE; + } + +/* -------------------------------------------------------------------- */ +/* Get the ellipsoid definition. */ +/* -------------------------------------------------------------------- */ + short nSpheroid = KvUserDefined; + double dfSemiMajor, dfInvFlattening; + + if( poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM|SPHEROID") != NULL + && EQUAL(poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM|SPHEROID"), + "EPSG")) + { + nSpheroid = (short) + atoi(poSRS->GetAuthorityCode("PROJCS|GEOGCS|DATUM|SPHEROID")); + } + else if( poSRS->GetAuthorityName("GEOGCS|DATUM|SPHEROID") != NULL + && EQUAL(poSRS->GetAuthorityName("GEOGCS|DATUM|SPHEROID"),"EPSG")) + { + nSpheroid = (short) + atoi(poSRS->GetAuthorityCode("GEOGCS|DATUM|SPHEROID")); + } + + dfSemiMajor = poSRS->GetSemiMajor( &eErr ); + dfInvFlattening = poSRS->GetInvFlattening( &eErr ); + if( eErr != OGRERR_NONE ) + { + dfSemiMajor = 0.0; + dfInvFlattening = 0.0; + } + +/* -------------------------------------------------------------------- */ +/* Get the Datum so we can special case a few PCS codes. */ +/* -------------------------------------------------------------------- */ + int nDatum = KvUserDefined; + + if( poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM") != NULL + && EQUAL(poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM"),"EPSG") ) + nDatum = atoi(poSRS->GetAuthorityCode("PROJCS|GEOGCS|DATUM")); + else if( poSRS->GetAuthorityName("GEOGCS|DATUM") != NULL + && EQUAL(poSRS->GetAuthorityName("GEOGCS|DATUM"),"EPSG") ) + nDatum = atoi(poSRS->GetAuthorityCode("GEOGCS|DATUM")); + else if( poSRS->GetAttrValue("DATUM") != NULL ) + nDatum = OGCDatumName2EPSGDatumCode( poSRS->GetAttrValue("DATUM") ); + +/* -------------------------------------------------------------------- */ +/* Get the GCS if possible. */ +/* -------------------------------------------------------------------- */ + int nGCS = KvUserDefined; + + if( poSRS->GetAuthorityName("PROJCS|GEOGCS") != NULL + && EQUAL(poSRS->GetAuthorityName("PROJCS|GEOGCS"),"EPSG") ) + nGCS = atoi(poSRS->GetAuthorityCode("PROJCS|GEOGCS")); + else if( poSRS->GetAuthorityName("GEOGCS") != NULL + && EQUAL(poSRS->GetAuthorityName("GEOGCS"),"EPSG") ) + nGCS = atoi(poSRS->GetAuthorityCode("GEOGCS")); + + if( nGCS > 32767 ) + nGCS = KvUserDefined; + +/* -------------------------------------------------------------------- */ +/* Get the linear units. */ +/* -------------------------------------------------------------------- */ + char *pszLinearUOMName = NULL; + double dfLinearUOM = poSRS->GetLinearUnits( &pszLinearUOMName ); + int nUOMLengthCode = 9001; /* meters */ + + if( (pszLinearUOMName != NULL + && EQUAL(pszLinearUOMName,SRS_UL_FOOT)) + || dfLinearUOM == atof(SRS_UL_FOOT_CONV) ) + nUOMLengthCode = 9002; /* international foot */ + else if( (pszLinearUOMName != NULL + && EQUAL(pszLinearUOMName,SRS_UL_US_FOOT)) + || ABS(dfLinearUOM-atof(SRS_UL_US_FOOT_CONV)) < 0.0000001 ) + nUOMLengthCode = 9003; /* us survey foot */ + else if( dfLinearUOM != 1.0 ) + nUOMLengthCode = KvUserDefined; + +/* -------------------------------------------------------------------- */ +/* Get some authority values. */ +/* -------------------------------------------------------------------- */ + if( poSRS->GetAuthorityName("PROJCS") != NULL + && EQUAL(poSRS->GetAuthorityName("PROJCS"),"EPSG") ) + { + nPCS = atoi(poSRS->GetAuthorityCode("PROJCS")); + if( nPCS > 32767 ) + nPCS = KvUserDefined; + } + +/* -------------------------------------------------------------------- */ +/* Handle the projection transformation. */ +/* -------------------------------------------------------------------- */ + const char *pszProjection = poSRS->GetAttrValue( "PROJECTION" ); + + if( nPCS != KvUserDefined ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); + } + else if( pszProjection == NULL ) + { + if( poSRS->IsGeographic() ) + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeGeographic); + // otherwise, presumably something like LOCAL_CS. + } + else if( EQUAL(pszProjection,SRS_PT_ALBERS_CONIC_EQUAL_AREA) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_AlbersEqualArea ); + + GTIFKeySet(psGTIF, ProjStdParallelGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( poSRS->GetUTMZone() != 0 ) + { + int bNorth, nZone, nProjection; + + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + + nZone = poSRS->GetUTMZone( &bNorth ); + + if( nDatum == Datum_North_American_Datum_1983 && nZone >= 3 + && nZone <= 22 && bNorth && nUOMLengthCode == 9001 ) + { + nPCS = 26900 + nZone; + + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); + } + else if( nDatum == Datum_North_American_Datum_1927 && nZone >= 3 + && nZone <= 22 && bNorth && nUOMLengthCode == 9001 ) + { + nPCS = 26700 + nZone; + + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); + } + else if( nDatum == Datum_WGS84 && nUOMLengthCode == 9001 ) + { + if( bNorth ) + nPCS = 32600 + nZone; + else + nPCS = 32700 + nZone; + + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); + } + else + { + if( bNorth ) + nProjection = 16000 + nZone; + else + nProjection = 16100 + nZone; + + + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, nProjection ); + } + } + + else if( EQUAL(pszProjection,SRS_PT_TRANSVERSE_MERCATOR) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_TransverseMercator ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_TRANSVERSE_MERCATOR_SOUTH_ORIENTED) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_TransvMercator_SouthOriented ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_MERCATOR_2SP) + || EQUAL(pszProjection,SRS_PT_MERCATOR_1SP) ) + + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Mercator ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_OBLIQUE_STEREOGRAPHIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_ObliqueStereographic ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_STEREOGRAPHIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Stereographic ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_POLAR_STEREOGRAPHIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_PolarStereographic ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStraightVertPoleLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_HOTINE_OBLIQUE_MERCATOR) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_ObliqueMercator ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjAzimuthAngleGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_AZIMUTH, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjRectifiedGridAngleGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_RECTIFIED_GRID_ANGLE, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtCenterGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_CASSINI_SOLDNER) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_CassiniSoldner ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_EQUIDISTANT_CONIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_EquidistantConic ); + + GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_POLYCONIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Polyconic ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_AZIMUTHAL_EQUIDISTANT) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_AzimuthalEquidistant ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_MILLER_CYLINDRICAL) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_MillerCylindrical ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_EQUIRECTANGULAR) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Equirectangular ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_GNOMONIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Gnomonic ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_LambertAzimEqualArea ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_ORTHOGRAPHIC) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Orthographic ); + + GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_NEW_ZEALAND_MAP_GRID) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_NewZealandMapGrid ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_ROBINSON) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Robinson ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_SINUSOIDAL) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_Sinusoidal ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_VANDERGRINTEN) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_VanDerGrinten ); + + GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_ALBERS_CONIC_EQUAL_AREA) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_AlbersEqualArea ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_LambertConfConic_2SP ); + + GTIFKeySet(psGTIF, ProjFalseOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseOriginEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseOriginNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_LambertConfConic_1SP ); + + GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else if( EQUAL(pszProjection,SRS_PT_CYLINDRICAL_EQUAL_AREA) ) + { + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + ModelTypeProjected); + GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + + GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, + CT_CylindricalEqualArea ); + + GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); + + GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, + poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); + } + + else + { + /* Anyhing we can't map, we store as an ESRI PE string with a citation key */ + char *pszPEString = NULL; + poSRS->morphToESRI(); + poSRS->exportToWkt( &pszPEString ); + int peStrLen = strlen(pszPEString); + if(peStrLen > 0) + { + char *outPeStr = new char[peStrLen + strlen("ESRI PE String = ")+1]; + strcpy(outPeStr, "ESRI PE String = "); + strcat(outPeStr, pszPEString); + GTIFKeySet( psGTIF, PCSCitationGeoKey, TYPE_ASCII, 0, outPeStr ); + peStrStored = TRUE; + delete[] outPeStr; + } + if(pszPEString) + CPLFree( pszPEString ); + GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + } + +/* -------------------------------------------------------------------- */ +/* Write linear units information. */ +/* -------------------------------------------------------------------- */ + if( !poSRS->IsGeographic() ) + { + GTIFKeySet(psGTIF, ProjLinearUnitsGeoKey, TYPE_SHORT, 1, + nUOMLengthCode ); + if( nUOMLengthCode == KvUserDefined ) + GTIFKeySet( psGTIF, ProjLinearUnitSizeGeoKey, TYPE_DOUBLE, 1, + dfLinearUOM); + + /* if linear units name is available and user defined, store it as citation */ + if(!peStrStored && nUOMLengthCode == KvUserDefined && pszLinearUOMName && strlen(pszLinearUOMName)>0) + SetLinearUnitCitation(psGTIF, pszLinearUOMName); + } + +/* -------------------------------------------------------------------- */ +/* Write angular units. Always Degrees for now. */ +/* Changed to support different angular units */ +/* -------------------------------------------------------------------- */ + + char* angUnitName = NULL; + double angUnitValue = poSRS->GetAngularUnits(&angUnitName); + if(EQUAL(angUnitName, "Degree")) + GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1, + Angular_Degree ); + else if(angUnitName) + { + GTIFKeySet(psGTIF, GeogCitationGeoKey, TYPE_ASCII, 0, + angUnitName ); // it may be rewritten if the gcs is userdefined + GTIFKeySet(psGTIF, GeogAngularUnitSizeGeoKey, TYPE_DOUBLE, 1, + angUnitValue ); + } + +/* -------------------------------------------------------------------- */ +/* Try to write a citation from the main coordinate system */ +/* name. */ +/* -------------------------------------------------------------------- */ + if( poSRS->GetRoot() != NULL + && poSRS->GetRoot()->GetChild(0) != NULL + && (poSRS->IsProjected() || poSRS->IsLocal()) ) + { + GTIFKeySet( psGTIF, GTCitationGeoKey, TYPE_ASCII, 0, + poSRS->GetRoot()->GetChild(0)->GetValue() ); + } + +/* -------------------------------------------------------------------- */ +/* Try to write a GCS citation. */ +/* -------------------------------------------------------------------- */ + OGR_SRSNode *poGCS = poSRS->GetAttrNode( "GEOGCS" ); + + if( poGCS != NULL && poGCS->GetChild(0) != NULL ) + { + GTIFKeySet( psGTIF, GeogCitationGeoKey, TYPE_ASCII, 0, + poGCS->GetChild(0)->GetValue() ); + } + +/* -------------------------------------------------------------------- */ +/* Try to identify the GCS/datum, scanning the EPSG datum file for */ +/* a match. */ +/* -------------------------------------------------------------------- */ + if( nPCS == KvUserDefined ) + { + if( nGCS == KvUserDefined ) + { + if( nDatum == Datum_North_American_Datum_1927 ) + nGCS = GCS_NAD27; + else if( nDatum == Datum_North_American_Datum_1983 ) + nGCS = GCS_NAD83; + else if( nDatum == Datum_WGS84 || nDatum == DatumE_WGS84 ) + nGCS = GCS_WGS_84; + } + + if( nGCS != KvUserDefined ) + { + GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, + 1, nGCS ); + } + else if( nDatum != KvUserDefined ) + { + GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet( psGTIF, GeogGeodeticDatumGeoKey, TYPE_SHORT, + 1, nDatum ); + } + else if( nSpheroid != KvUserDefined ) + { + GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet( psGTIF, GeogGeodeticDatumGeoKey, TYPE_SHORT, + 1, KvUserDefined ); + GTIFKeySet( psGTIF, GeogEllipsoidGeoKey, TYPE_SHORT, 1, + nSpheroid ); + } + else if( dfSemiMajor != 0.0 ) + { + GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet( psGTIF, GeogGeodeticDatumGeoKey, TYPE_SHORT, + 1, KvUserDefined ); + GTIFKeySet( psGTIF, GeogEllipsoidGeoKey, TYPE_SHORT, 1, + KvUserDefined ); + GTIFKeySet( psGTIF, GeogSemiMajorAxisGeoKey, TYPE_DOUBLE, 1, + dfSemiMajor ); + if( dfInvFlattening == 0.0 ) + GTIFKeySet( psGTIF, GeogSemiMinorAxisGeoKey, TYPE_DOUBLE, 1, + dfSemiMajor ); + else + GTIFKeySet( psGTIF, GeogInvFlatteningGeoKey, TYPE_DOUBLE, 1, + dfInvFlattening ); + } + else if( poSRS->GetAttrValue("DATUM") != NULL + && strstr(poSRS->GetAttrValue("DATUM"),"unknown") == NULL + && strstr(poSRS->GetAttrValue("DATUM"),"unnamed") == NULL ) + + { + CPLError( CE_Warning, CPLE_AppDefined, + "Couldn't translate `%s' to a GeoTIFF datum.\n", + poSRS->GetAttrValue("DATUM") ); + } + + /* Always set InvFlattening if it is avaliable. */ + /* So that it doesn'tneed to calculate from SemiMinor */ + if( dfInvFlattening != 0.0 ) + GTIFKeySet( psGTIF, GeogInvFlatteningGeoKey, TYPE_DOUBLE, 1, + dfInvFlattening ); + /* Always set SemiMajor to keep the precision and in case of editing */ + if( dfSemiMajor != 0.0 ) + GTIFKeySet( psGTIF, GeogSemiMajorAxisGeoKey, TYPE_DOUBLE, 1, + dfSemiMajor ); + + if( nGCS == KvUserDefined ) + SetGeogCSCitation(psGTIF, poSRS, angUnitName, nDatum, nSpheroid); + } + +/* -------------------------------------------------------------------- */ +/* Cleanup */ +/* -------------------------------------------------------------------- */ + delete poSRS; + return TRUE; +} + +/************************************************************************/ +/* GTIFWktFromMemBuf() */ +/************************************************************************/ + +CPLErr GTIFWktFromMemBuf( int nSize, unsigned char *pabyBuffer, + char **ppszWKT, double *padfGeoTransform, + int *pnGCPCount, GDAL_GCP **ppasGCPList ) + +{ + TIFF *hTIFF; + GTIF *hGTIF; + GTIFDefn sGTIFDefn; + char szFilename[100]; + + sprintf( szFilename, "/vsimem/wkt_from_mem_buf_%ld.tif", + (long) CPLGetPID() ); + +/* -------------------------------------------------------------------- */ +/* Create a memory file from the buffer. */ +/* -------------------------------------------------------------------- */ + FILE *fp = VSIFileFromMemBuffer( szFilename, pabyBuffer, nSize, FALSE ); + if( fp == NULL ) + return CE_Failure; + VSIFCloseL( fp ); + +/* -------------------------------------------------------------------- */ +/* Initialize access to the memory geotiff structure. */ +/* -------------------------------------------------------------------- */ + hTIFF = VSI_TIFFOpen( szFilename, "r" ); + + if( hTIFF == NULL ) + { + CPLError( CE_Failure, CPLE_AppDefined, + "TIFF/GeoTIFF structure is corrupt." ); + return CE_Failure; + } + +/* -------------------------------------------------------------------- */ +/* Get the projection definition. */ +/* -------------------------------------------------------------------- */ + hGTIF = GTIFNew(hTIFF); + + if( hGTIF != NULL && GTIFGetDefn( hGTIF, &sGTIFDefn ) ) + *ppszWKT = GTIFGetOGISDefn( hGTIF, &sGTIFDefn ); + else + *ppszWKT = NULL; + + if( hGTIF ) + GTIFFree( hGTIF ); + +/* -------------------------------------------------------------------- */ +/* Get geotransform or tiepoints. */ +/* -------------------------------------------------------------------- */ + double *padfTiePoints, *padfScale, *padfMatrix; + int16 nCount; + + padfGeoTransform[0] = 0.0; + padfGeoTransform[1] = 1.0; + padfGeoTransform[2] = 0.0; + padfGeoTransform[3] = 0.0; + padfGeoTransform[4] = 0.0; + padfGeoTransform[5] = 1.0; + + *pnGCPCount = 0; + *ppasGCPList = NULL; + + if( TIFFGetField(hTIFF,TIFFTAG_GEOPIXELSCALE,&nCount,&padfScale ) + && nCount >= 2 ) + { + padfGeoTransform[1] = padfScale[0]; + padfGeoTransform[5] = - ABS(padfScale[1]); + + if( TIFFGetField(hTIFF,TIFFTAG_GEOTIEPOINTS,&nCount,&padfTiePoints ) + && nCount >= 6 ) + { + padfGeoTransform[0] = + padfTiePoints[3] - padfTiePoints[0] * padfGeoTransform[1]; + padfGeoTransform[3] = + padfTiePoints[4] - padfTiePoints[1] * padfGeoTransform[5]; + } + } + + else if( TIFFGetField(hTIFF,TIFFTAG_GEOTIEPOINTS,&nCount,&padfTiePoints ) + && nCount >= 6 ) + { + *pnGCPCount = nCount / 6; + *ppasGCPList = (GDAL_GCP *) CPLCalloc(sizeof(GDAL_GCP),*pnGCPCount); + + for( int iGCP = 0; iGCP < *pnGCPCount; iGCP++ ) + { + char szID[32]; + GDAL_GCP *psGCP = *ppasGCPList + iGCP; + + sprintf( szID, "%d", iGCP+1 ); + psGCP->pszId = CPLStrdup( szID ); + psGCP->pszInfo = CPLStrdup(""); + psGCP->dfGCPPixel = padfTiePoints[iGCP*6+0]; + psGCP->dfGCPLine = padfTiePoints[iGCP*6+1]; + psGCP->dfGCPX = padfTiePoints[iGCP*6+3]; + psGCP->dfGCPY = padfTiePoints[iGCP*6+4]; + psGCP->dfGCPZ = padfTiePoints[iGCP*6+5]; + } + } + + else if( TIFFGetField(hTIFF,TIFFTAG_GEOTRANSMATRIX,&nCount,&padfMatrix ) + && nCount == 16 ) + { + padfGeoTransform[0] = padfMatrix[3]; + padfGeoTransform[1] = padfMatrix[0]; + padfGeoTransform[2] = padfMatrix[1]; + padfGeoTransform[3] = padfMatrix[7]; + padfGeoTransform[4] = padfMatrix[4]; + padfGeoTransform[5] = padfMatrix[5]; + } + +/* -------------------------------------------------------------------- */ +/* Cleanup. */ +/* -------------------------------------------------------------------- */ + XTIFFClose( hTIFF ); + + VSIUnlink( szFilename ); + + if( *ppszWKT == NULL ) + return CE_Failure; + else + return CE_None; +} + +/************************************************************************/ +/* GTIFMemBufFromWkt() */ +/************************************************************************/ + +CPLErr GTIFMemBufFromWkt( const char *pszWKT, const double *padfGeoTransform, + int nGCPCount, const GDAL_GCP *pasGCPList, + int *pnSize, unsigned char **ppabyBuffer ) + +{ + TIFF *hTIFF; + GTIF *hGTIF; + char szFilename[100]; + + sprintf( szFilename, "/vsimem/wkt_from_mem_buf_%ld.tif", + (long) CPLGetPID() ); + +/* -------------------------------------------------------------------- */ +/* Initialize access to the memory geotiff structure. */ +/* -------------------------------------------------------------------- */ + hTIFF = VSI_TIFFOpen( szFilename, "w" ); + + if( hTIFF == NULL ) + { + CPLError( CE_Failure, CPLE_AppDefined, + "TIFF/GeoTIFF structure is corrupt." ); + return CE_Failure; + } + +/* -------------------------------------------------------------------- */ +/* Write some minimal set of image parameters. */ +/* -------------------------------------------------------------------- */ + TIFFSetField( hTIFF, TIFFTAG_IMAGEWIDTH, 1 ); + TIFFSetField( hTIFF, TIFFTAG_IMAGELENGTH, 1 ); + TIFFSetField( hTIFF, TIFFTAG_BITSPERSAMPLE, 8 ); + TIFFSetField( hTIFF, TIFFTAG_SAMPLESPERPIXEL, 1 ); + TIFFSetField( hTIFF, TIFFTAG_ROWSPERSTRIP, 1 ); + TIFFSetField( hTIFF, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ); + TIFFSetField( hTIFF, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK ); + +/* -------------------------------------------------------------------- */ +/* Get the projection definition. */ +/* -------------------------------------------------------------------- */ + + if( pszWKT != NULL ) + { + hGTIF = GTIFNew(hTIFF); + GTIFSetFromOGISDefn( hGTIF, pszWKT ); + GTIFWriteKeys( hGTIF ); + GTIFFree( hGTIF ); + } + +/* -------------------------------------------------------------------- */ +/* Set the geotransform, or GCPs. */ +/* -------------------------------------------------------------------- */ + if( padfGeoTransform[0] != 0.0 || padfGeoTransform[1] != 1.0 + || padfGeoTransform[2] != 0.0 || padfGeoTransform[3] != 0.0 + || padfGeoTransform[4] != 0.0 || ABS(padfGeoTransform[5]) != 1.0 ) + { + + if( padfGeoTransform[2] == 0.0 && padfGeoTransform[4] == 0.0 ) + { + double adfPixelScale[3], adfTiePoints[6]; + + adfPixelScale[0] = padfGeoTransform[1]; + adfPixelScale[1] = fabs(padfGeoTransform[5]); + adfPixelScale[2] = 0.0; + + TIFFSetField( hTIFF, TIFFTAG_GEOPIXELSCALE, 3, adfPixelScale ); + + adfTiePoints[0] = 0.0; + adfTiePoints[1] = 0.0; + adfTiePoints[2] = 0.0; + adfTiePoints[3] = padfGeoTransform[0]; + adfTiePoints[4] = padfGeoTransform[3]; + adfTiePoints[5] = 0.0; + + TIFFSetField( hTIFF, TIFFTAG_GEOTIEPOINTS, 6, adfTiePoints ); + } + else + { + double adfMatrix[16]; + + memset(adfMatrix,0,sizeof(double) * 16); + + adfMatrix[0] = padfGeoTransform[1]; + adfMatrix[1] = padfGeoTransform[2]; + adfMatrix[3] = padfGeoTransform[0]; + adfMatrix[4] = padfGeoTransform[4]; + adfMatrix[5] = padfGeoTransform[5]; + adfMatrix[7] = padfGeoTransform[3]; + adfMatrix[15] = 1.0; + + TIFFSetField( hTIFF, TIFFTAG_GEOTRANSMATRIX, 16, adfMatrix ); + } + } + +/* -------------------------------------------------------------------- */ +/* Otherwise write tiepoints if they are available. */ +/* -------------------------------------------------------------------- */ + else if( nGCPCount > 0 ) + { + double *padfTiePoints; + + padfTiePoints = (double *) CPLMalloc(6*sizeof(double)*nGCPCount); + + for( int iGCP = 0; iGCP < nGCPCount; iGCP++ ) + { + + padfTiePoints[iGCP*6+0] = pasGCPList[iGCP].dfGCPPixel; + padfTiePoints[iGCP*6+1] = pasGCPList[iGCP].dfGCPLine; + padfTiePoints[iGCP*6+2] = 0; + padfTiePoints[iGCP*6+3] = pasGCPList[iGCP].dfGCPX; + padfTiePoints[iGCP*6+4] = pasGCPList[iGCP].dfGCPY; + padfTiePoints[iGCP*6+5] = pasGCPList[iGCP].dfGCPZ; + } + + TIFFSetField( hTIFF, TIFFTAG_GEOTIEPOINTS, 6*nGCPCount, padfTiePoints); + CPLFree( padfTiePoints ); + } + +/* -------------------------------------------------------------------- */ +/* Cleanup and return the created memory buffer. */ +/* -------------------------------------------------------------------- */ + GByte bySmallImage = 0; + + TIFFWriteEncodedStrip( hTIFF, 0, (char *) &bySmallImage, 1 ); + TIFFWriteCheck( hTIFF, TIFFIsTiled(hTIFF), "GTIFMemBufFromWkt"); + TIFFWriteDirectory( hTIFF ); + + XTIFFClose( hTIFF ); + +/* -------------------------------------------------------------------- */ +/* Read back from the memory buffer. It would be preferrable */ +/* to be able to "steal" the memory buffer, but there isn't */ +/* currently any support for this. */ +/* -------------------------------------------------------------------- */ + GUIntBig nBigLength; + + *ppabyBuffer = VSIGetMemFileBuffer( szFilename, &nBigLength, TRUE ); + *pnSize = (int) nBigLength; + + return CE_None; +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/las_c_api.cpp work/libLAS-1.2.1/src/las_c_api.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/las_c_api.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/las_c_api.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1841 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: C API for libLAS + * Author: Howard Butler, hobu.inc@gmail.com, but I'm not proud of it. + * I also swiped a lot of it from GDAL. + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +typedef struct LASWriterHS *LASWriterH; +typedef struct LASReaderHS *LASReaderH; +typedef struct LASPointHS *LASPointH; +typedef struct LASHeaderHS *LASHeaderH; +typedef struct LASGuidHS *LASGuidH; +typedef struct LASVLRHS *LASVLRH; +typedef struct LASColorHS *LASColorH; +typedef struct LASSRSHS *LASSRSH; + + +#include +#include +#include +#include +#include // std::stringstream +#include +#include +#include +#include +#include + +using namespace liblas; + +LAS_C_START + +#ifndef _WIN32 +#include +#endif + +#ifdef _WIN32 +#define compare_no_case(a,b,n) _strnicmp( (a), (b), (n) ) +#else +#define compare_no_case(a,b,n) strncasecmp( (a), (b), (n) ) +#endif + +// Error stuff + + +typedef enum +{ + LE_None = 0, + LE_Debug = 1, + LE_Warning = 2, + LE_Failure = 3, + LE_Fatal = 4 +} LASErrorEnum; + + +static std::stack errors; + +#ifdef _MSC_VER +# pragma warning(disable: 4127) // warning C4127: conditional expression is constant +#endif + +#define VALIDATE_LAS_POINTER0(ptr, func) \ + do { if( NULL == ptr ) { \ + LASErrorEnum const ret = LE_Failure; \ + std::ostringstream msg; \ + msg << "Pointer \'" << #ptr << "\' is NULL in \'" << (func) <<"\'."; \ + std::string message(msg.str()); \ + LASError_PushError( ret, message.c_str(), (func)); \ + return; \ + }} while(0) + +#define VALIDATE_LAS_POINTER1(ptr, func, rc) \ + do { if( NULL == ptr ) { \ + LASErrorEnum const ret = LE_Failure; \ + std::ostringstream msg; \ + msg << "Pointer \'" << #ptr << "\' is NULL in \'" << (func) <<"\'."; \ + std::string message(msg.str()); \ + LASError_PushError( ret, message.c_str(), (func)); \ + return (rc); \ + }} while(0) + +LAS_DLL int LAS_IsGDALEnabled(void) { + return IsGDALEnabled(); +} + +LAS_DLL int LAS_IsLibGeoTIFFEnabled(void) { + return IsLibGeoTIFFEnabled(); +} + +LAS_DLL void LASError_Reset(void) { + if (errors.empty()) return; + for (std::size_t i=0;i(errors.size()); +} + +LAS_DLL LASReaderH LASReader_Create(const char* filename) + +{ + VALIDATE_LAS_POINTER1(filename, "LASReader_Create", NULL); + + try { + std::ios::openmode const mode = std::ios::in | std::ios::binary; + std::istream* istrm; + if (compare_no_case(filename,"STDIN",5) == 0) + { + istrm = &std::cin; + } + else + { + istrm = new std::ifstream(filename, mode); + } + + if (!istrm->good()) + { + delete istrm; + throw std::runtime_error("Reading stream was not able to be created"); + } + return (LASReaderH) new LASReader(*istrm); + + + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASReader_Create"); + return NULL; + } + + +} + +LAS_DLL void LASReader_Destroy(LASReaderH hReader) +{ + VALIDATE_LAS_POINTER0(hReader, "LASReader_Destroy"); + + try { + LASReader* reader = (LASReader*)hReader; + std::istream* istrm = &(reader->GetStream()); + + delete reader; + hReader = NULL; + + if (static_cast(*istrm)) + static_cast(*istrm).close(); + delete istrm; + istrm = NULL; + + } catch (std::runtime_error const& e/* e */) + { + LASError_PushError(LE_Failure, e.what(), "LASReader_Destroy"); + return; + } + + + hReader = NULL; +} + + + +LAS_DLL const LASPointH LASReader_GetNextPoint(const LASReaderH hReader) +{ + VALIDATE_LAS_POINTER1(hReader, "LASReader_GetNextPoint", NULL); + + try { + LASReader *reader = ((LASReader*) hReader); + if (reader->ReadNextPoint()) + // return (LASPointH) new LASPoint(reader->GetPoint()); + return (LASPointH) &(reader->GetPoint()); + else + return NULL; + } catch (invalid_point_data const& e /*e */) { + LASError_PushError(LE_Failure, e.what(), "LASReader_GetNextPoint Invalid Point"); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASReader_GetNextPoint"); + } + + return NULL; +} + +LAS_DLL const LASPointH LASReader_GetPointAt(const LASReaderH hReader, liblas::uint32_t position) +{ + VALIDATE_LAS_POINTER1(hReader, "LASReader_GetPointAt", NULL); + + try { + LASReader *reader = ((LASReader*) hReader); + if (reader->ReadPointAt((std::size_t) position)) + // return (LASPointH) new LASPoint(reader->GetPoint()); + return (LASPointH) &(reader->GetPoint()); + else + return NULL; + } catch (invalid_point_data const& e /*e */) { + LASError_PushError(LE_Failure, e.what(), "LASReader_GetPointAt Invalid Point"); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASReader_GetPointAt"); + } + + return NULL; + +} +LAS_DLL LASHeaderH LASReader_GetHeader(const LASReaderH hReader) +{ + VALIDATE_LAS_POINTER1(hReader, "LASReader_GetHeader", NULL); + + LASHeader header = ((LASReader*) hReader)->GetHeader(); + return (LASHeaderH) new LASHeader( header ); +} + +LAS_DLL LASErrorEnum LASReader_SetSRS(LASHeaderH hReader, const LASSRSH hSRS) { + + VALIDATE_LAS_POINTER1(hReader, "LASReader_SetSRS", LE_Failure); + VALIDATE_LAS_POINTER1(hSRS, "LASReader_SetSRS", LE_Failure); + + try { + ((LASReader*) hReader)->SetSRS(*((LASSpatialReference*)hSRS)); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASReader_SetSRS"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL LASHeaderH LASHeader_Create(void) { + return (LASHeaderH) new LASHeader(); +} + +LAS_DLL LASPointH LASPoint_Create(void) { + return (LASPointH) new LASPoint(); +} + +LAS_DLL LASPointH LASPoint_Copy(const LASPointH hPoint) { + return (LASPointH) new LASPoint(*((LASPoint*) hPoint)); +} + +LAS_DLL void LASPoint_Destroy(LASPointH hPoint) { + VALIDATE_LAS_POINTER0(hPoint, "LASPoint_Destroy"); + delete (LASPoint*) hPoint; + hPoint = NULL; +} + +LAS_DLL double LASPoint_GetX(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetX", 0.0); + + double value = ((LASPoint*) hPoint)->GetX(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetX(LASPointH hPoint, double value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetX", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetX(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetX"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL double LASPoint_GetY(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetY", 0.0); + + double value = ((LASPoint*) hPoint)->GetY(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetY(LASPointH hPoint, double value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetY", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetY(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetY"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL double LASPoint_GetZ(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetZ", 0.0); + + double value = ((LASPoint*) hPoint)->GetZ(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetZ(LASPointH hPoint, double value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetZ", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetZ(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetZ"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint16_t LASPoint_GetIntensity(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetIntensity", 0); + + liblas::uint16_t value = ((LASPoint*) hPoint)->GetIntensity(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetIntensity(LASPointH hPoint, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetIntensity", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetIntensity(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetIntensity"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint16_t LASPoint_GetReturnNumber(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetReturnNumber", 0); + + liblas::uint16_t value = ((LASPoint*) hPoint)->GetReturnNumber(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetReturnNumber(LASPointH hPoint, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetReturnNumber", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetReturnNumber(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetReturnNumber"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint16_t LASPoint_GetNumberOfReturns(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetNumberOfReturns", 0); + + liblas::uint16_t value = ((LASPoint*) hPoint)->GetNumberOfReturns(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetNumberOfReturns(LASPointH hPoint, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetNumberOfReturns", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetNumberOfReturns(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetNumberOfReturns"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint16_t LASPoint_GetScanDirection(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetScanDirection", 0); + + liblas::uint16_t value = ((LASPoint*) hPoint)->GetScanDirection(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetScanDirection(LASPointH hPoint, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetScanDirection", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetScanDirection(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetScanDirection"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint16_t LASPoint_GetFlightLineEdge(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetFlightLineEdge", 0); + + liblas::uint16_t value = ((LASPoint*) hPoint)->GetFlightLineEdge(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetFlightLineEdge(LASPointH hPoint, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetFlightLineEdge", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetFlightLineEdge(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetFlightLineEdge"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint8_t LASPoint_GetScanFlags(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetScanFlags", 0); + + liblas::uint8_t value = ((LASPoint*) hPoint)->GetScanFlags(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetScanFlags(LASPointH hPoint, liblas::uint8_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetScanFlags", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetScanFlags(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetScanFlags"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint8_t LASPoint_GetClassification(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetClassification", 0); + + liblas::uint8_t value = ((LASPoint*) hPoint)->GetClassification(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetClassification(LASPointH hPoint, liblas::uint8_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetClassification", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetClassification(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetClassification"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL LASErrorEnum LASPoint_SetTime(LASPointH hPoint, double value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetTime", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetTime(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetTime"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL double LASPoint_GetTime(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetTime", 0.0); + + double value = ((LASPoint*) hPoint)->GetTime(); + return value; +} + +LAS_DLL liblas::int8_t LASPoint_GetScanAngleRank(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetScanAngleRank", 0); + + liblas::int8_t value = ((LASPoint*) hPoint)->GetScanAngleRank(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetScanAngleRank(LASPointH hPoint, liblas::int8_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetScanAngleRank", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetScanAngleRank(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetScanAngleRank"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL liblas::uint16_t LASPoint_GetPointSourceId(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetPointSourceId", 0); + + liblas::uint16_t value = ((LASPoint*) hPoint)->GetPointSourceID(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetPointSourceId(LASPointH hPoint, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetPointSourceId", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetPointSourceID(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetPointSourceId"); + return LE_Failure; + } + + return LE_None; + +} + + +LAS_DLL liblas::uint8_t LASPoint_GetUserData(const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetUserData", 0); + + liblas::uint8_t value = ((LASPoint*) hPoint)->GetUserData(); + return value; +} + +LAS_DLL LASErrorEnum LASPoint_SetUserData(LASPointH hPoint, liblas::uint8_t value) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetUserData", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetUserData(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetUserData"); + return LE_Failure; + } + + return LE_None; + +} + +LAS_DLL int LASPoint_Equal(const LASPointH hPoint1, const LASPointH hPoint2) { + VALIDATE_LAS_POINTER1(hPoint1, "LASPoint_Equal", 0); + VALIDATE_LAS_POINTER1(hPoint2, "LASPoint_Equal", 0); + + LASPoint* point1 = ((LASPoint*) hPoint1); + LASPoint* point2 = ((LASPoint*) hPoint2); + + return (point1 == point2); + +} + +LAS_DLL int LASPoint_Validate(LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_Validate", LE_Failure); + + try { + ((LASPoint*) hPoint)->Validate(); + } catch (invalid_point_data const& e /*e */) { + return e.who(); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASPoint_Validate"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL int LASPoint_IsValid(LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_IsValid", LE_Failure); + return ((LASPoint*) hPoint)->IsValid(); +} + +LAS_DLL char* LASHeader_GetFileSignature(const LASHeaderH hHeader) { + // caller owns it + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetFileSignature", NULL); + + std::string signature = ((LASHeader*) hHeader)->GetFileSignature(); + return strdup(signature.c_str()); +} + +LAS_DLL liblas::uint16_t LASHeader_GetFileSourceId(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetFileSourceId", 0); + + unsigned short value = ((LASHeader*) hHeader)->GetFileSourceId(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetFileSourceId(LASHeaderH hHeader, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetFileSourceId", LE_Failure); + ((LASHeader*) hHeader)->SetFileSourceId(value); + return LE_None; +} + + +LAS_DLL liblas::uint16_t LASHeader_GetReserved(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetReserved", 0); + + unsigned short value = ((LASHeader*) hHeader)->GetReserved(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetReserved(LASHeaderH hHeader, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetReserved", LE_Failure); + ((LASHeader*) hHeader)->SetReserved(value); + return LE_None; +} + +LAS_DLL char* LASHeader_GetProjectId(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetProjectId", 0); + + liblas::guid id = ((LASHeader*) hHeader)->GetProjectId(); + return strdup(id.to_string().c_str()); +} + +LAS_DLL LASErrorEnum LASHeader_SetProjectId(LASHeaderH hHeader, const char* value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetProjectId", LE_Failure); + + try { + liblas::guid id; + id = liblas::guid::guid(value); + ((LASHeader*) hHeader)->SetProjectId(id); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetGUID"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint8_t LASHeader_GetVersionMajor(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetVersionMajor", 0); + + long value = ((LASHeader*) hHeader)->GetVersionMajor(); + return liblas::uint8_t(value); +} + +LAS_DLL LASErrorEnum LASHeader_SetVersionMajor(LASHeaderH hHeader, liblas::uint8_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetVersionMajor", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetVersionMajor(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetVersionMajor"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint8_t LASHeader_GetVersionMinor(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetVersionMinor", 0); + + long value = ((LASHeader*) hHeader)->GetVersionMinor(); + return liblas::uint8_t(value); +} + +LAS_DLL LASErrorEnum LASHeader_SetVersionMinor(LASHeaderH hHeader, liblas::uint8_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetVersionMinor", LE_Failure); + + // TODO: Maybe this should be a fatal error -- hobu + try { + ((LASHeader*) hHeader)->SetVersionMinor(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetVersionMinor"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL char* LASHeader_GetSystemId(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetSystemId", NULL); + + // caller owns it + std::string sysid = ((LASHeader*) hHeader)->GetSystemId(); + return strdup(sysid.c_str()); +} + +LAS_DLL LASErrorEnum LASHeader_SetSystemId(LASHeaderH hHeader, const char* value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetSystemId", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetSystemId(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetSystemId"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL char* LASHeader_GetSoftwareId(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetSoftwareId", NULL); + + // caller owns it + std::string softid = ((LASHeader*) hHeader)->GetSoftwareId(); + return strdup(softid.c_str()); +} + +LAS_DLL LASErrorEnum LASHeader_SetSoftwareId(LASHeaderH hHeader, const char* value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetSoftwareId", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetSoftwareId(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetSoftwareId"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint16_t LASHeader_GetCreationDOY(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetCreationDOY", 0); + + unsigned short value = ((LASHeader*) hHeader)->GetCreationDOY(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetCreationDOY(LASHeaderH hHeader, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetCreationDOY", LE_Failure); + ((LASHeader*) hHeader)->SetCreationDOY(value); + return LE_None; +} + +LAS_DLL liblas::uint16_t LASHeader_GetCreationYear(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetCreationYear", 0); + + unsigned short value = ((LASHeader*) hHeader)->GetCreationYear(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetCreationYear(LASHeaderH hHeader, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetCreationYear", LE_Failure); + ((LASHeader*) hHeader)->SetCreationYear(value); + return LE_None; +} + +LAS_DLL liblas::uint16_t LASHeader_GetHeaderSize(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetHeaderSize", 0); + + unsigned short value = ((LASHeader*) hHeader)->GetHeaderSize(); + return value; +} + +LAS_DLL liblas::uint32_t LASHeader_GetDataOffset(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetDataOffset", 0); + + unsigned long value = ((LASHeader*) hHeader)->GetDataOffset(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetDataOffset(const LASHeaderH hHeader, liblas::uint32_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetDataOffset", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetDataOffset(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetDataOffset"); + return LE_Failure; + } + + return LE_None; +} + + +LAS_DLL liblas::uint32_t LASHeader_GetRecordsCount(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetRecordsCount", 0); + + unsigned long value = ((LASHeader*) hHeader)->GetRecordsCount(); + return value; +} + +LAS_DLL liblas::uint8_t LASHeader_GetDataFormatId(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetDataFormatId", 0); + + LASHeader::PointFormat id = ((LASHeader*) hHeader)->GetDataFormatId(); + return static_cast(id); +} + +LAS_DLL LASErrorEnum LASHeader_SetDataFormatId(LASHeaderH hHeader, liblas::uint8_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetDataFormatId", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetDataFormatId((liblas::LASHeader::PointFormat)value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetDataFormatId"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint16_t LASHeader_GetDataRecordLength(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetDataRecordLength", 0); + + unsigned short value = ((LASHeader*) hHeader)->GetDataRecordLength(); + return value; +} + + +LAS_DLL liblas::uint32_t LASHeader_GetPointRecordsByReturnCount(const LASHeaderH hHeader, int index) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetPointRecordsByReturnCount", 0); + + std::vector counts = ((LASHeader*) hHeader)->GetPointRecordsByReturnCount(); + if ( (index < 5) && (index >= 0)) { + return counts[index]; + } + + return 0; + +} + +LAS_DLL LASErrorEnum LASHeader_SetPointRecordsByReturnCount(const LASHeaderH hHeader, int index, liblas::uint32_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetPointRecordsByReturnCount", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetPointRecordsByReturnCount(index, value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetPointRecordsByReturnCount"); + return LE_Failure; + } + + return LE_None; +} + + +LAS_DLL liblas::uint32_t LASHeader_GetPointRecordsCount(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetPointRecordsCount", 0); + + unsigned long value = ((LASHeader*) hHeader)->GetPointRecordsCount(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetPointRecordsCount(const LASHeaderH hHeader, liblas::uint32_t value) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetPointRecordsCount", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetPointRecordsCount(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetPointRecordsCount"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL double LASHeader_GetScaleX(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetScaleX", 0.0); + + double value = ((LASHeader*) hHeader)->GetScaleX(); + return value; +} + +LAS_DLL double LASHeader_GetScaleY(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetScaleY", 0.0); + + double value = ((LASHeader*) hHeader)->GetScaleY(); + return value; +} + +LAS_DLL double LASHeader_GetScaleZ(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetScaleZ", 0.0); + + double value = ((LASHeader*) hHeader)->GetScaleZ(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetScale(LASHeaderH hHeader, double x, double y, double z) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetScale", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetScale(x,y,z); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetScale"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL double LASHeader_GetOffsetX(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetOffsetX", 0.0); + + double value = ((LASHeader*) hHeader)->GetOffsetX(); + return value; +} + +LAS_DLL double LASHeader_GetOffsetY(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetOffsetY", 0.0); + + double value = ((LASHeader*) hHeader)->GetOffsetY(); + return value; +} + +LAS_DLL double LASHeader_GetOffsetZ(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetOffsetZ", 0.0); + + double value = ((LASHeader*) hHeader)->GetOffsetZ(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetOffset(LASHeaderH hHeader, double x, double y, double z) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetOffset", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetOffset(x,y,z); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetOffset"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL double LASHeader_GetMinX(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMinX", 0.0); + + double value = ((LASHeader*) hHeader)->GetMinX(); + return value; +} + +LAS_DLL double LASHeader_GetMinY(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMinY", 0.0); + + double value = ((LASHeader*) hHeader)->GetMinY(); + return value; +} + +LAS_DLL double LASHeader_GetMinZ(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMinZ", 0.0); + + double value = ((LASHeader*) hHeader)->GetMinZ(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetMin(LASHeaderH hHeader, double x, double y, double z) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetMin", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetMin(x,y,z); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetMin"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL double LASHeader_GetMaxX(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMaxX", 0.0); + + double value = ((LASHeader*) hHeader)->GetMaxX(); + return value; +} + +LAS_DLL double LASHeader_GetMaxY(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMaxY", 0.0); + + double value = ((LASHeader*) hHeader)->GetMaxY(); + return value; +} + +LAS_DLL double LASHeader_GetMaxZ(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMaxZ", 0.0); + + double value = ((LASHeader*) hHeader)->GetMaxZ(); + return value; +} + +LAS_DLL LASErrorEnum LASHeader_SetMax(LASHeaderH hHeader, double x, double y, double z) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetMax", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetMax(x,y,z); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetMax"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL void LASHeader_Destroy(LASHeaderH hHeader) +{ + VALIDATE_LAS_POINTER0(hHeader, "LASHeader_Destroy"); + delete ((LASHeader*) hHeader); + hHeader=NULL; +} + +LAS_DLL LASHeaderH LASHeader_Copy(const LASHeaderH hHeader) { + return (LASHeaderH) new LASHeader(*((LASHeader*) hHeader)); +} + +LAS_DLL int LASHeader_Equal(const LASHeaderH hHeader1, const LASHeaderH hHeader2) { + VALIDATE_LAS_POINTER1(hHeader1, "LASHeader_Equal", 0); + VALIDATE_LAS_POINTER1(hHeader2, "LASHeader_Equal", 0); + + LASHeader* header1 = ((LASHeader*) hHeader1); + LASHeader* header2 = ((LASHeader*) hHeader2); + + return (header1 == header2); +} + +LAS_DLL LASGuidH LASHeader_GetGUID(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetGUID", 0); + + liblas::guid id = ((LASHeader*) hHeader)->GetProjectId(); + return (LASGuidH) new liblas::guid(id); +} + + +LAS_DLL LASErrorEnum LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetGUID", LE_Failure); + + try { + liblas::guid* id = (liblas::guid*) hId; + + ((LASHeader*) hHeader)->SetProjectId(*id); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetGUID"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, liblas::uint32_t i) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetVLR", 0); + + LASVariableRecord vlr = ((LASHeader*) hHeader)->GetVLR(i); + return (LASVLRH) new LASVariableRecord(vlr); +} + +LAS_DLL LASErrorEnum LASHeader_DeleteVLR(LASHeaderH hHeader, liblas::uint32_t index) { + + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_DeleteVLR", LE_Failure); + + try { + ((LASHeader*) hHeader)->DeleteVLR(index); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASHeader_DeleteVLR"); + return LE_Failure; + } + + + return LE_None; +} + +LAS_DLL LASErrorEnum LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR) { + + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_AddVLR", LE_Failure); + VALIDATE_LAS_POINTER1(hVLR, "LASHeader_AddVLR", LE_Failure); + + try { + ((LASHeader*) hHeader)->AddVLR(*((LASVariableRecord*)hVLR)); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASHeader_AddVLR"); + return LE_Failure; + } + + + return LE_None; +} + + + + +LAS_DLL LASWriterH LASWriter_Create(const char* filename, const LASHeaderH hHeader, int mode) { + VALIDATE_LAS_POINTER1(hHeader, "LASWriter_Create", NULL); + + if (filename == NULL) { + LASError_PushError(LE_Failure, "Input filename was null", "LASWriter_Create"); + return NULL; + } + try { + std::ios::openmode m; + if ( (mode > 2) || (mode < 1)) { + throw std::runtime_error("File mode must be eWrite or eAppend"); + } + + std::ostream* ostrm; + + // append mode + if (mode == 2) { + m = std::ios::out | std::ios::in | std::ios::binary | std::ios::ate; + } + // write mode + else { + m = std::ios::out | std::ios::binary | std::ios::ate; + } + + if (compare_no_case(filename,"STOUT",5) == 0) + { + ostrm = &std::cout; + } + else + { + ostrm = new std::ofstream(filename, m); + } + + + if (!ostrm->good()) + { + delete ostrm; + throw std::runtime_error("Writing stream was not able to be created"); + } + + LASHeader* header = ((LASHeader*) hHeader); + LASWriter* writer = new LASWriter(*ostrm, *header); + return (LASWriterH) writer; + + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASWriter_Create"); + return NULL; + } + +} + +LAS_DLL LASErrorEnum LASWriter_WritePoint(const LASWriterH hWriter, const LASPointH hPoint) { + + VALIDATE_LAS_POINTER1(hPoint, "LASWriter_WritePoint", LE_Failure); + int ret; + + try { + ret = ((LASWriter*) hWriter)->WritePoint(*((LASPoint*) hPoint)); + if (!ret) { + LASError_PushError( LE_Warning, + "Failed to write point because it was invalid", + "LASWriter_WritePoint"); + return LE_Warning; + } + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASWriter_WritePoint"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL LASErrorEnum LASWriter_WriteHeader(const LASWriterH hWriter, const LASHeaderH hHeader) { + + VALIDATE_LAS_POINTER1(hHeader, "LASWriter_WriteHeader", LE_Failure); + VALIDATE_LAS_POINTER1(hWriter, "LASWriter_WriteHeader", LE_Failure); + + try { + ((LASWriter*) hWriter)->WriteHeader(*((LASHeader*) hHeader)); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASWriter_WriteHeader"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL void LASWriter_Destroy(LASWriterH hWriter) +{ + VALIDATE_LAS_POINTER0(hWriter, "LASWriter_Destroy"); + + + + + + + try { + LASWriter* writer = (LASWriter*)hWriter; + std::ostream* ostrm = &(writer->GetStream()); + + delete writer; + hWriter = NULL; + + if (static_cast(*ostrm)) + static_cast(*ostrm).close(); + delete ostrm; + ostrm = NULL; + + } catch (std::runtime_error const& e/* e */) + { + LASError_PushError(LE_Failure, e.what(), "LASWriter_Destroy"); + return; + } + +} + +LAS_DLL LASErrorEnum LASWriter_SetSRS(LASWriterH hWriter, const LASSRSH hSRS) { + + VALIDATE_LAS_POINTER1(hWriter, "LASWriter_SetSRS", LE_Failure); + VALIDATE_LAS_POINTER1(hSRS, "LASWriter_SetSRS", LE_Failure); + + try { + ((LASWriter*) hWriter)->SetSRS(*((LASSpatialReference*)hSRS)); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASWriter_SetSRS"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL void LASError_Print(const char* message) { + + char* errmsg= NULL; + char* errmethod = NULL; + errmsg = LASError_GetLastErrorMsg(); + errmethod = LASError_GetLastErrorMethod(); + if (LASError_GetErrorCount()) { + fprintf(stderr, + "%s: %s (%d) from method %s\n", + message, + errmsg, + LASError_GetLastErrorNum(), + errmethod + ); + if (errmsg) free(errmsg); + if (errmethod) free(errmethod); + } else { + fprintf(stderr, + "You have encountered an error. '%s'\n", + message + ); + } + +} + +LAS_DLL char * LAS_GetVersion() { + + /* XXX - mloskot: I'd suggest to define PACKAGE_VERSION as static object + and return safe const pointer, instead of newly allocated string. */ + + /* FIXME - mloskot: Termporarily, I defined PACKAGE_VERSION + in las_config.h to solve Visual C++ compilation (Ticket #23) */ + + std::ostringstream output; + +// output << LIBLAS_VERSION_MAJOR; +// output << "." << LIBLAS_VERSION_MINOR; +// output << "." << LIBLAS_VERSION_REV; +// output << "." << LIBLAS_VERSION_BUILD; + output << LIBLAS_RELEASE_NAME; + std::string out(output.str()); + return strdup(out.c_str()); +} + + + +LAS_DLL LASVLRH LASVLR_Create(void) { + return (LASVLRH) new LASVariableRecord(); +} + +LAS_DLL void LASVLR_Destroy(LASVLRH hVLR){ + VALIDATE_LAS_POINTER0(hVLR, "LASVLR_Destroy"); + delete (LASVariableRecord*)hVLR; + hVLR = NULL; + +} + +LAS_DLL char* LASVLR_GetUserId(const LASVLRH hVLR) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetUserId", 0); + LASVariableRecord* vlr = (LASVariableRecord*)hVLR; + return strdup(vlr->GetUserId(true).c_str()); +} + +LAS_DLL LASErrorEnum LASVLR_SetUserId(LASVLRH hVLR, const char* value) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetUserId", LE_Failure); + + try { + ((LASVariableRecord*) hVLR)->SetUserId(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASVLR_SetUserId"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL char* LASVLR_GetDescription(const LASVLRH hVLR) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetDescription", 0); + LASVariableRecord* vlr = (LASVariableRecord*)hVLR; + return strdup(vlr->GetDescription(true).c_str()); +} + +LAS_DLL LASErrorEnum LASVLR_SetDescription(LASVLRH hVLR, const char* value) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetDescription", LE_Failure); + + try { + ((LASVariableRecord*) hVLR)->SetDescription(value); + } catch (std::exception const& e) + { + LASError_PushError(LE_Failure, e.what(), "LASVLR_SetDescription"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint16_t LASVLR_GetRecordLength(const LASVLRH hVLR) { + + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetRecordLength", 0); + + liblas::uint16_t value = ((LASVariableRecord*) hVLR)->GetRecordLength(); + return value; +} +LAS_DLL LASErrorEnum LASVLR_SetRecordLength(LASVLRH hVLR, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetRecordLength", LE_Failure); + ((LASVariableRecord*) hVLR)->SetRecordLength(value); + return LE_None; +} + +LAS_DLL liblas::uint16_t LASVLR_GetRecordId(const LASVLRH hVLR) { + + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetRecordId", 0); + + liblas::uint16_t value = ((LASVariableRecord*) hVLR)->GetRecordId(); + return value; +} +LAS_DLL LASErrorEnum LASVLR_SetRecordId(LASVLRH hVLR, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetRecordId", LE_Failure); + ((LASVariableRecord*) hVLR)->SetRecordId(value); + return LE_None; +} + + +LAS_DLL LASErrorEnum LASVLR_SetReserved(LASVLRH hVLR, liblas::uint16_t value) { + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetReserved", LE_Failure); + ((LASVariableRecord*) hVLR)->SetReserved(value); + return LE_None; +} + +LAS_DLL liblas::uint16_t LASVLR_GetReserved(const LASVLRH hVLR) { + + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetReserved", 0); + + liblas::uint16_t value = ((LASVariableRecord*) hVLR)->GetReserved(); + return value; +} + +LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t* data) { + + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetData", LE_Failure); + + try { + LASVariableRecord* vlr = ((LASVariableRecord*) hVLR); + std::vector d = vlr->GetData(); + liblas::uint16_t length = vlr->GetRecordLength(); + for (liblas::uint16_t i=0; i < length; i++) { + data[i] = d[i]; + } + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASVLR_GetData"); + return LE_Failure; + } + + + return LE_None; +} + +LAS_DLL LASErrorEnum LASVLR_SetData(const LASVLRH hVLR, liblas::uint8_t* data, liblas::uint16_t length) { + + VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetData", LE_Failure); + + try { + LASVariableRecord* vlr = ((LASVariableRecord*) hVLR); + std::vector d; + d.resize(length); + for (liblas::uint16_t i=0; i < length; i++) { + d[i] = data[i]; + } + vlr->SetData(d); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASVLR_GetData"); + return LE_Failure; + } + + + return LE_None; +} + +LAS_DLL LASGuidH LASGuid_Create() { + liblas::guid random; + try { + random = liblas::guid::create(); + return (LASGuidH) new liblas::guid(random); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASGuid_Create"); + return NULL; + } +} + +LAS_DLL LASGuidH LASGuid_CreateFromString(const char* string) { + VALIDATE_LAS_POINTER1(string, "LASGuid_CreateFromString", NULL); + liblas::guid id; + try { + id = liblas::guid::guid(string); + return (LASGuidH) new liblas::guid(id); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASGuid_CreateFromString"); + return NULL; + } +} + +LAS_DLL void LASGuid_Destroy(LASGuidH hId) { + VALIDATE_LAS_POINTER0(hId, "LASGuid_Destroy"); + delete (liblas::guid*) hId; + hId = NULL; +} + +LAS_DLL int LASGuid_Equals(LASGuidH hId1, LASGuidH hId2) { + VALIDATE_LAS_POINTER1(hId1, "LASGuid_Equals", LE_Failure); + VALIDATE_LAS_POINTER1(hId2, "LASGuid_Equals", LE_Failure); + + liblas::guid* id1 = (liblas::guid*)hId1; + liblas::guid* id2 = (liblas::guid*)hId2; + try { + + return( *id1 == *id2); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASGuid_Equals"); + return LE_Failure; + } +} + +LAS_DLL char* LASGuid_AsString(LASGuidH hId) { + VALIDATE_LAS_POINTER1(hId, "LASGuid_AsString", 0); + liblas::guid* id= (liblas::guid*)hId; + return strdup(id->to_string().c_str()); +} + + + +LAS_DLL LASColorH LASColor_Create(void) { + return (LASColorH) new LASColor(); +} + +LAS_DLL void LASColor_Destroy(LASColorH hColor){ + VALIDATE_LAS_POINTER0(hColor, "LASColor_Destroy"); + delete (LASColor*)hColor; + hColor = NULL; +} + +LAS_DLL LASErrorEnum LASColor_SetRed(LASColorH hColor, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hColor, "LASColor_SetRed", LE_Failure); + + try { + LASColor* color = ((LASColor*) hColor); + color->SetRed(value); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASColor_SetRed"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint16_t LASColor_GetRed(LASColorH hColor) { + + VALIDATE_LAS_POINTER1(hColor, "LASColor_GetRed", 0); + + liblas::uint16_t value = ((LASColor*) hColor)->GetRed(); + return value; +} + +LAS_DLL LASErrorEnum LASColor_SetBlue(LASColorH hColor, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hColor, "LASColor_SetBlue", LE_Failure); + + try { + LASColor* color = ((LASColor*) hColor); + color->SetBlue(value); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASColor_SetBlue"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint16_t LASColor_GetBlue(LASColorH hColor) { + + VALIDATE_LAS_POINTER1(hColor, "LASColor_GetBlue", 0); + + liblas::uint16_t value = ((LASColor*) hColor)->GetBlue(); + return value; +} + +LAS_DLL LASErrorEnum LASColor_SetGreen(LASColorH hColor, liblas::uint16_t value) { + + VALIDATE_LAS_POINTER1(hColor, "LASColor_SetGreen", LE_Failure); + + try { + LASColor* color = ((LASColor*) hColor); + color->SetGreen(value); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASColor_SetGreen"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL liblas::uint16_t LASColor_GetGreen(LASColorH hColor) { + + VALIDATE_LAS_POINTER1(hColor, "LASColor_GetGreen", 0); + + liblas::uint16_t value = ((LASColor*) hColor)->GetGreen(); + return value; +} + +LAS_DLL LASColorH LASPoint_GetColor(const LASPointH hPoint) { + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetColor", 0); + + LASColor color = ((LASPoint*) hPoint)->GetColor(); + return (LASColorH) new LASColor(color); +} + +LAS_DLL LASErrorEnum LASPoint_SetColor(LASPointH hPoint, const LASColorH hColor) { + + VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetColor", LE_Failure); + VALIDATE_LAS_POINTER1(hColor, "LASPoint_SetColor", LE_Failure); + + try { + ((LASPoint*) hPoint)->SetColor(*((LASColor*)hColor)); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASPoint_SetColor"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL LASSRSH LASSRS_Create(void) { + return (LASSRSH) new LASSpatialReference(); +} + +LAS_DLL void LASSRS_Destroy(LASSRSH hSRS){ + VALIDATE_LAS_POINTER0(hSRS, "LASSRS_Destroy"); + delete (LASSpatialReference*)hSRS; + hSRS = NULL; +} + +LAS_DLL const GTIF* LASSRS_GetGTIF(LASSRSH hSRS) { + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetGTIF", 0); + + try { + return ((LASSpatialReference*) hSRS)->GetGTIF(); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASSRS_GetGTIF"); + return 0; + } +} + +LAS_DLL LASErrorEnum LASSRS_SetGTIF(LASSRSH hSRS, const GTIF* gtiff, const ST_TIFF* tiff) +{ + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetGTIF", LE_Failure); + VALIDATE_LAS_POINTER1(gtiff, "LASSRS_SetGTIF", LE_Failure); + VALIDATE_LAS_POINTER1(tiff, "LASSRS_SetGTIF", LE_Failure); + try { + ((LASSpatialReference*) hSRS)->SetGTIF(gtiff, tiff); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASSRS_SetGTIF"); + return LE_Failure; + } + + return LE_None; +} +LAS_DLL char* LASSRS_GetProj4(LASSRSH hSRS) +{ + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetProj4", NULL); + LASSpatialReference* srs = (LASSpatialReference*)hSRS; + + return strdup((srs)->GetProj4().c_str()); + +} + +LAS_DLL LASErrorEnum LASSRS_SetProj4(LASSRSH hSRS, const char* value) +{ + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetProj4", LE_Failure); + VALIDATE_LAS_POINTER1(value, "LASSRS_SetProj4", LE_Failure); + + try { + ((LASSpatialReference*) hSRS)->SetProj4(value); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASSRS_SetProj4"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL char* LASSRS_GetWKT(LASSRSH hSRS) +{ + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetWKT", NULL); + LASSpatialReference* srs = (LASSpatialReference*)hSRS; + + return strdup((srs)->GetWKT().c_str()); + +} + +LAS_DLL LASErrorEnum LASSRS_SetWKT(LASSRSH hSRS, const char* value) +{ + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetWKT", LE_Failure); + VALIDATE_LAS_POINTER1(value, "LASSRS_SetWKT", LE_Failure); + + try { + ((LASSpatialReference*) hSRS)->SetWKT(value); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASSRS_SetWKT"); + return LE_Failure; + } + + return LE_None; +} + +LAS_DLL LASErrorEnum LASSRS_AddVLR(LASSRSH hSRS, const LASVLRH hVLR) { + + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_AddVLR", LE_Failure); + VALIDATE_LAS_POINTER1(hVLR, "LASSRS_AddVLR", LE_Failure); + + try { + ((LASSpatialReference*) hSRS)->AddVLR(*((LASVariableRecord*)hVLR)); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASSRS_AddVLR"); + return LE_Failure; + } + + + return LE_None; +} + +LAS_DLL LASVLRH LASSRS_GetVLR(const LASSRSH hSRS, liblas::uint32_t i) { + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetVLR", 0); + + LASVariableRecord vlr = ((LASSpatialReference*) hSRS)->GetVLRs()[i]; + return (LASVLRH) new LASVariableRecord(vlr); +} + +LAS_DLL liblas::uint32_t LASSRS_GetVLRCount(const LASSRSH hSRS) { + VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetVLR", 0); + + liblas::uint32_t size = ((LASSpatialReference*) hSRS)->GetVLRs().size(); + return size; +} + +LAS_DLL LASErrorEnum LASHeader_SetSRS(LASHeaderH hHeader, const LASSRSH hSRS) { + + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetSRS", LE_Failure); + VALIDATE_LAS_POINTER1(hSRS, "LASHeader_SetSRS", LE_Failure); + + try { + ((LASHeader*) hHeader)->SetSRS(*((LASSpatialReference*)hSRS)); + } + catch (std::exception const& e) { + LASError_PushError(LE_Failure, e.what(), "LASHeader_SetSRS"); + return LE_Failure; + } + + + return LE_None; +} + +LAS_DLL LASSRSH LASHeader_GetSRS(const LASHeaderH hHeader) { + VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetSRS", 0); + + LASSpatialReference srs = ((LASHeader*) hHeader)->GetSRS(); + return (LASSRSH) new LASSpatialReference(srs); +} + + +LAS_DLL void LASString_Free(char* string) { + if (string) + free(string); +} + +LAS_C_END + +#ifdef _MSC_VER +# pragma warning(default: 4127) // enable warning C4127: conditional expression is constant +#endif diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lascolor.cpp work/libLAS-1.2.1/src/lascolor.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lascolor.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/lascolor.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,87 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS color class + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include + +// std +#include + +namespace liblas { + +LASColor::LASColor() : + m_red(0), + m_green(0), + m_blue(0) +{ +} + +LASColor::LASColor(LASColor const& other) : + m_red(other.m_red), + m_green(other.m_green), + m_blue(other.m_blue) +{ +} + +LASColor& LASColor::operator=(LASColor const& rhs) +{ + if (&rhs != this) + { + m_red = rhs.m_red; + m_green = rhs.m_green; + m_blue = rhs.m_blue; + } + return *this; +} + +bool LASColor::operator==(LASColor const& other) const +{ + if (&other == this) return true; + + if (m_red != other.m_red) return false; + if (m_green != other.m_green) return false; + if (m_blue != other.m_blue) return false; + + return true; +} + +} // namespace liblas + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/laserror.cpp work/libLAS-1.2.1/src/laserror.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/laserror.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/laserror.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,78 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: An error encapsulation class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * Copyright (c) 2008, Phil Vachon + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +//std +#include + +namespace liblas +{ + +LASError::LASError(int code, std::string const& message, std::string const& method) : + m_code(code), + m_message(message), + m_method(method) +{ +} + +LASError::LASError(LASError const& other) : + m_code(other.m_code), + m_message(other.m_message), + m_method(other.m_method) +{ +} + +LASError& LASError::operator=(LASError const& rhs) +{ + if (&rhs != this) + { + m_code = rhs.m_code; + m_message = rhs.m_message; + m_method = rhs.m_method; + + } + return *this; +} + +} // namespace liblas diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasfile.cpp work/libLAS-1.2.1/src/lasfile.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasfile.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/lasfile.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,116 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: A composite class to handle read/write operations + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include + +#include +#include + +namespace liblas { + +LASFile::LASFile() +{ +} + +LASFile::LASFile(std::string const& filename) + : m_pimpl(new detail::FileImpl(filename)) +{ +} + +LASFile::LASFile(std::string const& filename, LASHeader const& header, Mode mode) + : m_pimpl(new detail::FileImpl(filename, header, mode)) +{ +} + +LASFile::LASFile(LASFile const& other) + : m_pimpl(other.m_pimpl) +{ +} + +LASFile& LASFile::operator=(LASFile const& rhs) +{ + m_pimpl = rhs.m_pimpl; + return (*this); +} + +bool LASFile::IsNull() const +{ + return (0 == m_pimpl.get()); +} + +std::string LASFile::GetName() const +{ + return m_pimpl->GetName(); +} + +LASFile::Mode LASFile::GetMode() const +{ + int const mode = m_pimpl->GetMode(); + if (mode == 0) + return eRead; + else if (mode == 1) + return eWrite; + else if (mode == 2) + return eAppend; + + assert("SHOULD NEVER GET HERE"); + return eRead; +} + +LASHeader const& LASFile::GetHeader() const +{ + return m_pimpl->GetHeader(); +} + +LASReader& LASFile::GetReader() +{ + return m_pimpl->GetReader(); +} + +LASWriter& LASFile::GetWriter() +{ + return m_pimpl->GetWriter(); +} + +} // namespace liblas diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasheader.cpp work/libLAS-1.2.1/src/lasheader.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasheader.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/lasheader.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,703 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS header class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Phil Vachon + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include + +// GeoTIFF +#ifdef HAVE_LIBGEOTIFF +#include +#include +#include "geo_normalize.h" +#include "geo_simpletags.h" +#include "geovalues.h" +#include "geotiffio.h" +#endif // HAVE_LIBGEOTIFF + +//std +#include +#include +#include +#include +#include +#include // std::memset, std::memcpy, std::strncpy +#include +#include + + +namespace liblas +{ + +char const* const LASHeader::FileSignature = "LASF"; +char const* const LASHeader::SystemIdentifier = "libLAS"; +char const* const LASHeader::SoftwareIdentifier = "libLAS 1.2"; + +LASHeader::LASHeader() +{ + Init(); +} + +LASHeader::LASHeader(LASHeader const& other) : + m_sourceId(other.m_sourceId), + m_reserved(other.m_reserved), + m_projectId1(other.m_projectId1), + m_projectId2(other.m_projectId2), + m_projectId3(other.m_projectId3), + m_versionMajor(other.m_versionMajor), + m_versionMinor(other.m_versionMinor), + m_createDOY(other.m_createDOY), + m_createYear(other.m_createYear), + m_headerSize(other.m_headerSize), + m_dataOffset(other.m_dataOffset), + m_recordsCount(other.m_recordsCount), + m_dataFormatId(other.m_dataFormatId), + m_dataRecordLen(other.m_dataRecordLen), + m_pointRecordsCount(other.m_pointRecordsCount), + m_scales(other.m_scales), + m_offsets(other.m_offsets), + m_extents(other.m_extents), + m_srs(other.m_srs) +{ + void* p = 0; + + p = std::memcpy(m_signature, other.m_signature, eFileSignatureSize); + assert(p == m_signature); + p = std::memcpy(m_projectId4, other.m_projectId4, eProjectId4Size); + assert(p == m_projectId4); + p = std::memcpy(m_systemId, other.m_systemId, eSystemIdSize); + assert(p == m_systemId); + p = std::memcpy(m_softwareId, other.m_softwareId, eSoftwareIdSize); + assert(p == m_softwareId); + std::vector(other.m_pointRecordsByReturn).swap(m_pointRecordsByReturn); + assert(ePointsByReturnSize >= m_pointRecordsByReturn.size()); + + std::vector(other.m_vlrs).swap(m_vlrs); + +} + +LASHeader& LASHeader::operator=(LASHeader const& rhs) +{ + if (&rhs != this) + { + void* p = 0; + p = std::memcpy(m_signature, rhs.m_signature, eFileSignatureSize); + assert(p == m_signature); + m_sourceId = rhs.m_sourceId; + m_reserved = rhs.m_reserved; + m_projectId1 = rhs.m_projectId1; + m_projectId2 = rhs.m_projectId2; + m_projectId3 = rhs.m_projectId3; + p = std::memcpy(m_projectId4, rhs.m_projectId4, eProjectId4Size); + assert(p == m_projectId4); + m_versionMajor = rhs.m_versionMajor; + m_versionMinor = rhs.m_versionMinor; + p = std::memcpy(m_systemId, rhs.m_systemId, eSystemIdSize); + assert(p == m_systemId); + p = std::memcpy(m_softwareId, rhs.m_softwareId, eSoftwareIdSize); + assert(p == m_softwareId); + m_createDOY = rhs.m_createDOY; + m_createYear = rhs.m_createYear; + m_headerSize = rhs.m_headerSize; + m_dataOffset = rhs.m_dataOffset; + m_recordsCount = rhs.m_recordsCount; +// m_recordsCount = 0; + m_dataFormatId = rhs.m_dataFormatId; + m_dataRecordLen = rhs.m_dataRecordLen; + m_pointRecordsCount = rhs.m_pointRecordsCount; + + std::vector(rhs.m_pointRecordsByReturn).swap(m_pointRecordsByReturn); + assert(ePointsByReturnSize >= m_pointRecordsByReturn.size()); + + std::vector(rhs.m_vlrs).swap(m_vlrs); + m_scales = rhs.m_scales; + m_offsets = rhs.m_offsets; + m_extents = rhs.m_extents; + m_srs = rhs.m_srs; + } + return *this; +} + +bool LASHeader::operator==(LASHeader const& other) const +{ + if (&other == this) return true; + + if (m_signature != other.m_signature) return false; + if (m_sourceId != other.m_sourceId) return false; + if (m_reserved != other.m_reserved) return false; + if (m_projectId1 != other.m_projectId1) return false; + if (m_projectId2 != other.m_projectId2) return false; + if (m_projectId3 != other.m_projectId3) return false; + if (m_projectId4 != other.m_projectId4) return false; + if (m_versionMajor != other.m_versionMajor) return false; + if (m_versionMinor != other.m_versionMinor) return false; + if (m_systemId != other.m_systemId) return false; + if (m_softwareId != other.m_softwareId) return false; + if (m_createDOY != other.m_createDOY) return false; + if (m_createYear != other.m_createYear) return false; + if (m_headerSize != other.m_headerSize) return false; + if (m_dataOffset != other.m_dataOffset) return false; + if (m_recordsCount != other.m_recordsCount) return false; + if (m_dataFormatId != other.m_dataFormatId) return false; + if (m_dataRecordLen != other.m_dataRecordLen) return false; + if (m_pointRecordsCount != other.m_pointRecordsCount) return false; + if (m_pointRecordsByReturn != other.m_pointRecordsByReturn) return false; + if (m_scales != other.m_scales) return false; + if (m_offsets != other.m_offsets) return false; + if (m_extents != other.m_extents) return false; + + return true; +} + + +std::string LASHeader::GetFileSignature() const +{ + return std::string(m_signature, eFileSignatureSize); +} + +void LASHeader::SetFileSignature(std::string const& v) +{ + if (0 != v.compare(0, eFileSignatureSize, FileSignature)) + throw std::invalid_argument("invalid file signature"); + + std::strncpy(m_signature, v.c_str(), eFileSignatureSize); +} + +uint16_t LASHeader::GetFileSourceId() const +{ + return m_sourceId; +} + +void LASHeader::SetFileSourceId(uint16_t v) +{ + // TODO: Should we warn or throw about type overflow occuring when + // user passes 65535 + 1 = 0 + m_sourceId = v; +} + +uint16_t LASHeader::GetReserved() const +{ + return m_reserved; +} + +void LASHeader::SetReserved(uint16_t v) +{ + // TODO: Should we warn or throw about type overflow occuring when + // user passes 65535 + 1 = 0 + m_reserved = v; +} + +liblas::guid LASHeader::GetProjectId() const +{ + return liblas::guid(m_projectId1, m_projectId2, m_projectId3, m_projectId4); +} + +void LASHeader::SetProjectId(guid const& v) +{ + v.output_data(m_projectId1, m_projectId2, m_projectId3, m_projectId4); +} + +uint8_t LASHeader::GetVersionMajor() const +{ + return m_versionMajor; +} + +void LASHeader::SetVersionMajor(uint8_t v) +{ + if (eVersionMajorMin > v || v > eVersionMajorMax) + throw std::out_of_range("version major out of range"); + + m_versionMajor = v; +} + +uint8_t LASHeader::GetVersionMinor() const +{ + return m_versionMinor; +} + +void LASHeader::SetVersionMinor(uint8_t v) +{ + if (v > eVersionMinorMax) + throw std::out_of_range("version minor out of range"); + + m_versionMinor = v; +} + +std::string LASHeader::GetSystemId(bool pad /*= false*/) const +{ + // copy array of chars and trim zeros if smaller than 32 bytes + std::string tmp(std::string(m_systemId, eSystemIdSize).c_str()); + + // pad right side with spaces + if (pad && tmp.size() < eSystemIdSize) + { + tmp.resize(eSystemIdSize, 0); + assert(tmp.size() == eSystemIdSize); + } + + assert(tmp.size() <= eSystemIdSize); + return tmp; +} + +void LASHeader::SetSystemId(std::string const& v) +{ + if (v.size() > eSystemIdSize) + throw std::invalid_argument("system id too long"); + + std::fill(m_systemId, m_systemId + eSystemIdSize, 0); + std::strncpy(m_systemId, v.c_str(), eSystemIdSize); +} + +std::string LASHeader::GetSoftwareId(bool pad /*= false*/) const +{ + std::string tmp(std::string(m_softwareId, eSoftwareIdSize).c_str()); + + // pad right side with spaces + if (pad && tmp.size() < eSoftwareIdSize) + { + tmp.resize(eSoftwareIdSize, 0); + assert(tmp.size() == eSoftwareIdSize); + } + + assert(tmp.size() <= eSoftwareIdSize); + return tmp; +} + +void LASHeader::SetSoftwareId(std::string const& v) +{ + if (v.size() > eSoftwareIdSize) + throw std::invalid_argument("generating software id too long"); + +// m_softwareId = v; + std::fill(m_softwareId, m_softwareId + eSoftwareIdSize, 0); + std::strncpy(m_softwareId, v.c_str(), eSoftwareIdSize); +} + +uint16_t LASHeader::GetCreationDOY() const +{ + return m_createDOY; +} + +void LASHeader::SetCreationDOY(uint16_t v) +{ + if (v > 366) + throw std::out_of_range("day of year out of range"); + + m_createDOY = v; +} + +uint16_t LASHeader::GetCreationYear() const +{ + return m_createYear; +} + +void LASHeader::SetCreationYear(uint16_t v) +{ + // mloskot: I've taken these values arbitrarily + if (v > 9999) + throw std::out_of_range("year out of range"); + + m_createYear = v; +} + +uint16_t LASHeader::GetHeaderSize() const +{ + return eHeaderSize; +} + +uint32_t LASHeader::GetDataOffset() const +{ + return m_dataOffset; +} + +void LASHeader::SetDataOffset(uint32_t v) +{ + uint32_t const dataSignatureSize = 2; + uint16_t const hsize = GetHeaderSize(); + + if ( (m_versionMinor == 0 && v < hsize + dataSignatureSize) || + (m_versionMinor == 1 && v < hsize) || + (m_versionMinor == 2 && v < hsize) ) + { + throw std::out_of_range("data offset out of range"); + } + + m_dataOffset = v; + +} + +uint32_t LASHeader::GetRecordsCount() const +{ + return m_recordsCount; +} + +void LASHeader::SetRecordsCount(uint32_t v) +{ + m_recordsCount = v; +} + +LASHeader::PointFormat LASHeader::GetDataFormatId() const +{ + if (ePointFormat0 == m_dataFormatId) + return ePointFormat0; + else if (ePointFormat1 == m_dataFormatId) + return ePointFormat1; + else if (ePointFormat2 == m_dataFormatId) + return ePointFormat2; + else + return ePointFormat3; +} + +void LASHeader::SetDataFormatId(LASHeader::PointFormat v) +{ + m_dataFormatId = static_cast(v); + + if (ePointFormat0 == m_dataFormatId) + m_dataRecordLen = ePointSize0; + else if (ePointFormat1 == m_dataFormatId) + m_dataRecordLen = ePointSize1; + else if (ePointFormat2 == m_dataFormatId) + m_dataRecordLen = ePointSize2; + else if (ePointFormat3 == m_dataFormatId) + m_dataRecordLen = ePointSize3; + else + m_dataRecordLen = ePointSize3; +} + +uint16_t LASHeader::GetDataRecordLength() const +{ + // NOTE: assertions below are used to check if our assumption is correct, + // for debugging purpose only. + + if (ePointFormat0 == m_dataFormatId) + { + assert(ePointSize0 == m_dataRecordLen); + return ePointSize0; + } + if (ePointFormat1 == m_dataFormatId) + { + assert(ePointSize1 == m_dataRecordLen); + return ePointSize1; + } + if (ePointFormat2 == m_dataFormatId) + { + assert(ePointSize2 == m_dataRecordLen); + return ePointSize2; + } + else + { + assert(ePointSize3 == m_dataRecordLen); + return ePointSize3; + } +} + +uint32_t LASHeader::GetPointRecordsCount() const +{ + return m_pointRecordsCount; +} + +void LASHeader::SetPointRecordsCount(uint32_t v) +{ + m_pointRecordsCount = v; +} + +std::vector const& LASHeader::GetPointRecordsByReturnCount() const +{ + return m_pointRecordsByReturn; +} + +void LASHeader::SetPointRecordsByReturnCount(std::size_t index, uint32_t v) +{ + assert(m_pointRecordsByReturn.size() == LASHeader::ePointsByReturnSize); + + uint32_t& t = m_pointRecordsByReturn.at(index); + t = v; +} + + +double LASHeader::GetScaleX() const +{ + return m_scales.x; +} + +double LASHeader::GetScaleY() const +{ + return m_scales.y; +} + +double LASHeader::GetScaleZ() const +{ + return m_scales.z; +} + +void LASHeader::SetScale(double x, double y, double z) +{ + double const minscale = 0.01; + m_scales.x = (0 == x) ? minscale : x; + m_scales.y = (0 == y) ? minscale : y; + m_scales.z = (0 == z) ? minscale : z; +} + +double LASHeader::GetOffsetX() const +{ + return m_offsets.x; +} + +double LASHeader::GetOffsetY() const +{ + return m_offsets.y; +} + +double LASHeader::GetOffsetZ() const +{ + return m_offsets.z; +} + +void LASHeader::SetOffset(double x, double y, double z) +{ + m_offsets = PointOffsets(x, y, z); +} + +double LASHeader::GetMaxX() const +{ + return m_extents.max.x; +} + +double LASHeader::GetMinX() const +{ + return m_extents.min.x; +} + +double LASHeader::GetMaxY() const +{ + return m_extents.max.y; +} + +double LASHeader::GetMinY() const +{ + return m_extents.min.y; +} + +double LASHeader::GetMaxZ() const +{ + return m_extents.max.z; +} + +double LASHeader::GetMinZ() const +{ + return m_extents.min.z; +} + +void LASHeader::SetMax(double x, double y, double z) +{ + m_extents.max = detail::Point(x, y, z); +} + +void LASHeader::SetMin(double x, double y, double z) +{ + m_extents.min = detail::Point(x, y, z); +} + +void LASHeader::AddVLR(LASVariableRecord const& v) +{ + m_vlrs.push_back(v); + m_recordsCount += 1; +} + +LASVariableRecord const& LASHeader::GetVLR(uint32_t index) const +{ + return m_vlrs[index]; +} + +void LASHeader::DeleteVLR(uint32_t index) +{ + if (index >= m_vlrs.size()) + throw std::out_of_range("index is out of range"); + + std::vector::iterator i = m_vlrs.begin() + index; + + m_vlrs.erase(i); + m_recordsCount = static_cast(m_vlrs.size()); + +} + + +void LASHeader::Init() +{ + // Initialize public header block with default + // values according to LAS 1.2 + + m_versionMajor = 1; + m_versionMinor = 2; + m_dataFormatId = ePointFormat0; + m_dataRecordLen = ePointSize0; + + + std::time_t now; + std::tm *ptm; + + std::time(&now); + ptm = std::gmtime(&now); + + m_createDOY = static_cast(ptm->tm_yday); + m_createYear = static_cast(ptm->tm_year + 1900); + + m_headerSize = eHeaderSize; + + m_sourceId = m_reserved = m_projectId2 = m_projectId3 = uint16_t(); + m_projectId1 = uint32_t(); + std::memset(m_projectId4, 0, sizeof(m_projectId4)); + + m_dataOffset = eHeaderSize; // excluding 2 bytes of Point Data Start Signature + m_recordsCount = 0; + m_pointRecordsCount = 0; + + std::memset(m_signature, 0, eFileSignatureSize); + std::strncpy(m_signature, FileSignature, eFileSignatureSize); +// m_signature = LASHeader::FileSignature; + + std::memset(m_systemId, 0, eSystemIdSize); + std::strncpy(m_systemId, SystemIdentifier, eSystemIdSize); +// m_systemId = LASHeader::SystemIdentifier; + + std::memset(m_softwareId, 0, eSoftwareIdSize); + std::strncpy(m_softwareId, SoftwareIdentifier, eSoftwareIdSize); +// m_softwareId = LASHeader::SoftwareIdentifier; + + m_pointRecordsByReturn.resize(ePointsByReturnSize); + + // Zero scale value is useless, so we need to use a small value. + SetScale(0.01, 0.01, 0.01); +} + +void LASHeader::ClearGeoKeyVLRs() +{ + std::string const uid("LASF_Projection"); + + std::vector vlrs = m_vlrs; + std::vector::const_iterator i; + std::vector::iterator j; + + for (i = m_vlrs.begin(); i != m_vlrs.end(); ++i) + { + LASVariableRecord record = *i; + // beg_size += (*i).GetTotalSize(); + + std::string user = record.GetUserId(true); + if (uid == user.c_str()) + { + uint16_t id = record.GetRecordId(); + + if (34735 == id) + { + // Geotiff SHORT key + for(j = vlrs.begin(); j != vlrs.end(); ++j) + { + if (*j == *i) + { + vlrs.erase(j); + break; + } + } + } + else if (34736 == id) + { + // Geotiff DOUBLE key + for(j = vlrs.begin(); j != vlrs.end(); ++j) + { + if (*j == *i) + { + vlrs.erase(j); + break; + } + } + } + else if (34737 == id) + { + // Geotiff ASCII key + for (j = vlrs.begin(); j != vlrs.end(); ++j) + { + if (*j == *i) + { + vlrs.erase(j); + break; + } + } + } + } // uid == user + } + + // Copy our list of surviving VLRs back to our member variable + // and update header information + m_vlrs = vlrs; + m_recordsCount = static_cast(m_vlrs.size()); + +} +void LASHeader::SetGeoreference() +{ + std::vector vlrs = m_srs.GetVLRs(); + + // Wipe the GeoTIFF-related VLR records off of the LASHeader + ClearGeoKeyVLRs(); + + std::vector::const_iterator i; + + for (i = vlrs.begin(); i != vlrs.end(); ++i) + { + AddVLR(*i); + } + +} + +LASSpatialReference LASHeader::GetSRS() const +{ + return m_srs; +} +void LASHeader::SetSRS(LASSpatialReference& srs) +{ + m_srs = srs; +} + +} // namespace liblas + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/laspoint.cpp work/libLAS-1.2.1/src/laspoint.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/laspoint.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/laspoint.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,226 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS point class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include +#include +#include +// std +#include + +namespace liblas { + +LASPoint::LASPoint() : + m_intensity(0), + m_flags(0), + m_class(0), + m_angleRank(0), + m_userData(0), + m_pointSourceId(0), + m_gpsTime(0) +{ + std::memset(m_coords, 0, sizeof(m_coords)); +} + +LASPoint::LASPoint(LASPoint const& other) : + m_intensity(other.m_intensity), + m_flags(other.m_flags), + m_class(other.m_class), + m_angleRank(other.m_angleRank), + m_userData(other.m_userData), + m_pointSourceId(other.m_pointSourceId), + m_gpsTime(other.m_gpsTime), + m_color(other.m_color) +{ + std::memcpy(m_coords, other.m_coords, sizeof(m_coords)); +} + +LASPoint& LASPoint::operator=(LASPoint const& rhs) +{ + if (&rhs != this) + { + m_coords[0] = rhs.m_coords[0]; + m_coords[1] = rhs.m_coords[1]; + m_coords[2] = rhs.m_coords[2]; + m_intensity = rhs.m_intensity; + m_flags = rhs.m_flags; + m_class = rhs.m_class; + m_angleRank = rhs.m_angleRank; + m_userData = rhs.m_userData; + m_pointSourceId = rhs.m_pointSourceId; + m_gpsTime = rhs.m_gpsTime; + m_color = rhs.m_color; + } + return *this; +} + +void LASPoint::SetCoordinates(LASHeader const& header, double x, double y, double z) +{ + double const cx = x * header.GetScaleX() + header.GetOffsetX(); + double const cy = y * header.GetScaleY() + header.GetOffsetY(); + double const cz = z * header.GetScaleZ() + header.GetOffsetZ(); + + SetCoordinates(cx, cy, cz); +} + +void LASPoint::SetReturnNumber(uint16_t const& num) +{ + // Store value in bits 0,1,2 + uint8_t mask = 0x7 << 0; // 0b00000111 + m_flags &= ~mask; + m_flags |= mask & (static_cast(num) << 0); + +} + +void LASPoint::SetNumberOfReturns(uint16_t const& num) +{ + // Store value in bits 3,4,5 + uint8_t mask = 0x7 << 3; // 0b00111000 + m_flags &= ~mask; + m_flags |= mask & (static_cast(num) << 3); +} + +void LASPoint::SetScanDirection(uint16_t const& dir) +{ + // Store value in bit 6 + uint8_t mask = 0x1 << 6; // 0b01000000 + m_flags &= ~mask; + m_flags |= mask & (static_cast(dir) << 6); +} + +void LASPoint::SetFlightLineEdge(uint16_t const& edge) +{ + // Store value in bit 7 + uint8_t mask = 0x1 << 7; // 0b10000000 + m_flags &= ~mask; + m_flags |= mask & (static_cast(edge) << 7);} + +void LASPoint::SetScanAngleRank(int8_t const& rank) +{ + m_angleRank = rank; +} + +void LASPoint::SetUserData(uint8_t const& data) +{ + m_userData = data; +} + +bool LASPoint::equal(LASPoint const& other) const +{ + // TODO - mloskot: Default epsilon is too small. + // Is 0.00001 good as tolerance or too wide? + //double const epsilon = std::numeric_limits::epsilon(); + double const epsilon = 0.00001; + + double const dx = m_coords[0] - other.m_coords[0]; + double const dy = m_coords[1] - other.m_coords[1]; + double const dz = m_coords[2] - other.m_coords[2]; + + // TODO: Should we compare other data members, besides the coordinates? + + if (((dx <= epsilon) && (dx >= -epsilon)) + && ((dy <= epsilon) && (dy >= -epsilon)) + && ((dz <= epsilon) && (dz >= -epsilon))) + { + return true; + } + + return false; +} + +bool LASPoint::Validate() const +{ + unsigned int flags = 0; + + if (this->GetReturnNumber() > 0x07) + flags |= eReturnNumber; + + if (this->GetNumberOfReturns() > 0x07) + flags |= eNumberOfReturns; + + if (this->GetScanDirection() > 0x01) + flags |= eScanDirection; + + if (this->GetFlightLineEdge() > 0x01) + flags |= eFlightLineEdge; + + if (eScanAngleRankMin > this->GetScanAngleRank() + || this->GetScanAngleRank() > eScanAngleRankMax) + { + flags |= eScanAngleRank; + } + + if (flags > 0) + { + throw invalid_point_data("point data members out of range", flags); + } + + return true; +} + + +bool LASPoint::IsValid() const +{ + + if( eScanAngleRankMin > this->GetScanAngleRank() + || this->GetScanAngleRank() > eScanAngleRankMax + ) + return false; + + if (this->GetFlightLineEdge() > 0x01) + return false; + + if (this->GetScanDirection() > 0x01) + return false; + + if (this->GetNumberOfReturns() > 0x07) + return false; + + if (this->GetReturnNumber() > 0x07) + return false; + + + return true; +} + + +} // namespace liblas diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasreader.cpp work/libLAS-1.2.1/src/lasreader.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasreader.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/lasreader.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,149 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS reader class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * Copyright (c) 2008, Phil Vachon + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +// std +#include +#include +#include +#include // std::memset +#include +#include + +namespace liblas +{ + +LASReader::LASReader(std::istream& ifs) : + m_pimpl(detail::ReaderFactory::Create(ifs)) +{ + Init(); +} + +LASReader::~LASReader() +{ + // empty, but required so we can implement PIMPL using + // std::auto_ptr with incomplete type (Reader). +} + +std::size_t LASReader::GetVersion() const +{ + return m_pimpl->GetVersion(); +} + +LASHeader const& LASReader::GetHeader() const +{ + return m_header; +} + +LASPoint const& LASReader::GetPoint() const +{ + return m_point; +} + +bool LASReader::ReadNextPoint() +{ + bool ret = m_pimpl->ReadNextPoint(m_point, m_header); + return ret; +} + +bool LASReader::ReadPointAt(std::size_t n) +{ + bool ret = m_pimpl->ReadPointAt(n, m_point, m_header); + return ret; +} + +LASPoint const& LASReader::operator[](std::size_t n) +{ + if (m_header.GetPointRecordsCount() <= n) + { + throw std::out_of_range("point subscript out of range"); + } + + bool ret = m_pimpl->ReadPointAt(n, m_point, m_header); + if (!ret) + { + throw std::out_of_range("no point record at given position"); + } + + return m_point; +} + +void LASReader::Init() +{ + bool ret = m_pimpl->ReadHeader(m_header); + if (!ret) + throw std::runtime_error("public header block reading failure"); + + ret = m_pimpl->ReadVLR(m_header); + if (!ret) + throw std::runtime_error("public vlr header block reading failure"); + + m_pimpl->ReadGeoreference(m_header); + m_pimpl->Reset(m_header); + +} + +std::istream& LASReader::GetStream() const +{ + return m_pimpl->GetStream(); +} + +void LASReader::Reset() +{ + Init(); +} + +bool LASReader::IsEOF() const +{ + return GetStream().eof(); +} + +bool LASReader::SetSRS(const LASSpatialReference& srs) +{ + m_pimpl->SetSRS(srs); + return true; +} + + +} // namespace liblas + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasspatialreference.cpp work/libLAS-1.2.1/src/lasspatialreference.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasspatialreference.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/lasspatialreference.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,529 @@ +/****************************************************************************** + * $Id: lasspatialreference.cpp 1104 2009-03-17 04:15:19Z hobu $ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS Spatial Reference class + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * Copyright (c) 2009, Howard Butler + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +#include + +namespace liblas +{ + +LASSpatialReference::LASSpatialReference() : + m_gtiff(0), + m_tiff(0) +{ + assert(0 == m_gtiff); + assert(0 == m_tiff); +} + +LASSpatialReference& LASSpatialReference::operator=(LASSpatialReference const& rhs) +{ + if (&rhs != this) + { + SetVLRs(rhs.GetVLRs()); + GetGTIF(); + } + return *this; +} + +LASSpatialReference::~LASSpatialReference() +{ +#ifdef HAVE_LIBGEOTIFF + if (m_gtiff) + { + GTIFFree(m_gtiff); + m_gtiff = 0; + } + if (m_tiff) + { + ST_Destroy(m_tiff); + m_tiff = 0; + } +#endif +} + +LASSpatialReference::LASSpatialReference(LASSpatialReference const& other) +{ + m_tiff = 0; + m_gtiff = 0; + SetVLRs(other.GetVLRs()); + GetGTIF(); +} + +LASSpatialReference::LASSpatialReference(std::vector const& vlrs) +{ + m_tiff = 0; + m_gtiff = 0; + SetVLRs(vlrs); + GetGTIF(); +} + +/// Keep a copy of the VLRs that are related to GeoTIFF SRS information. +void LASSpatialReference::SetVLRs(std::vector const& vlrs) +{ + + std::string const uid("LASF_Projection"); + + // Wipe out any existing VLRs that might exist on the LASSpatialReference + m_vlrs.clear(); + + // We only copy VLR records from the list which are related to GeoTIFF keys. + // They must have an id of "LASF_Projection" and a record id that's related. + std::vector::const_iterator it; + for (it = vlrs.begin(); it != vlrs.end(); ++it) + { + LASVariableRecord const& vlr = *it; + if (IsGeoVLR(vlr)) + { + m_vlrs.push_back(vlr); + } + } +} + +void LASSpatialReference::AddVLR(LASVariableRecord const& vlr) +{ + if (IsGeoVLR(vlr)) + { + m_vlrs.push_back(vlr); + } +} + +bool LASSpatialReference::IsGeoVLR(LASVariableRecord const& vlr) const +{ + std::string const uid("LASF_Projection"); + + // GTIFF_GEOKEYDIRECTORY == 34735 + if (uid == vlr.GetUserId(true).c_str() && 34735 == vlr.GetRecordId()) + { + return true; + } + + // GTIFF_DOUBLEPARAMS == 34736 + if (uid == vlr.GetUserId(true).c_str() && 34736 == vlr.GetRecordId()) + { + return true; + } + + // GTIFF_ASCIIPARAMS == 34737 + if (uid == vlr.GetUserId(true).c_str() && 34737 == vlr.GetRecordId()) + { + return true; + } + + return false; +} + +std::vector LASSpatialReference::GetVLRs() const +{ + return m_vlrs; +} + +void LASSpatialReference::ResetVLRs() +{ + + m_vlrs.clear(); + +#ifdef HAVE_LIBGEOTIFF + + int ret = 0; + short* kdata = 0; + short kvalue = 0; + double* ddata = 0; + double dvalue = 0; + uint8_t* adata = 0; + uint8_t avalue = 0; + int dtype = 0; + int dcount = 0; + int ktype = 0; + int kcount = 0; + int acount = 0; + int atype =0; + + if (!m_tiff) + throw std::invalid_argument("m_tiff was null, cannot reset VLRs without m_tiff"); + + if (!m_gtiff) + throw std::invalid_argument("m_gtiff was null, cannot reset VLRs without m_gtiff"); + + //GTIFF_GEOKEYDIRECTORY == 34735 + ret = ST_GetKey(m_tiff, 34735, &kcount, &ktype, (void**)&kdata); + if (ret) + { + LASVariableRecord record; + int i = 0; + record.SetRecordId(34735); + record.SetUserId("LASF_Projection"); + std::vector data; + + // Shorts are 2 bytes in length + uint16_t length = 2*kcount; + + record.SetRecordLength(length); + + // Copy the data into the data vector + for (i = 0; i < kcount; i++) + { + kvalue = kdata[i]; + + uint8_t* v = reinterpret_cast(&kvalue); + + data.push_back(v[0]); + data.push_back(v[1]); + } + + record.SetData(data); + m_vlrs.push_back(record); + } + + // GTIFF_DOUBLEPARAMS == 34736 + ret = ST_GetKey(m_tiff, 34736, &dcount, &dtype, (void**)&ddata); + if (ret) + { + LASVariableRecord record; + int i = 0; + record.SetRecordId(34736); + record.SetUserId("LASF_Projection"); + std::vector data; + + // Doubles are 8 bytes in length + uint16_t length = 8*dcount; + record.SetRecordLength(length); + + // Copy the data into the data vector + for (i=0; i(&dvalue); + + data.push_back(v[0]); + data.push_back(v[1]); + data.push_back(v[2]); + data.push_back(v[3]); + data.push_back(v[4]); + data.push_back(v[5]); + data.push_back(v[6]); + data.push_back(v[7]); + } + record.SetData(data); + m_vlrs.push_back(record); + } + + // GTIFF_ASCIIPARAMS == 34737 + ret = ST_GetKey(m_tiff, 34737, &acount, &atype, (void**)&adata); + if (ret) + { + LASVariableRecord record; + int i = 0; + record.SetRecordId(34737); + record.SetUserId("LASF_Projection"); + std::vector data; + + // whoa. If the returned count was 0, it is because there + // was a bug in libgeotiff that existed before r1531 where it + // didn't calculate the string length for an ASCII geotiff tag. + // We need to throw an exception in this case because we're + // screwed, and if we don't we'll end up writing bad GeoTIFF keys. + if (!acount) + { + throw std::runtime_error("GeoTIFF ASCII key with no returned size. " + "Upgrade your libgeotiff to a version greater " + "than r1531 (libgeotiff 1.2.6)"); + } + + uint16_t length = acount; + record.SetRecordLength(length); + + // Copy the data into the data vector + for (i=0; i(&avalue); + + data.push_back(v[0]); + + } + record.SetData(data); + m_vlrs.push_back(record); + } +#endif // ndef HAVE_LIBGEOTIFF +} + +void LASSpatialReference::SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff) +{ + m_gtiff = (GTIF*)gtiff; + m_tiff = (ST_TIFF*)tiff; + ResetVLRs(); + m_gtiff = NULL; + m_tiff = NULL; +} +const GTIF* LASSpatialReference::GetGTIF() +{ +#ifndef HAVE_LIBGEOTIFF + return 0; +#else + + // If we already have m_gtiff and m_tiff, that is because we have + // already called GetGTIF once before. VLRs ultimately drive how the + // LASSpatialReference is defined, not the GeoTIFF keys. + if (m_tiff) + { + ST_Destroy(m_tiff); + m_tiff = 0; + } + + if (m_gtiff) + { + GTIFFree(m_gtiff); + m_gtiff = 0; + } + + m_tiff = ST_Create(); + std::string const uid("LASF_Projection"); + + // Nothing is going to happen here if we don't have any VLRs describing + // SRS information on the LASSpatialReference. + for (uint16_t i = 0; i < m_vlrs.size(); ++i) + { + LASVariableRecord record = m_vlrs[i]; + std::vector data = record.GetData(); + if (uid == record.GetUserId(true).c_str() && 34735 == record.GetRecordId()) + { + int count = data.size()/sizeof(int16_t); + ST_SetKey(m_tiff, record.GetRecordId(), count, STT_SHORT, &(data[0])); + } + + if (uid == record.GetUserId(true).c_str() && 34736 == record.GetRecordId()) + { + int count = data.size() / sizeof(double); + ST_SetKey(m_tiff, record.GetRecordId(), count, STT_DOUBLE, &(data[0])); + } + + if (uid == record.GetUserId(true).c_str() && 34737 == record.GetRecordId()) + { + int count = data.size()/sizeof(uint8_t); + ST_SetKey(m_tiff, record.GetRecordId(), count, STT_ASCII, &(data[0])); + } + } + + m_gtiff = GTIFNewSimpleTags(m_tiff); + if (!m_gtiff) + throw std::runtime_error("The geotiff keys could not read from VLR records"); + + return m_gtiff; +#endif +} + +/// Fetch the SRS as WKT +std::string LASSpatialReference::GetWKT() const +{ +#ifndef HAVE_GDAL + return std::string(); +#else + GTIFDefn sGTIFDefn; + char* pszWKT = 0; + if (!m_gtiff) + { + return std::string(); + } + + if (GTIFGetDefn(m_gtiff, &sGTIFDefn)) + { + pszWKT = GTIFGetOGISDefn( m_gtiff, &sGTIFDefn ); + if (pszWKT) + { + std::string tmp(pszWKT); + std::free(pszWKT); + return tmp; + } + } + return std::string(); +#endif +} + +void LASSpatialReference::SetWKT(std::string const& v) +{ + if (!m_gtiff) + { + GetGTIF(); + } + +#ifdef HAVE_GDAL + + int ret = 0; + ret = GTIFSetFromOGISDefn( m_gtiff, v.c_str() ); + if (!ret) + { + throw std::invalid_argument("could not set m_gtiff from WKT"); + } + + ret = GTIFWriteKeys(m_gtiff); + if (!ret) + { + throw std::runtime_error("The geotiff keys could not be written"); + } + + ResetVLRs(); +#else + UNREFERENCED_PARAMETER(v); + throw std::runtime_error("GDAL is not available, LASSpatialReference could not be set from WKT"); +#endif +} + +std::string LASSpatialReference::GetProj4() const +{ +#ifdef HAVE_GDAL + + std::string wkt = GetWKT(); + const char* poWKT = wkt.c_str(); + + OGRSpatialReference* poSRS = new OGRSpatialReference(); + if (OGRERR_NONE != poSRS->importFromWkt((char **) &poWKT)) + { + delete poSRS; + return std::string(); + } + + char* proj4 = 0; + poSRS->exportToProj4(&proj4); + std::string tmp(proj4); + std::free(proj4); + + delete poSRS; + + return tmp; +#endif + +// if we have libgeotiff but not GDAL, we'll use the +// simple method in libgeotiff +#ifdef HAVE_LIBGEOTIFF +#ifndef HAVE_GDAL + GTIFDefn defn; + + if (m_gtiff && GTIFGetDefn(m_gtiff, &defn)) + { + char* proj4def = GTIFGetProj4Defn(&defn); + std::string tmp(proj4def); + std::free(proj4def); + + return tmp; + } +#endif +#endif + + // If we have neither GDAL nor proj.4, we can't do squat + return std::string(); +} + +void LASSpatialReference::SetProj4(std::string const& v) +{ + if (!m_gtiff) + { + GetGTIF(); + ResetVLRs(); + } + +#ifdef HAVE_GDAL + char* poWKT = 0; + const char* poProj4 = v.c_str(); + OGRSpatialReference* poSRS = new OGRSpatialReference(); + if (OGRERR_NONE != poSRS->importFromProj4((char *) poProj4)) + { + delete poSRS; + throw std::invalid_argument("could not import proj4 into OSRSpatialReference SetProj4"); + } + + poSRS->exportToWkt(&poWKT); + delete poSRS; + + std::string tmp(poWKT); + std::free(poWKT); + + int ret = 0; + ret = GTIFSetFromOGISDefn( m_gtiff, tmp.c_str() ); + if (!ret) + { + throw std::invalid_argument("could not set m_gtiff from Proj4"); + } + + ret = GTIFWriteKeys(m_gtiff); + if (!ret) + { + throw std::runtime_error("The geotiff keys could not be written"); + } + + GTIFDefn defn; + + if (m_gtiff && GTIFGetDefn(m_gtiff, &defn)) + { + char* proj4def = GTIFGetProj4Defn(&defn); + std::string tmp(proj4def); + std::free(proj4def); + } +#else + UNREFERENCED_PARAMETER(v); +#endif + +// if we have libgeotiff but not GDAL, we'll use the +// simple method in libgeotiff +#ifdef HAVE_LIBGEOTIFF +#ifndef HAVE_GDAL + + int ret = 0; + ret = GTIFSetFromProj4( m_gtiff, v.c_str()); + if (!ret) + { + throw std::invalid_argument("PROJ.4 string is invalid or unsupported"); + } + + ret = GTIFWriteKeys(m_gtiff); + if (!ret) + { + throw std::runtime_error("The geotiff keys could not be written"); + } +#endif +#endif + ResetVLRs(); +} + +} // namespace liblas + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasvariablerecord.cpp work/libLAS-1.2.1/src/lasvariablerecord.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/lasvariablerecord.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/lasvariablerecord.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,221 @@ +/****************************************************************************** + * $Id: lasrecordheader.cpp 861 2008-08-22 16:02:32Z mloskot $ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS record header class + * Author: Phil Vachon, philippe@cowpig.ca + * + ****************************************************************************** + * Copyright (c) 2008, Phil Vachon + * Copyright (c) 2008, Mateusz Loskot, mateusz@loskot.net + * Copyright (c) 2008, Howard Butler, hobu.inc@gmail.com + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +// std +#include +#include +#include +#include +#include // std::memset, std::memcpy, std::strncpy +#include + +namespace liblas { + +LASVariableRecord::LASVariableRecord() : + m_reserved(0), m_recordId(0), m_recordLength(0) +{ + std::memset(m_userId, 0, eUIDSize); + std::memset(m_desc, 0, eDescriptionSize); + + m_data.resize(40); + +} + +LASVariableRecord::LASVariableRecord(LASVariableRecord const& other) : + m_reserved(other.m_reserved), + m_recordId(other.m_recordId), + m_recordLength(other.m_recordLength) +{ + void* p = 0; + + p = std::memcpy(m_userId, other.m_userId, eUIDSize); + assert(p == m_userId); + + p = std::memcpy(m_desc, other.m_desc, eDescriptionSize); + assert(p == m_desc); + + std::vector(other.m_data).swap(m_data); +} + +LASVariableRecord::~LASVariableRecord() +{ + +} + +LASVariableRecord& LASVariableRecord::operator=(LASVariableRecord const& rhs) +{ + void* p = 0; + if (this != &rhs) + { + m_reserved = rhs.m_reserved; + m_recordId = rhs.m_recordId; + m_recordLength = rhs.m_recordLength; + + p = std::memcpy(m_userId, rhs.m_userId, eUIDSize); + assert(p == m_userId); + + p = std::memcpy(m_desc, rhs.m_desc, eDescriptionSize); + assert(p == m_desc); + + std::vector(rhs.m_data).swap(m_data); + } + return (*this); +} + +uint16_t LASVariableRecord::GetReserved() const +{ + return m_reserved; +} + +void LASVariableRecord::SetReserved(uint16_t id) +{ + m_reserved = id; +} + +std::string LASVariableRecord::GetUserId(bool pad /*= false*/) const +{ + // copy array of chars and trim zeros if smaller than 32 bytes + std::string tmp(std::string(m_userId, eUIDSize).c_str()); + + // pad right side with spaces + if (pad && tmp.size() < eUIDSize) + { + tmp.resize(eUIDSize, 0); + assert(tmp.size() == eUIDSize); + } + + assert(tmp.size() <= eUIDSize); + return tmp; +} + +void LASVariableRecord::SetUserId(std::string const& v) +{ + if (v.size() > eUIDSize) + throw std::invalid_argument("user id too long"); + + + std::fill(m_userId, m_userId + eUIDSize, 0); + std::strncpy(m_userId, v.c_str(), eUIDSize); +} + + +uint16_t LASVariableRecord::GetRecordId() const +{ + return m_recordId; +} + +void LASVariableRecord::SetRecordId(uint16_t v) { + m_recordId = v; +} + +uint16_t LASVariableRecord::GetRecordLength() const +{ + return m_recordLength; +} + +void LASVariableRecord::SetRecordLength(uint16_t v) { + m_recordLength = v; +} + +std::string LASVariableRecord::GetDescription(bool pad /*= false*/) const +{ + // copy array of chars and trim zeros if smaller than 32 bytes + std::string tmp(std::string(m_desc, eDescriptionSize).c_str()); + + // pad right side with spaces + if (pad && tmp.size() < eDescriptionSize) + { + tmp.resize(eDescriptionSize, 0); + assert(tmp.size() == eDescriptionSize); + } + + assert(tmp.size() <= eDescriptionSize); + return tmp; +} + +void LASVariableRecord::SetDescription(std::string const& v) +{ + if (v.size() > eDescriptionSize) + throw std::invalid_argument("description is too long"); + + + std::fill(m_desc, m_desc + eDescriptionSize, 0); + std::strncpy(m_desc, v.c_str(), eDescriptionSize); +} + + +std::vector const& LASVariableRecord::GetData() const +{ + return m_data; +} + +void LASVariableRecord::SetData(const std::vector& v) +{ + m_data = v; +} + +bool LASVariableRecord::equal(LASVariableRecord const& other) const +{ + return (m_recordId == other.m_recordId + && std::string(m_userId) == std::string(other.m_userId) + && std::string(m_desc) == std::string(other.m_desc) + && m_reserved == other.m_reserved + && m_recordLength == other.m_recordLength); +} + +uint32_t LASVariableRecord::GetTotalSize() const +{ + // Signature 2 bytes + // UserID 16 bytes + // RecordID 2 bytes + // RecordLength after Header 2 bytes + // Description 32 bytes + // Data length -- size of the data's vector * the size of uint8_t + std::size_t const sum = 2 + 16 + 2 + 2 + 32 + GetData().size() * sizeof(uint8_t); + return static_cast(sum); +} + +} // namespace liblas + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/laswriter.cpp work/libLAS-1.2.1/src/laswriter.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/laswriter.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/laswriter.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,108 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: LAS writer class + * Author: Mateusz Loskot, mateusz@loskot.net + * + ****************************************************************************** + * Copyright (c) 2008, Mateusz Loskot + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided + * with the distribution. + * * Neither the name of the Martin Isenburg or Iowa Department + * of Natural Resources nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + ****************************************************************************/ + +#include +#include +// std +#include +#include +#include +#include // std::memset +#include + +namespace liblas +{ + +LASWriter::LASWriter(std::ostream& ofs, LASHeader const& header) : + m_pimpl(detail::WriterFactory::Create(ofs, header)), m_header(header) +{ + m_pimpl->WriteHeader(m_header); +} + +LASWriter::~LASWriter() +{ + assert(0 != m_pimpl.get()); + + m_pimpl->UpdateHeader(m_header); +} + +std::size_t LASWriter::GetVersion() const +{ + return m_pimpl->GetVersion(); +} + +LASHeader const& LASWriter::GetHeader() const +{ + return m_header; +} + +bool LASWriter::WritePoint(LASPoint const& point) +{ + if (!point.IsValid()) + { + return false; + } + + m_pimpl->WritePointRecord(point, m_header); + + return true; +} + +std::ostream& LASWriter::GetStream() const +{ + return m_pimpl->GetStream(); +} + +void LASWriter::WriteHeader(LASHeader& header) +{ + m_pimpl->WriteHeader(header); + m_header = header; +} + +bool LASWriter::SetSRS(const LASSpatialReference& srs) +{ + m_pimpl->SetSRS(srs); + return true; +} + + +} // namespace liblas + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/Makefile.am work/libLAS-1.2.1/src/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,41 @@ + +SUBDIRS = . + +if GDAL_IS_CONFIG +GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 +endif + +if GEOTIFF_IS_CONFIG +GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 +endif + +AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail + +lib_LTLIBRARIES = liblas.la + +liblas_la_SOURCES = \ + laserror.cpp \ + laspoint.cpp \ + lasheader.cpp \ + lasvariablerecord.cpp \ + lasreader.cpp \ + laswriter.cpp \ + lasfile.cpp \ + las_c_api.cpp \ + lascolor.cpp \ + lasspatialreference.cpp \ + detail/reader.cpp \ + detail/reader10.cpp \ + detail/reader11.cpp \ + detail/reader12.cpp \ + detail/writer.cpp \ + detail/writer10.cpp \ + detail/writer11.cpp \ + detail/writer12.cpp \ + detail/file.cpp + +if GDAL_IS_CONFIG +liblas_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp +endif + +liblas_la_LDFLAGS = -version-info 1:0:0 diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/makefile.vc work/libLAS-1.2.1/src/makefile.vc --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/makefile.vc 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/makefile.vc 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,65 @@ +# $Id$ +# +LAS_ROOT = .. + +!INCLUDE $(LAS_ROOT)\nmake.opt + +LAS_OBJS = \ + lascolor.obj \ + laswriter.obj \ + lasreader.obj \ + laserror.obj \ + las_c_api.obj \ + laspoint.obj \ + lasheader.obj \ + lasfile.obj \ + lasspatialreference.obj \ + lasvariablerecord.obj \ + detail\reader.obj \ + detail\reader10.obj \ + detail\reader11.obj \ + detail\reader12.obj \ + detail\writer.obj \ + detail\writer10.obj \ + detail\writer11.obj \ + detail\writer12.obj \ + detail\file.obj + +RES = Version.res + +default: $(LAS_DLL) $(RES) + +all: default + +$(LAS_LIB): $(LAS_OBJS) + if exist $(LAS_LIB) del $(LAS_LIB) + $(LINK) /lib /nologo /out:$(LAS_LIB) $(LAS_OBJS) $(GEOTIFF_LIB) $(GDAL_LIB) + +$(LAS_DLL): $(LAS_LIB) $(RES) + $(LINK) /dll \ + $(LAS_OBJS) $(LAS_LIB) Version.res \ + /out:$(LAS_DLL) /implib:$(LAS_LIB_DLL) + if exist $(LAS_DLL).manifest mt -manifest $(LAS_DLL).manifest -outputresource:$(LAS_DLL);2 + +Version.res: + rc -fo Version.res -r -I..\include\liblas\capi -I..\include -D_MSC_VER Version.rc + +clean: + -del *.bak + -del *.dll + -del *.exp + -del *.lib + -del *.obj + -del *.manifest + -del *.res + for %d in ( $(LAS_OBJS) ) do \ + del %d + -del $(PYDLL_DIR)\$(LAS_DLL) + -del $(PYDLL_DIR)\DLLs\$(LAS_DLL) + +install: $(LAS_DLL) + echo $(BINDIR) + xcopy /y /r /d /f $(LAS_DLL) $(BINDIR) + xcopy /y /r /d /f $(LAS_DLL) $(OSGEO4W_DIR)\lib\bin + xcopy /y /r /d /f $(LAS_DLL) $(PYDLL_DIR) + xcopy /y /r /d /f $(LAS_DLL) $(PYDLL_DIR)\DLLs diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/tifvsi.cpp work/libLAS-1.2.1/src/tifvsi.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/tifvsi.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/tifvsi.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,151 @@ +/****************************************************************************** + * $Id: tifvsi.cpp 10645 2007-01-18 02:22:39Z warmerdam $ + * + * Project: GeoTIFF Driver + * Purpose: Implement system hook functions for libtiff on top of CPL/VSI, + * including > 2GB support. Based on tif_unix.c from libtiff + * distribution. + * Author: Frank Warmerdam, warmerdam@pobox.com + * + ****************************************************************************** + * Copyright (c) 2005, Frank Warmerdam, warmerdam@pobox.com + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************/ + +/* + * TIFF Library UNIX-specific Routines. + */ +#include "tiffio.h" +#include "cpl_vsi.h" + +// We avoid including xtiffio.h since it drags in the libgeotiff version +// of the VSI functions. + +CPL_C_START +extern TIFF CPL_DLL * XTIFFClientOpen(const char* name, const char* mode, + thandle_t thehandle, + TIFFReadWriteProc, TIFFReadWriteProc, + TIFFSeekProc, TIFFCloseProc, + TIFFSizeProc, + TIFFMapFileProc, TIFFUnmapFileProc); +CPL_C_END + +static tsize_t +_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size) +{ + return VSIFReadL( buf, 1, size, (FILE *) fd ); +} + +static tsize_t +_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size) +{ + return VSIFWriteL( buf, 1, size, (FILE *) fd ); +} + +static toff_t +_tiffSeekProc(thandle_t fd, toff_t off, int whence) +{ + if( VSIFSeekL( (FILE *) fd, off, whence ) == 0 ) + return (toff_t) VSIFTellL( (FILE *) fd ); + else + return (toff_t) -1; +} + +static int +_tiffCloseProc(thandle_t fd) +{ + return VSIFCloseL( (FILE *) fd ); +} + +static toff_t +_tiffSizeProc(thandle_t fd) +{ + vsi_l_offset old_off; + toff_t file_size; + + old_off = VSIFTellL( (FILE *) fd ); + VSIFSeekL( (FILE *) fd, 0, SEEK_END ); + + file_size = (toff_t) VSIFTellL( (FILE *) fd ); + VSIFSeekL( (FILE *) fd, old_off, SEEK_SET ); + + return file_size; +} + +static int +_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize) +{ + (void) fd; (void) pbase; (void) psize; + return (0); +} + +static void +_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size) +{ + (void) fd; (void) base; (void) size; +} + +/* + * Open a TIFF file for read/writing. + */ +TIFF* VSI_TIFFOpen(const char* name, const char* mode) +{ + static const char module[] = "TIFFOpen"; + int i, a_out; + char access[32]; + FILE *fp; + TIFF *tif; + + a_out = 0; + access[0] = '\0'; + for( i = 0; mode[i] != '\0'; i++ ) + { + if( mode[i] == 'r' + || mode[i] == 'w' + || mode[i] == '+' + || mode[i] == 'a' ) + { + access[a_out++] = mode[i]; + access[a_out] = '\0'; + } + } + + strcat( access, "b" ); + + fp = VSIFOpenL( name, access ); + if (fp == NULL) { + if( errno >= 0 ) + TIFFError(module,"%s: %s", name, VSIStrerror( errno ) ); + else + TIFFError(module, "%s: Cannot open", name); + return ((TIFF *)0); + } + + tif = XTIFFClientOpen(name, mode, + (thandle_t) fp, + _tiffReadProc, _tiffWriteProc, + _tiffSeekProc, _tiffCloseProc, _tiffSizeProc, + _tiffMapProc, _tiffUnmapProc); + + if( tif == NULL ) + VSIFCloseL( fp ); + + return tif; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/Version.rc work/libLAS-1.2.1/src/Version.rc --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/src/Version.rc 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/src/Version.rc 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,100 @@ +/****************************************************************************** + * $Id$ + * + * Project: libLAS - http://liblas.org - A BSD library for LAS format data. + * Purpose: libLAS DLL registration information + * Author: Howard Butler, hobu.inc@gmail.com + * + ****************************************************************************** + * This script is derived from the GDAL Version.rc script in the GDAL + * source code. The copyright on the file was as follows: + + * Project: GDAL Core + * Purpose: GDAL DLL registration information. + * Author: Martin Daly (Cadcorp) + * + * Copyright assignment provided by Martin Daly by email, "Be my guest. Fame! + * At last! Best not let it go to my head, eh?" + * + * Copyright (c) 2005, Frank Warmerdam + * + * All rights reserved. + * + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + ****************************************************************************/ + + +#define APSTUDIO_HIDDEN_SYMBOLS +#include +#undef APSTUDIO_HIDDEN_SYMBOLS +#include + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +#include "las_version.h" + +#ifndef _MAC + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION LIBLAS_VERSION_MAJOR,LIBLAS_VERSION_MINOR,LIBLAS_VERSION_REV,LIBLAS_VERSION_BUILD + PRODUCTVERSION LIBLAS_VERSION_MAJOR,LIBLAS_VERSION_MINOR,LIBLAS_VERSION_REV,LIBLAS_VERSION_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", "Hobu, Inc.\0" + VALUE "FileDescription", "libLAS - LAS 1.0/1.1 ASPRS LiDAR data translation toolset\0" + VALUE "FileVersion", LIBLAS_RELEASE_NAME "\0" + VALUE "InternalName", "libLAS\0" + VALUE "LegalCopyright", "See LICENSE.TXT" + VALUE "ProductName", "libLAS\0" + VALUE "ProductVersion", LIBLAS_RELEASE_NAME "\0" + VALUE "WebPage", "http://liblas.org/\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + +#endif // !_MAC + +#endif // Neutral resources diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/CMakeLists.txt work/libLAS-1.2.1/test/CMakeLists.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/CMakeLists.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,5 @@ +# $Id$ +# +# List of test and sample programs subprojects +# +SUBDIRS( unit ) Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.0_0.las and work/libLAS-1.2.1/test/data/1.0_0.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.0_1.las and work/libLAS-1.2.1/test/data/1.0_1.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.1_0.las and work/libLAS-1.2.1/test/data/1.1_0.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.1_1.las and work/libLAS-1.2.1/test/data/1.1_1.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.2_0.las and work/libLAS-1.2.1/test/data/1.2_0.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.2_1.las and work/libLAS-1.2.1/test/data/1.2_1.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.2_2.las and work/libLAS-1.2.1/test/data/1.2_2.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/1.2_3.las and work/libLAS-1.2.1/test/data/1.2_3.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/bad_points_1.1.las and work/libLAS-1.2.1/test/data/bad_points_1.1.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/lots_of_vlr.las and work/libLAS-1.2.1/test/data/lots_of_vlr.las differ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/make_bad_points.py work/libLAS-1.2.1/test/data/make_bad_points.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/make_bad_points.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/data/make_bad_points.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,22 @@ +from liblas import file +from liblas import header +from liblas import point + +import datetime + +h = header.Header() +h.date = datetime.datetime.now() +h.dataformat_id = 1 + +f = file.File('bad_points_1.1.las', mode='w', header=h) + +p = point.Point() +p.flightline_edge = 3 +p.return_number = 3 +p.classification = 63 +p.scan_angle = -127 + +#p.time = datetime.datetime(1969, 12, 31, 17, 59, 59, 2) + +f.write(p) +f.close() diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/make_data.py work/libLAS-1.2.1/test/data/make_data.py --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/make_data.py 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/data/make_data.py 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,61 @@ +#!/usr/bin/env python + +from liblas import file +from liblas import header +from liblas import point +from liblas import color +from liblas import srs +from liblas import guid + +import datetime + +p = point.Point() +p.flightline_edge = 0 +p.return_number = 1 +p.classification = 0 +p.scan_angle = -13 +p.x = 470692.447538 +p.y = 4602888.904642 +p.z = 16.0 +c = color.Color() + +c.red=255 +c.green=12 +c.blue=234 +p.color = c +p.time = datetime.datetime(2008,3,19) +p.classification = 2 +p.return_number = 2 + +s = srs.SRS() +s.proj4 = '+proj=utm +zone=15 +ellps=NAD83 +datum=NAD83 +units=m +no_defs ' + +g = guid.GUID(key='8388f1b8-aa1b-4108-bca3-6bc68e7b062e') +number_of_points = 1 + +def write_file(version, format): + h = header.Header() + h.guid = g + h.date = datetime.datetime.now() + h.dataformat_id = format + h.major_version = 1 + h.minor_version = version + h.min = [p.x, p.y, p.z] + h.max = [p.x, p.y, p.z] + h.point_return_count = [0L, number_of_points, 0L, 0L, 0L, 0L, 0L, 0L] + h.srs = s + h.date = p.time + + f = file.File('1.%d_%d.las'%(version,format), mode='w', header=h) + for i in xrange(number_of_points): + f.write(p) + f.close() + +write_file(0,0) +write_file(0,1) +write_file(1,0) +write_file(1,1) +write_file(2,0) +write_file(2,1) +write_file(2,2) +write_file(2,3) \ No newline at end of file Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/srs_utm17.las and work/libLAS-1.2.1/test/data/srs_utm17.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/srs.las and work/libLAS-1.2.1/test/data/srs.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/TO_core_last_clip.las and work/libLAS-1.2.1/test/data/TO_core_last_clip.las differ Files /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/data/TO_core_last_zoom.las and work/libLAS-1.2.1/test/data/TO_core_last_zoom.las differ diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/Makefile.am work/libLAS-1.2.1/test/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1 @@ +SUBDIRS = unit diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/CMakeLists.txt work/libLAS-1.2.1/test/sample/CMakeLists.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/CMakeLists.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,19 @@ +# $Id$ +# +# Build sample programs +# +SET( SAMPLE_READ sample_read ) +SET( SAMPLE_WRITE sample_write ) +SET( SAMPLE_FILES sample_files ) + +INCLUDE_DIRECTORIES( + ../../include +) + +ADD_EXECUTABLE( ${SAMPLE_READ} read.cpp ) +ADD_EXECUTABLE( ${SAMPLE_WRITE} write.cpp ) +ADD_EXECUTABLE( ${SAMPLE_FILES} files.cpp ) + +TARGET_LINK_LIBRARIES( ${SAMPLE_READ} ${LIBLAS_LIB_NAME} ) +TARGET_LINK_LIBRARIES( ${SAMPLE_WRITE} ${LIBLAS_LIB_NAME} ) +TARGET_LINK_LIBRARIES( ${SAMPLE_FILES} ${LIBLAS_LIB_NAME} ) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/files.cpp work/libLAS-1.2.1/test/sample/files.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/files.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/files.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,85 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif +// liblas +#include +#include +#include +//std +#include +#include +#include +#include +#include + +// Reports object of LASFile +void print_file(liblas::LASFile& f) +{ + if (f.IsNull()) + { + std::cout << "{ null file }\n"; + } + else + { + std::cout << "{ name: " << f.GetName() << "; mode: " << f.GetMode() << "; signature: "; + + if (f.GetMode() == liblas::LASFile::eRead) + std::cout << f.GetReader().GetHeader().GetFileSignature(); + else + std::cout << f.GetWriter().GetHeader().GetFileSignature(); + + std::cout << " }\n"; + } +} + +int main() +{ + using liblas::LASFile; + + try + { + { + LASFile f; + { + LASFile f0; + LASFile f1("test2.las", liblas::LASHeader(), liblas::LASFile::eWrite); + LASFile f2("test.las"); // throws if file missing + + std::list files; + files.push_back(f0); + files.push_back(f1); + files.push_back(f2); + + std::for_each(files.begin(), files.end(), print_file); + + f = f1; // save + + liblas::LASPoint p; + p.SetCoordinates(10, 20, 30); + f.GetWriter().WritePoint(p); + + files.clear(); // get rid of all but f1 (now f) + } + + print_file(f); // f (previously f1) is still alive + + } // f goes to hell and header gots updated here + } + catch (std::exception const& e) + { + std::cout << "Error: " << e.what() << std::endl; + } + catch (...) + { + std::cerr << "Unknown error\n"; + } + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/files.vcproj work/libLAS-1.2.1/test/sample/files.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/files.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/files.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/liblas_sample.sln work/libLAS-1.2.1/test/sample/liblas_sample.sln --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/liblas_sample.sln 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/liblas_sample.sln 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,56 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write", "write.vcproj", "{EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblas_lib", "..\..\build\msvc80\liblas_lib\liblas_lib.vcproj", "{208417AE-D08E-4938-AC26-A16ABD55AA5B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "read", "read.vcproj", "{15D6F951-5F44-4419-907C-9201C2032E24}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "files", "files.vcproj", "{8A972A6C-548E-4FBF-9105-B68A03CE558D}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "update", "update.vcproj", "{EF79B8E2-6AE2-4F55-95EE-22395877B058}" + ProjectSection(ProjectDependencies) = postProject + {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Debug|Win32.Build.0 = Debug|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Release|Win32.ActiveCfg = Release|Win32 + {EC1C23B9-D9DF-48BA-9FB4-8A439D6006B9}.Release|Win32.Build.0 = Release|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Debug|Win32.ActiveCfg = Debug|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Debug|Win32.Build.0 = Debug|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Release|Win32.ActiveCfg = Release|Win32 + {208417AE-D08E-4938-AC26-A16ABD55AA5B}.Release|Win32.Build.0 = Release|Win32 + {15D6F951-5F44-4419-907C-9201C2032E24}.Debug|Win32.ActiveCfg = Debug|Win32 + {15D6F951-5F44-4419-907C-9201C2032E24}.Debug|Win32.Build.0 = Debug|Win32 + {15D6F951-5F44-4419-907C-9201C2032E24}.Release|Win32.ActiveCfg = Release|Win32 + {15D6F951-5F44-4419-907C-9201C2032E24}.Release|Win32.Build.0 = Release|Win32 + {8A972A6C-548E-4FBF-9105-B68A03CE558D}.Debug|Win32.ActiveCfg = Debug|Win32 + {8A972A6C-548E-4FBF-9105-B68A03CE558D}.Debug|Win32.Build.0 = Debug|Win32 + {8A972A6C-548E-4FBF-9105-B68A03CE558D}.Release|Win32.ActiveCfg = Release|Win32 + {8A972A6C-548E-4FBF-9105-B68A03CE558D}.Release|Win32.Build.0 = Release|Win32 + {EF79B8E2-6AE2-4F55-95EE-22395877B058}.Debug|Win32.ActiveCfg = Debug|Win32 + {EF79B8E2-6AE2-4F55-95EE-22395877B058}.Debug|Win32.Build.0 = Debug|Win32 + {EF79B8E2-6AE2-4F55-95EE-22395877B058}.Release|Win32.ActiveCfg = Release|Win32 + {EF79B8E2-6AE2-4F55-95EE-22395877B058}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/liblas.vsprops work/libLAS-1.2.1/test/sample/liblas.vsprops --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/liblas.vsprops 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/liblas.vsprops 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,16 @@ + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/read.cpp work/libLAS-1.2.1/test/sample/read.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/read.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/read.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,111 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif +// liblas +#include +#include +#include +#include +#include +//std +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// sample +#include "utility.hpp" +using namespace std; + +int main() +{ + try + { + //char const* name = "d:\\data\\lidar\\LASFile_1.LAS"; + //char const* name = "d:\\data\\lidar\\LDR030828_213450_0.LAS"; + //char const* name = "d:\\data\\lidar\\Sample_LiDAR_LAS_File.las"; // 1.1 + //char const* name = "d:\\data\\lidar\\Serpent_Mound_Model.las"; + //char const* name = "d:\\data\\lidar\\gilmer\\000001.las"; + //char const* name = "d:\\data\\lidar\\iowa\\04164492.las"; + //char const* name = "d:\\dev\\liblas\\_svn\\trunk\\test\\data\\TO_core_last_clip.las"; + char const* name = "test.las"; + + std::ifstream ifs; + if (!liblas::Open(ifs, name)) + { + throw std::runtime_error(std::string("Can not open ") + name); + } + liblas::LASReader reader(ifs); + liblas::LASHeader const& h = reader.GetHeader(); + + cout << "File name: " << name << '\n'; + cout << "Version : " << reader.GetVersion() << '\n'; + cout << "Signature: " << h.GetFileSignature() << '\n'; + cout << "Format : " << h.GetDataFormatId() << '\n'; + cout << "Project : " << h.GetProjectId() << '\n'; + cout << "Points count: " << h.GetPointRecordsCount() << '\n'; + cout << "VLRecords count: " << h.GetRecordsCount() << '\n'; + cout << "Points by return: "; + std::copy(h.GetPointRecordsByReturnCount().begin(), + h.GetPointRecordsByReturnCount().end(), + ostream_iterator(std::cout, " ")); + cout << std::endl; + + liblas::detail::Timer t; + t.start(); + + typedef std::pair minmax_t; + minmax_t mx; + minmax_t my; + minmax_t mz; + liblas::uint32_t i = 0; + while (reader.ReadNextPoint()) + { + liblas::LASPoint const& p = reader.GetPoint(); + + mx.first = std::min(mx.first, p[0]); + mx.second = std::max(mx.second, p[0]); + my.first = std::min(my.first, p[1]); + my.second = std::max(my.second, p[1]); + mz.first = std::min(mz.first, p[2]); + mz.second = std::max(mz.second, p[2]); + + // Warning: Printing zillion of points may take looong time + //cout << i << ". " << p << '\n'; + i++; + } + double const d = t.stop(); + + if (reader.GetHeader().GetPointRecordsCount() != i) + throw std::runtime_error("read incorrect number of point records"); + + cout << "Read points: " << i << " (" << d << ")\n" + << std::fixed << std::setprecision(6) + << "\nX: " << mx + << "\nY: " << my + << "\nZ: " << mz + << std::endl; + } + catch (std::exception const& e) + { + std::cout << "Error: " << e.what() << std::endl; + } + catch (...) + { + std::cerr << "Unknown error\n"; + } + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/read.vcproj work/libLAS-1.2.1/test/sample/read.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/read.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/read.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/update.cpp work/libLAS-1.2.1/test/sample/update.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/update.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/update.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,79 @@ +// $Id$ +// +// (C) Copyright Howard Butler 2008 +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif +#include +#include +#include +#include +#include + +#include +#include +#include +//#include +#include + +#include +#include + +int main() +{ + using namespace liblas; + + LASFile f; + f = LASFile("TO_core_last_clip.las"); + + try + { + char const* name = "TO_core_last_clip.las"; + + std::ios::openmode const write_mode = std::ios::out | std::ios::binary | std::ios::ate; + std::ios::openmode const read_mode = std::ios::in | std::ios::binary; + + std::ifstream *ifs = new std::ifstream(name, read_mode); + LASReader *reader = new LASReader(*ifs); + + LASHeader hdr = reader->GetHeader(); + + std::string s = hdr.GetSoftwareId(); + std::string::size_type a = s.size(); + a = s.capacity(); + std::string s1 = hdr.GetSoftwareId(true); +a = s1.size(); +a = s1.capacity(); + + hdr.SetVersionMajor(1); + hdr.SetVersionMinor(0); + hdr.SetSoftwareId("hobu"); + hdr.SetDataFormatId(LASHeader::ePointFormat0); + hdr.SetPointRecordsCount(1000); // should be corrected automatically by writer + + ifs->close(); + + std::ofstream *ofs = new std::ofstream(name, write_mode); + + liblas::LASWriter writer(*ofs, hdr); + + liblas::LASPoint p; + p.SetCoordinates(10, 20, 30); + + writer.WritePoint(p); + } + catch (std::exception const& e) + { + std::cerr << "Error: " << e.what() << std::endl; + } + catch (...) + { + std::cerr << "Unknown error\n"; + } + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/update.vcproj work/libLAS-1.2.1/test/sample/update.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/update.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/update.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/utility.hpp work/libLAS-1.2.1/test/sample/utility.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/utility.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/utility.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,91 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#ifndef LIBLAS_SAMPLE_UTILITY_HPP_INCLUDED +#define LIBLAS_SAMPLE_UTILITY_HPP_INCLUDED +// std +#include +#include +// Forward declarations +namespace liblas { + class LASPoint; +} + +template +inline std::ostream& operator<<(std::ostream& os, typename std::pair const& p) +{ + os << p.first << " " << p.second; + return os; +} + +inline std::ostream& operator<<(std::ostream& os, liblas::LASPoint const& p) +{ + os << std::fixed << std::setprecision(6) + << "\nx: " << p.GetX() + << "\ny: " << p.GetY() + << "\nz: " << p.GetZ() + << "\nint: " << p.GetIntensity() + << "\nrn: " << p.GetReturnNumber() + << "\nnor: " << p.GetNumberOfReturns() + << "\nsd: " << p.GetScanDirection() + << "\neofl: " << p.GetFlightLineEdge() + << "\ntime: " << p.GetTime() + << std::endl; + + return os; +} + +inline void print_point(std::ostream& os, liblas::LASPoint const& p, liblas::uint8_t const& minor) +{ + os << std::fixed << std::setprecision(6) + << "\nx: " << p.GetX() + << "\ny: " << p.GetY() + << "\nz: " << p.GetZ() + << "\nint: " << p.GetIntensity() + << "\nrn: " << p.GetReturnNumber() + << "\nnor: " << p.GetNumberOfReturns() + << "\nsd: " << p.GetScanDirection() + << "\neofl: " << p.GetFlightLineEdge() + << "\ntime: " << p.GetTime(); + + if (1 == minor) + { + const int len = 13; + static std::string meaning[len] = + { + "Created, never classified", + "Unclassified", + "Ground", + "Low Vegetation", + "Medium Vegetation", + "High Vegetation", + "Building", + "Low Point (noise)", + "Model Key-point (mass point)", + "Water", + "Reserved for ASPRS Definition", + "Reserved for ASPRS Definition", + "Overlap Points", + }; + + // bit 0:4 + liblas::uint8_t chClass = p.GetClassification(); + unsigned int idx = (unsigned int)((chClass >> 3) & 0x1F); + std::cout << "\nClassification: " + << ((idx >= 0 && idx < len) ? meaning[idx] : "Reserved for ASPRS Definition"); + std::cout << "\n- Synthetic: " << ((1 == (short)((chClass >> 2) & 0x1)) ? -1 : 0); + std::cout << "\n- Model_Key_Point: " << ((1 == (short)((chClass >> 1) & 0x1)) ? -1 : 0); + std::cout << "\n- Withheld: " << ((1 == (short)(chClass & 0x1)) ? -1 : 0); + } + else + { + std::cout << "\ncls: " << (int)p.GetClassification(); + } + std::cout << std::endl; +} + +#endif // LIBLAS_SAMPLE_UTILITY_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/write.cpp work/libLAS-1.2.1/test/sample/write.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/write.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/write.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,68 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#if defined(_MSC_VER) && defined(USE_VLD) +#include +#endif +// liblas +#include +#include +#include +#include +#include +// std +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// sample +#include "utility.hpp" +using namespace std; + +int main() +{ + using liblas::LASHeader; + + try + { + char const* name = "test.las"; + + std::ofstream ofs; + if (!liblas::Create(ofs, name)) + { + throw std::runtime_error(std::string("Can not create ") + name); + } + + liblas::LASHeader hdr; + hdr.SetVersionMajor(1); + hdr.SetVersionMinor(1); + hdr.SetDataFormatId(LASHeader::ePointFormat1); + hdr.SetPointRecordsCount(1000); // should be corrected automatically by writer + liblas::LASWriter writer(ofs, hdr); + + liblas::LASPoint p; + p.SetCoordinates(10, 20, 30); + + writer.WritePoint(p); + } + catch (std::exception const& e) + { + std::cerr << "Error: " << e.what() << std::endl; + } + catch (...) + { + std::cerr << "Unknown error\n"; + } + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/write.vcproj work/libLAS-1.2.1/test/sample/write.vcproj --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/sample/write.vcproj 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/sample/write.vcproj 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/CMakeLists.txt work/libLAS-1.2.1/test/unit/CMakeLists.txt --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/CMakeLists.txt 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,31 @@ +# $Id$ +# +# Build libLAS unit test suite +# +SET( LIBLAS_TEST liblas_test ) + +SET( LIBLAS_TEST_SRC + common.cpp + guid_test.cpp + laserror_test.cpp + lasfile_test.cpp + lasheader_test.cpp + laspoint_test.cpp + lasreader_iterator_test.cpp + lasreader_test.cpp + lasvariablerecord_test.cpp + laswriter_test.cpp + liblas_test_suite.cpp +) + +INCLUDE_DIRECTORIES( + . + ../../include +) + +ADD_EXECUTABLE( ${LIBLAS_TEST} ${LIBLAS_TEST_SRC} ) + +TARGET_LINK_LIBRARIES( ${LIBLAS_TEST} ${LIBLAS_LIB_NAME} ) + +# TODO: Needs to tweak the executable path +ADD_TEST(liblas_test ${EXECUTABLE_OUTPUT_PATH}/liblas_test) diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/common.cpp work/libLAS-1.2.1/test/unit/common.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/common.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/common.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,202 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include "common.hpp" + +namespace tut +{ + +void test_default_header(liblas::LASHeader const& h) +{ + using liblas::LASHeader; + + ensure_equals("wrong default file signature", + h.GetFileSignature(), LASHeader::FileSignature); + + ensure_equals("wrong default file source id", + h.GetFileSourceId(), 0); + ensure_equals("wrong default reserved value", + h.GetReserved(), 0); + + liblas::guid g; + ensure_equals("wrong default project guid", + h.GetProjectId(), g); + + ensure_equals("wrong default major version", + h.GetVersionMajor(), 1); + ensure_equals("wrong default minor version", + h.GetVersionMinor(), 2); + + ensure_equals("wrong default system id", + h.GetSystemId(), LASHeader::SystemIdentifier); + ensure_equals("wrong default software id", + h.GetSoftwareId(), LASHeader::SoftwareIdentifier); + + // TODO: Fix me to use todays day # and year + // ensure_equals("wrong default creation day-of-year", + // h.GetCreationDOY(), 0); + // ensure_equals("wrong default creation year", + // h.GetCreationYear(), 0); + ensure_equals("wrong default header size", + h.GetHeaderSize(), liblas::uint16_t(227)); + + liblas::uint32_t offset = 229; + if (h.GetVersionMinor() == 1 || h.GetVersionMinor() == 2) + { + offset = 227; + } + ensure_equals("wrong default data offset", + h.GetDataOffset(), offset); + + ensure_equals("wrong default records count", + h.GetRecordsCount(), liblas::uint32_t(0)); + ensure_equals("wrong default data format id", + h.GetDataFormatId(), LASHeader::ePointFormat0); + ensure_equals("wrong default data record length", + h.GetDataRecordLength(), LASHeader::ePointSize0); + ensure_equals("wrong default point records count", + h.GetPointRecordsCount(), liblas::uint32_t(0)); + + ensure_equals("wrong default X scale", h.GetScaleX(), double(0.01)); + ensure_equals("wrong default Y scale", h.GetScaleY(), double(0.01)); + ensure_equals("wrong default Z scale", h.GetScaleZ(), double(0.01)); + + ensure_equals("wrong default X offset", h.GetOffsetX(), double(0)); + ensure_equals("wrong default Y offset", h.GetOffsetY(), double(0)); + ensure_equals("wrong default Z offset", h.GetOffsetZ(), double(0)); + + ensure_equals("wrong default min X", h.GetMinX(), double(0)); + ensure_equals("wrong default max X", h.GetMaxX(), double(0)); + ensure_equals("wrong default min Y", h.GetMinY(), double(0)); + ensure_equals("wrong default max Y", h.GetMaxY(), double(0)); + ensure_equals("wrong default min Z", h.GetMinZ(), double(0)); + ensure_equals("wrong default max Z", h.GetMaxZ(), double(0)); +} + +void test_default_point(liblas::LASPoint const& p) +{ + ensure_equals("wrong default X coordinate", + p.GetX(), double(0)); + ensure_equals("wrong default Y coordinate", + p.GetY(), double(0)); + ensure_equals("wrong default Z coordinate", + p.GetZ(), double(0)); + ensure_equals("wrong defualt intensity", + p.GetIntensity(), 0); + ensure_equals("wrong defualt return number", + p.GetReturnNumber(), 0); + ensure_equals("wrong defualt number of returns", + p.GetNumberOfReturns(), 0); + ensure_equals("wrong defualt scan direction", + p.GetScanDirection(), 0); + ensure_equals("wrong defualt edge of flight line", + p.GetFlightLineEdge(), 0); + ensure_equals("wrong defualt classification", + p.GetClassification(), 0); + ensure_equals("wrong defualt scan angle rank", + p.GetScanAngleRank(), 0); + ensure_equals("wrong defualt file marker/user data value", + p.GetUserData(), 0); + ensure_equals("wrong defualt user bit field/point source id value", + p.GetPointSourceID(), 0); + ensure_equals("wrong defualt time", + p.GetTime(), double(0)); + + ensure_equals("invalid default red color", + p.GetColor().GetRed(), 0); + ensure_equals("invalid default green color", + p.GetColor().GetGreen(), 0); + ensure_equals("invalid default blue color", + p.GetColor().GetBlue(), 0); + + ensure("invalid defualt point record", p.IsValid()); +} + +void test_file10_header(liblas::LASHeader const& h) +{ + ensure_equals(h.GetFileSignature(), liblas::LASHeader::FileSignature); + ensure_equals(h.GetFileSourceId(), 0); + ensure_equals(h.GetReserved(), 0); + + liblas::guid g; + ensure(g.is_null()); + ensure_equals(h.GetProjectId(), g); + + ensure_equals(h.GetVersionMajor(), 1); + ensure_equals(h.GetVersionMinor(), 0); + ensure_equals(h.GetSystemId(), std::string("")); + ensure_equals(h.GetSoftwareId(), std::string("TerraScan")); + ensure_equals(h.GetCreationDOY(), 0); + ensure_equals(h.GetCreationYear(), 0); + ensure_equals(h.GetHeaderSize(), liblas::uint16_t(227)); + ensure_equals(h.GetDataOffset(), liblas::uint32_t(229)); + ensure_equals(h.GetRecordsCount(), liblas::uint32_t(0)); + ensure_equals(h.GetDataFormatId(), liblas::LASHeader::ePointFormat1); + ensure_equals(h.GetDataRecordLength(), liblas::LASHeader::ePointSize1); + ensure_equals(h.GetPointRecordsCount(), liblas::uint32_t(8)); + ensure_equals(h.GetScaleX(), double(0.01)); + ensure_equals(h.GetScaleY(), double(0.01)); + ensure_equals(h.GetScaleZ(), double(0.01)); + ensure_equals(h.GetOffsetX(), double(-0)); + ensure_equals(h.GetOffsetY(), double(-0)); + ensure_equals(h.GetOffsetZ(), double(-0)); + ensure_equals(h.GetMinX(), double(630262.3)); + ensure_equals(h.GetMaxX(), double(630346.83)); + ensure_equals(h.GetMinY(), double(4834500)); + ensure_equals(h.GetMaxY(), double(4834500)); + ensure_equals(h.GetMinZ(), double(50.9)); + ensure_equals(h.GetMaxZ(), double(55.26)); +} + +void test_file10_point1(liblas::LASPoint const& p) +{ + ensure_distance(p.GetX(), double(630262.30), 0.0001); + ensure_distance(p.GetY(), double(4834500), 0.0001); + ensure_distance(p.GetZ(), double(51.53), 0.0001); + ensure_equals(p.GetIntensity(), 670); + ensure_equals(p.GetClassification(), liblas::uint8_t(1)); + ensure_equals(p.GetScanAngleRank(), 0); + ensure_equals(p.GetUserData(), 3); + ensure_equals(p.GetPointSourceID(), 0); + ensure_equals(p.GetScanFlags(), 9); + ensure_distance(p.GetTime(), double(413665.23360000004), 0.0001); +} + +void test_file10_point2(liblas::LASPoint const& p) +{ + ensure_distance(p.GetX(), double(630282.45), 0.0001); + ensure_distance(p.GetY(), double(4834500), 0.0001); + ensure_distance(p.GetZ(), double(51.63), 0.0001); + ensure_equals(p.GetIntensity(), 350); + ensure_equals(p.GetClassification(), 1); + ensure_equals(p.GetScanAngleRank(), 0); + ensure_equals(p.GetUserData(), 3); + ensure_equals(p.GetPointSourceID(), 0); + ensure_equals(p.GetScanFlags(), 9); + ensure_distance(p.GetTime(), double(413665.52880000003), 0.0001); +} + +void test_file10_point4(liblas::LASPoint const& p) +{ + ensure_distance(p.GetX(), double(630346.83), 0.0001); + ensure_distance(p.GetY(), double(4834500), 0.0001); + ensure_distance(p.GetZ(), double(50.90), 0.0001); + ensure_equals(p.GetIntensity(), 150); + ensure_equals(p.GetClassification(), 1); + ensure_equals(p.GetScanAngleRank(), 0); + ensure_equals(p.GetUserData(), 4); + ensure_equals(p.GetPointSourceID(), 0); + ensure_equals(p.GetScanFlags(), 18); + ensure_distance(p.GetTime(), double(414093.84360000002), 0.0001); +} + +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/common.hpp work/libLAS-1.2.1/test/unit/common.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/common.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/common.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,88 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include + + +namespace tut +{ + +// Predicate testing LASPoint against given XY coordinates +// and tolerance. +struct is_xy +{ + is_xy(double x, double y, double tolerance) + : x(x), y(y), t(tolerance) + {} + + bool operator()(liblas::LASPoint const& p) + { + double const dx = x - p.GetX(); + double const dy = y - p.GetY(); + + return ((dx <= t && dx >= -t) && (dy <= t && dy >= -t)); + } + + double x; + double y; + double t; +}; + +// Functor to calculate bounding box of a set of points +struct bbox_calculator +{ + // bbox object will store operation result + bbox_calculator(liblas::detail::Extents& bbox) + : empty(true), bbox(bbox) + {} + + void operator()(liblas::LASPoint const& p) + { + // Box initialization during first iteration only + if (empty) + { + bbox.min.x = bbox.max.x = p.GetX(); + bbox.min.y = bbox.max.y = p.GetY(); + bbox.min.z = bbox.max.z = p.GetZ(); + empty = false; + } + + // Expand bounding box to include given point + bbox.min.x = std::min(bbox.min.x, p.GetX()); + bbox.min.y = std::min(bbox.min.y, p.GetY()); + bbox.min.z = std::min(bbox.min.z, p.GetZ()); + bbox.max.x = std::max(bbox.max.x, p.GetX()); + bbox.max.y = std::max(bbox.max.y, p.GetY()); + bbox.max.z = std::max(bbox.max.z, p.GetZ()); + } + + bool empty; + liblas::detail::Extents& bbox; +}; + +// Common test procedure for default constructed point data. +void test_default_point(liblas::LASPoint const& p); + +// Common test procedure for default constructed header data. +void test_default_header(liblas::LASHeader const& h); + +// Test of header data in trunk/test/data/TO_core_last_clip.las file +void test_file10_header(liblas::LASHeader const& h); + +// Test of 1st point record in trunk/test/data/TO_core_last_clip.las file +void test_file10_point1(liblas::LASPoint const& p); + +// Test of 2nd point record in trunk/test/data/TO_core_last_clip.las file +void test_file10_point2(liblas::LASPoint const& p); + +// Test of 4th point record in trunk/test/data/TO_core_last_clip.las file +void test_file10_point4(liblas::LASPoint const& p); + +} // namespace tut + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/guid_test.cpp work/libLAS-1.2.1/test/unit/guid_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/guid_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/guid_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,181 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include // std::std::transform +#include // std::memset +#include // std::size_t +#include // std::toupper + +namespace tut +{ + struct guid_data + { + guid_data() + : m_dstr("00000000-0000-0000-0000-000000000000") + {} + + std::string m_dstr; + liblas::guid m_d; + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_guid("liblas::guid"); + + // Test default construction + template<> + template<> + void to::test<1>() + { + ensure(m_d.is_null()); + + std::size_t const len = 16; + ensure_equals(len, m_d.byte_count()); + + std::string s = m_d.to_string(); + ensure_equals(s, m_dstr); + + liblas::guid g; + ensure_equals(len, g.byte_count()); + ensure_equals(g, m_d); + } + + // Test construction from C string + template<> + template<> + void to::test<2>() + { + std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + liblas::guid g(s1.c_str()); + + ensure_not(g.is_null()); + ensure_not(m_d == g); + + std::string s2 = m_d.to_string(); + std::transform(s2.begin(), s2.end(), s2.begin(), (int(*)(int))std::toupper); + ensure_not(s1 == s2); + + s2 = g.to_string(); + std::transform(s2.begin(), s2.end(), s2.begin(), (int(*)(int))std::toupper); + ensure_equals(s2, s1); + } + + // Test construction from std::string + template<> + template<> + void to::test<3>() + { + std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + liblas::guid g(s1.c_str()); + + ensure_not(g.is_null()); + ensure_not(m_d == g); + + std::string s2 = g.to_string(); + std::transform(s2.begin(), s2.end(), s2.begin(), (int(*)(int))std::toupper); + ensure_equals(s2, s1); + } + + // Test construction from 4-2-2-8-bytes long fields + template<> + template<> + void to::test<4>() + { + liblas::uint32_t d1(0); + liblas::uint16_t d2(0); + liblas::uint16_t d3(0); + liblas::uint8_t d4[8] = { 0 }; + + liblas::guid g(d1, d2, d3, d4); + + ensure(g.is_null()); + ensure_equals(g, m_d); + + } + + // Test copy constructor + template<> + template<> + void to::test<5>() + { + liblas::guid g(m_d); + + ensure(g.is_null()); + ensure_equals(g, m_d); + + std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + liblas::guid g1(s1.c_str()); + + liblas::guid g2(g1); + ensure_equals(g2, g1); + } + + // Test assignment operator + template<> + template<> + void to::test<6>() + { + liblas::guid g; + ensure(g.is_null()); + + g = m_d; + ensure(g.is_null()); + ensure_equals(g, m_d); + + std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); + liblas::guid g1(s1.c_str()); + + liblas::guid g2; + ensure(g.is_null()); + ensure_equals(g, m_d); + + g2 = g1; + ensure_equals(g2, g1); + } + + // Test guid construction with 4-parts data + template<> + template<> + void to::test<7>() + { + std::string strguid("01234567-89ab-cdef-0123-456789abcdef"); + liblas::guid g1(strguid); + ensure_equals(g1.to_string(), strguid); + + // Binary representation of "01234567-89ab-cdef-0123-456789abcdef" + liblas::uint32_t n1 = 19088743; + liblas::uint16_t n2 = 35243; + liblas::uint16_t n3 = 52719; + liblas::uint8_t n4[8] = { 0 }; + n4[0] = 0x01; + n4[1] = 0x23; + n4[2] = 0x45; + n4[3] = 0x67; + n4[4] = 0x89; + n4[5] = 0xab; + n4[6] = 0xcd; + n4[7] = 0xef; + + liblas::guid g2(n1, n2, n3, n4); + ensure_equals(g1, g2); + + n1 = n2 = n3 = 0; + std::memset(n4, 0, 8); + + g2.output_data(n1, n2, n3, n4); + liblas::guid g3(n1, n2, n3, n4); + + ensure_equals(g1, g3); + ensure_equals(g2, g3); + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/laserror_test.cpp work/libLAS-1.2.1/test/unit/laserror_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/laserror_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/laserror_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,77 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include + +namespace tut +{ + struct laserror_data + { + int const code; + std::string const msg; + std::string const method; + + laserror_data() + : code(101), msg("Test message"), method("foo") + {} + + private: + // non-copyable type + laserror_data(laserror_data const&); + laserror_data& operator=(laserror_data const&); + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_laserror("liblas::LASError"); + + // Test constructor + template<> + template<> + void to::test<1>() + { + liblas::LASError err(code, msg, method); + + ensure_equals(err.GetCode(), code); + ensure_equals(err.GetMessage(), msg); + ensure_equals(err.GetMethod(), method); + } + + // Test copy constructor + template<> + template<> + void to::test<2>() + { + liblas::LASError err(code, msg, method); + liblas::LASError copy(err); + + ensure_equals(copy.GetCode(), code); + ensure_equals(copy.GetMessage(), msg); + ensure_equals(copy.GetMethod(), method); + } + + // Test assignment operator + template<> + template<> + void to::test<3>() + { + liblas::LASError copy(0, "", "");; + + { + liblas::LASError err(code, msg, method); + copy = err; + } + + ensure_equals(copy.GetCode(), code); + ensure_equals(copy.GetMessage(), msg); + ensure_equals(copy.GetMethod(), method); + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasfile_test.cpp work/libLAS-1.2.1/test/unit/lasfile_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasfile_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/lasfile_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,266 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include +#include "liblas_test.hpp" +#include "common.hpp" + +namespace tut +{ + struct lasfile_data + { + std::string tmpfile_; + std::string file10_; + + lasfile_data() + : tmpfile_(g_test_data_path + "//lasfile_tmp.las"), + file10_(g_test_data_path + "//TO_core_last_clip.las") + {} + + ~lasfile_data() + { + // remove temporary file after each test case + std::remove(tmpfile_.c_str()); + } + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_lasfile("liblas::LASFile"); + + // Test default constructor + template<> + template<> + void to::test<1>() + { + liblas::LASFile file; + ensure(file.IsNull()); + } + + // Test custom constructor + template<> + template<> + void to::test<2>() + { + liblas::LASFile file(file10_); + ensure_not(file.IsNull()); + + ensure_equals(file.GetName(), file10_); + ensure_equals(file.GetMode(), liblas::LASFile::eRead); + + liblas::LASHeader const& header1 = file.GetHeader(); + test_file10_header(header1); + + liblas::LASReader& reader = file.GetReader(); + liblas::LASHeader const& header2 = reader.GetHeader(); + test_file10_header(header2); + + try + { + liblas::LASWriter& writer = file.GetWriter(); + ensure_equals(writer.GetVersion(), liblas::eLASVersion10); + ensure("std::runtime_error not thrown", false); + } + catch (std::runtime_error const& e) + { + ensure_equals(std::string(e.what()).substr(0, 6), std::string("Writer")); + } + } + + // Test custom constructor + template<> + template<> + void to::test<3>() + { + liblas::LASHeader header; + + try + { + liblas::LASFile file(tmpfile_, header, liblas::LASFile::eRead); + ensure_equals(file.GetName(), tmpfile_); + ensure("std::runtime_error not thrown", false); + } + catch (std::runtime_error const& e) + { + ensure_equals(std::string(e.what()), + std::string("File mode must be eWrite or eAppend")); + } + } + + // Test custom constructor + template<> + template<> + void to::test<4>() + { + liblas::LASHeader header; + liblas::LASFile file(tmpfile_, header, liblas::LASFile::eWrite); + ensure_not(file.IsNull()); + ensure_equals(file.GetName(), tmpfile_); + ensure_equals(file.GetMode(), liblas::LASFile::eWrite); + + liblas::LASHeader const& header1 = file.GetHeader(); + test_default_header(header1); + + liblas::LASWriter& writer = file.GetWriter(); + liblas::LASHeader const& header2 = writer.GetHeader(); + test_default_header(header2); + + try + { + liblas::LASReader& reader = file.GetReader(); + ensure_equals(reader.GetVersion(), liblas::eLASVersion10); + ensure("std::runtime_error not thrown", false); + } + catch (std::runtime_error const& e) + { + ensure_equals(std::string(e.what()).substr(0, 6), std::string("Reader")); + } + } + + // Test copy constructor on default initialized object + template<> + template<> + void to::test<5>() + { + liblas::LASFile file; + ensure(file.IsNull()); + + liblas::LASFile file2(file); + ensure(file2.IsNull()); + } + + // Test assignment operator + template<> + template<> + void to::test<6>() + { + liblas::LASFile file; + ensure(file.IsNull()); + + liblas::LASFile file2; + file2 = file; + ensure(file2.IsNull()); + } + + // Test copy constructor on read-only file + template<> + template<> + void to::test<7>() + { + liblas::LASFile file(file10_); + + ensure_not(file.IsNull()); + ensure_equals(file.GetName(), file10_); + ensure_equals(file.GetMode(), liblas::LASFile::eRead); + + liblas::LASHeader const& header1 = file.GetHeader(); + test_file10_header(header1); + + liblas::LASFile file2(file); + + ensure_not(file2.IsNull()); + ensure_equals(file2.GetName(), file10_); + ensure_equals(file2.GetMode(), liblas::LASFile::eRead); + + liblas::LASHeader const& header2 = file2.GetHeader(); + test_file10_header(header2); + } + + // Test assignment operator on read-only file + template<> + template<> + void to::test<8>() + { + liblas::LASFile file2; + + { + liblas::LASFile file(file10_); + + ensure_not(file.IsNull()); + ensure_equals(file.GetName(), file10_); + ensure_equals(file.GetMode(), liblas::LASFile::eRead); + + liblas::LASHeader const& header1 = file.GetHeader(); + test_file10_header(header1); + + file2 = file; + + // file object is deallocated here + } + + ensure_not(file2.IsNull()); + ensure_equals(file2.GetName(), file10_); + ensure_equals(file2.GetMode(), liblas::LASFile::eRead); + + liblas::LASHeader const& header1 = file2.GetHeader(); + test_file10_header(header1); + } + + // Test assignment operator on write-only file + template<> + template<> + void to::test<9>() + { + liblas::LASHeader header; + liblas::LASFile file(tmpfile_, header, liblas::LASFile::eWrite); + + ensure_not(file.IsNull()); + ensure_equals(file.GetName(), tmpfile_); + ensure_equals(file.GetMode(), liblas::LASFile::eWrite); + + liblas::LASHeader const& header1 = file.GetHeader(); + test_default_header(header1); + + liblas::LASFile file2(file); + + ensure_not(file2.IsNull()); + ensure_equals(file2.GetName(), tmpfile_); + ensure_equals(file2.GetMode(), liblas::LASFile::eWrite); + + liblas::LASHeader const& header2 = file2.GetHeader(); + test_default_header(header2); + } + + // Test assignment operator on write-only file + template<> + template<> + void to::test<10>() + { + liblas::LASFile file2; + + { + liblas::LASHeader header; + liblas::LASFile file(tmpfile_, header, liblas::LASFile::eWrite); + + ensure_not(file.IsNull()); + ensure_equals(file.GetName(), tmpfile_); + ensure_equals(file.GetMode(), liblas::LASFile::eWrite); + + liblas::LASHeader const& header1 = file.GetHeader(); + test_default_header(header1); + + file2 = file; + + // file object is deallocated here + } + + ensure_not(file2.IsNull()); + ensure_equals(file2.GetName(), tmpfile_); + ensure_equals(file2.GetMode(), liblas::LASFile::eWrite); + + liblas::LASHeader const& header1 = file2.GetHeader(); + test_default_header(header1); + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasheader_test.cpp work/libLAS-1.2.1/test/unit/lasheader_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasheader_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/lasheader_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,298 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include +#include "common.hpp" + +namespace tut +{ + struct lasheader_data + { + liblas::LASHeader m_default; + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_lasheader("liblas::LASHeader"); + + // Test default constructor + template<> + template<> + void to::test<1>() + { + test_default_header(m_default); + } + + // Test copy constructor + template<> + template<> + void to::test<2>() + { + using liblas::LASHeader; + + LASHeader copy_of_default(m_default); + test_default_header(copy_of_default); + + std::string sig("LASF and garbage"); + + LASHeader h1; + + h1.SetFileSignature(sig); + ensure_not(h1.GetFileSignature() == sig); + ensure_equals(h1.GetFileSignature().size(), 4); + ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); + + LASHeader h2(h1); + + ensure_not(h2.GetFileSignature() == sig); + ensure_equals(h2.GetFileSignature().size(), 4); + ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); + } + + + // Test assignment operator + template<> + template<> + void to::test<3>() + { + using liblas::LASHeader; + + LASHeader copy_of_default; + copy_of_default = m_default; + test_default_header(copy_of_default); + + } + + // Test Get/SetFileSignature + template<> + template<> + void to::test<4>() + { + using liblas::LASHeader; + + std::string sig("LASF and garbage"); + + LASHeader h1; + h1.SetFileSignature(sig); + + ensure_not(h1.GetFileSignature() == sig); + ensure_equals(h1.GetFileSignature().size(), 4); + ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); + + LASHeader h2; + h2 = h1; + + ensure_not(h2.GetFileSignature() == sig); + ensure_equals(h2.GetFileSignature().size(), 4); + ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); + } + + // Test Get/SetFileSourceId + template<> + template<> + void to::test<5>() + { + using liblas::LASHeader; + using liblas::uint16_t; + + uint16_t const id1 = 1; + uint16_t const id2 = 65535; + uint16_t const overflowed = 0; + + LASHeader h1; + h1.SetFileSourceId(id1); + ensure_equals(h1.GetFileSourceId(), id1); + h1.SetFileSourceId(id2); + ensure_equals(h1.GetFileSourceId(), id2); + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4305) // truncation from 'int' to 'liblas::uint16_t' +# pragma warning(disable: 4309) // conditional expression is constant. +#endif + // Unsigned overflow + // Likely compiler warning: truncation from int to liblas::uint16_t + h1.SetFileSourceId(id2 + 1); + ensure_equals(h1.GetFileSourceId(), overflowed); + +#ifdef _MSC_VER +# pragma warning(push) +#endif + } + + // Test GetReserved + template<> + template<> + void to::test<6>() + { + liblas::LASHeader h; + ensure_equals(h.GetReserved(), 0); + } + + // Test Set/GetProjectId + template<> + template<> + void to::test<7>() + { + std::string strid("030B4A82-1B7C-11CF-9D53-00AA003C9CB6"); + liblas::guid id(strid.c_str()); + + liblas::LASHeader h; + h.SetProjectId(id); + + ensure_not(h.GetProjectId().is_null()); + ensure_equals(h.GetProjectId(), id); + } + + // Test handling minor/major version + template<> + template<> + void to::test<8>() + { + liblas::LASHeader h; + + h.SetVersionMajor(1); + h.SetVersionMinor(0); + ensure_equals(h.GetVersionMajor(), 1); + ensure_equals(h.GetVersionMinor(), 0); + + h.SetVersionMajor(1); + h.SetVersionMinor(1); + ensure_equals(h.GetVersionMajor(), 1); + ensure_equals(h.GetVersionMinor(), 1); + + try + { + h.SetVersionMajor(2); + ensure("std::out_of_range not thrown", false); + } + catch (std::out_of_range const& e) + { + ensure(e.what(), true); + } + + try + { + h.SetVersionMinor(3); + ensure("std::out_of_range not thrown", false); + } + catch (std::out_of_range const& e) + { + ensure(e.what(), true); + } + } + + // Test Get/SetSystemId + template<> + template<> + void to::test<9>() + { + using liblas::LASHeader; + + std::string sysid1("Short Sys Id"); // 12 bytes + std::string::size_type const len1 = sysid1.size(); + std::string sysid2("Long System Identifier - XXX YYY"); // 32 bytes + std::string::size_type const len2 = sysid2.size(); + + LASHeader h; + + h.SetSystemId(sysid1); + ensure_equals(h.GetSystemId(), sysid1); + ensure_equals(h.GetSystemId().size(), len1); + ensure_equals(h.GetSystemId(true).size(), 32); + + h.SetSystemId(sysid2); + ensure_equals(h.GetSystemId(), sysid2); + ensure_equals(h.GetSystemId().size(), len2); + ensure_equals(h.GetSystemId(true).size(), 32); + } + + // Test Get/SetSoftwareId + template<> + template<> + void to::test<10>() + { + using liblas::LASHeader; + + std::string softid1("Short Soft Id"); // 13 bytes + std::string::size_type const len1 = softid1.size(); + std::string softid2("Long Software Identifier - XX YY"); // 32 bytes + std::string::size_type const len2 = softid2.size(); + + LASHeader h; + h.SetSoftwareId(softid1); + ensure_equals(h.GetSoftwareId(), softid1); + ensure_equals(h.GetSoftwareId().size(), len1); + ensure_equals(h.GetSoftwareId(true).size(), 32); + + h.SetSoftwareId(softid2); + ensure_equals(h.GetSoftwareId(), softid2); + ensure_equals(h.GetSoftwareId().size(), len2); + ensure_equals(h.GetSoftwareId(true).size(), 32); + } + + // Test GetPointRecordsByReturnCount + template<> + template<> + void to::test<11>() + { + liblas::LASHeader h; + ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + + h.SetPointRecordsByReturnCount(0, 100); + ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + ensure_equals(h.GetPointRecordsByReturnCount().at(0), 100); + + h.SetPointRecordsByReturnCount(1, 101); + ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + ensure_equals(h.GetPointRecordsByReturnCount().at(1), 101); + + h.SetPointRecordsByReturnCount(2, 102); + ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + ensure_equals(h.GetPointRecordsByReturnCount().at(2), 102); + + h.SetPointRecordsByReturnCount(3, 103); + ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + ensure_equals(h.GetPointRecordsByReturnCount().at(3), 103); + + h.SetPointRecordsByReturnCount(4, 104); + ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); + ensure_equals(h.GetPointRecordsByReturnCount().at(4), 104); + + try + { + // 5 is out of range + h.SetPointRecordsByReturnCount(5, 500); + ensure("std::out_of_range not thrown", false); + } + catch (std::out_of_range const& e) + { + ensure(e.what(), true); + } + } + + // Test GetSRS + template<> + template<> + void to::test<12>() + { + liblas::LASHeader h; + liblas::LASSpatialReference srs = h.GetSRS(); + + ensure_equals(srs.GetProj4(), ""); + ensure_equals(srs.GetWKT(), ""); + + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/laspoint_test.cpp work/libLAS-1.2.1/test/unit/laspoint_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/laspoint_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/laspoint_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,414 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include "common.hpp" + +namespace tut +{ + struct laspoint_data + { + liblas::LASPoint m_default; + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_laspoint("liblas::LASPoint"); + + // Test default construction + template<> + template<> + void to::test<1>() + { + test_default_point(m_default); + } + + // Test copy constructor + template<> + template<> + void to::test<2>() + { + liblas::LASPoint p(m_default); + + test_default_point(p); + } + + // Test assignment operator + template<> + template<> + void to::test<3>() + { + liblas::LASPoint p; + p = m_default; + + test_default_point(p); + } + + // Test equal-to operator + template<> + template<> + void to::test<4>() + { + liblas::LASPoint p; + + ensure("points are not equal", m_default == p); + } + + // Test not-equal-to operator + template<> + template<> + void to::test<5>() + { + liblas::LASPoint p; + p.SetCoordinates(1.123, 2.456, 3.789); + + ensure("points are equal", m_default != p); + } + + // Test Get/SetReturnNumber + template<> + template<> + void to::test<6>() + { + ensure_equals("invalid default return number", + m_default.GetReturnNumber(), 0); + + liblas::uint16_t const num1 = 7; + m_default.SetReturnNumber(num1); + ensure_equals("invalid return number", + m_default.GetReturnNumber(), num1); + + liblas::uint16_t const num2 = 3; + m_default.SetReturnNumber(num2); + ensure_equals("invalid return number", + m_default.GetReturnNumber(), num2); + + try + { + liblas::uint16_t const outofrange = 8; + m_default.SetReturnNumber(outofrange); + m_default.Validate(); // throws + + // XXX - mloskot: Flag gets reset because of value overflow, + // so in-range value is returned. + //ensure("std::invalid_point_data not thrown", false); + } + catch (liblas::invalid_point_data const& e) + { + ensure_equals(e.who() & liblas::LASPoint::eReturnNumber, + liblas::LASPoint::eReturnNumber); + } + } + + // Test Get/SetNumberOfReturns + template<> + template<> + void to::test<7>() + { + ensure_equals("invalid default number of returns", + m_default.GetNumberOfReturns(), 0); + + liblas::uint16_t const num1 = 7; + m_default.SetNumberOfReturns(num1); + ensure_equals("invalid number of returns", + m_default.GetNumberOfReturns(), num1); + + liblas::uint16_t const num2 = 3; + m_default.SetNumberOfReturns(num2); + ensure_equals("invalid number of returns", + m_default.GetNumberOfReturns(), num2); + + try + { + liblas::uint16_t const outofrange = 8; + m_default.SetNumberOfReturns(outofrange); + m_default.Validate(); // throws + + // XXX - mloskot: Flag gets reset because of value overflow, + // so in-range value is returned. + //ensure("std::invalid_point_data not thrown", false); + } + catch (liblas::invalid_point_data const& e) + { + ensure_equals(e.who() & liblas::LASPoint::eNumberOfReturns, + liblas::LASPoint::eNumberOfReturns); + } + } + + // Test Get/SetScanDirection + template<> + template<> + void to::test<8>() + { + ensure_equals("invalid default scan direction flag", + m_default.GetScanDirection(), 0); + + liblas::uint16_t const positive = 1; + m_default.SetScanDirection(positive); + ensure_equals("invalid scan direction flag", + m_default.GetScanDirection(), positive); + + liblas::uint16_t const negative = 0; + m_default.SetScanDirection(negative); + ensure_equals("invalid scan direction flag", + m_default.GetScanDirection(), negative); + + try + { + liblas::uint16_t const outofrange = 2; + m_default.SetScanDirection(outofrange); + m_default.Validate(); // throws + + // XXX - mloskot: Flag gets reset because of value overflow, + // so in-range value is returned. + //ensure("std::invalid_point_data not thrown", false); + } + catch (liblas::invalid_point_data const& e) + { + ensure_equals(e.who() & liblas::LASPoint::eScanDirection, + liblas::LASPoint::eScanDirection); + } + } + + // Test Get/SetFlightLineEdge + template<> + template<> + void to::test<9>() + { + ensure_equals("invalid default edge of flight line", + m_default.GetFlightLineEdge(), 0); + + liblas::uint16_t const endofscan = 1; + m_default.SetFlightLineEdge(endofscan); + ensure_equals("invalid edge of flight line", + m_default.GetFlightLineEdge(), endofscan); + + liblas::uint16_t const notendofscan = 0; + m_default.SetFlightLineEdge(notendofscan); + ensure_equals("invalid edge of flight line", + m_default.GetFlightLineEdge(), notendofscan); + + try + { + liblas::uint16_t const outofrange = 2; + m_default.SetFlightLineEdge(outofrange); + m_default.Validate(); // throws + + // XXX - mloskot: Flag gets reset because of value overflow, + // so in-range value is returned. + //ensure("std::invalid_point_data not thrown", false); + } + catch (liblas::invalid_point_data const& e) + { + ensure_equals(e.who() & liblas::LASPoint::eFlightLineEdge, + liblas::LASPoint::eFlightLineEdge); + } + } + + // Test Get/SetScanFlags + template<> + template<> + void to::test<10>() + { + std::bitset<8> zeros; + std::bitset<8> bits = m_default.GetScanFlags(); + + ensure_equals("invalid default scan flags", bits, zeros); + + m_default.SetReturnNumber(3); + m_default.SetNumberOfReturns(7); + m_default.SetScanDirection(0); + m_default.SetFlightLineEdge(1); + + std::bitset<8> expected(std::string("10111011")); + bits = m_default.GetScanFlags(); + + ensure_equals("invalid scan flags pattern", bits, expected); + + liblas::LASPoint copy(m_default); + bits = copy.GetScanFlags(); + + ensure_equals("invalid copy of scan flags pattern", bits, expected); + } + + // Test Get/SetClassification + template<> + template<> + void to::test<11>() + { + ensure_equals("invalid default classification", + m_default.GetClassification(), 0); + + liblas::uint8_t const begclass = 0; + m_default.SetClassification(begclass); + ensure_equals("invalid classification", + m_default.GetClassification(), begclass); + + liblas::uint8_t const endclass = 31; + m_default.SetClassification(endclass); + ensure_equals("invalid classification", + m_default.GetClassification(), endclass); + } + + // Test Get/SetScanAngleRank + template<> + template<> + void to::test<12>() + { + ensure_equals("invalid default scan angle rank", + m_default.GetScanAngleRank(), 0); + + liblas::int8_t const rank1 = -90; + m_default.SetScanAngleRank(rank1); + ensure_equals("invalid scan angle rank", + m_default.GetScanAngleRank(), rank1); + + liblas::int8_t const rank2 = 90; + m_default.SetScanAngleRank(rank2); + ensure_equals("invalid scan angle rank", + m_default.GetScanAngleRank(), rank2); + + try + { + liblas::int8_t const outofrange = 91; + m_default.SetScanAngleRank(outofrange); + m_default.Validate(); // throws + + ensure("invalid_point_data not thrown", false); + } + catch (liblas::invalid_point_data const& e) + { + ensure_equals(e.who() & liblas::LASPoint::eScanAngleRank, + liblas::LASPoint::eScanAngleRank); + } + } + + // Test Get/SetUserData + template<> + template<> + void to::test<13>() + { + ensure_equals("invalid default user data value", + m_default.GetUserData(), 0); + + liblas::uint8_t const data = 7; // dummy value + m_default.SetUserData(data); + + ensure_equals("invalid user data value", + m_default.GetUserData(), data); + } + + // Test Get/SetTime + template<> + template<> + void to::test<14>() + { + ensure_equals("invalid default time", + m_default.GetTime(), 0); + + double const time = 3.14; // dummy value + m_default.SetTime(time); + + ensure_equals("invalid time", + m_default.GetTime(), time); + } + + // Test IsValid method + template<> + template<> + void to::test<15>() + { + { + liblas::LASPoint p; + liblas::uint16_t const outofrange = 8; + p.SetReturnNumber(outofrange); + // XXX: Bit flag overflowed, so point data recognized as valid + //ensure_not(p.IsValid()); + } + + { + liblas::LASPoint p; + liblas::uint16_t const outofrange = 8; + p.SetNumberOfReturns(outofrange); + // XXX: Bit flag overflowed, so point data recognized as valid + //ensure_not(p.IsValid()); + } + + { + liblas::LASPoint p; + liblas::uint16_t const outofrange = 2; + p.SetScanDirection(outofrange); + // XXX: Bit flag overflowed, so point data recognized as valid + //ensure_not(p.IsValid()); + } + + { + liblas::LASPoint p; + liblas::uint16_t const outofrange = 2; + p.SetFlightLineEdge(outofrange); + // XXX: Bit flag overflowed, so point data recognized as valid + //ensure_not(p.IsValid()); + } + + { + liblas::LASPoint p; + liblas::int8_t const outofrange = 91; + p.SetScanAngleRank(outofrange); + ensure_not(p.IsValid()); + } + } + + // Test Get/SetColor + template<> + template<> + void to::test<16>() + { + ensure_equals("invalid default red color", + m_default.GetColor().GetRed(), 0); + + ensure_equals("invalid default green color", + m_default.GetColor().GetGreen(), 0); + + ensure_equals("invalid default blue color", + m_default.GetColor().GetBlue(), 0); + + liblas::LASColor color; + color.SetRed(211); + color.SetGreen(211); + color.SetBlue(211); + + m_default.SetColor(color); + + ensure_equals("invalid set red color", + m_default.GetColor().GetRed(), 211); + + ensure_equals("invalid set green color", + m_default.GetColor().GetGreen(), 211); + + ensure_equals("invalid set blue color", + m_default.GetColor().GetBlue(), 211); + + liblas::LASPoint p = m_default; + + ensure_equals("invalid copied red color", + p.GetColor().GetRed(), 211); + + ensure_equals("invalid copied green color", + p.GetColor().GetGreen(), 211); + + ensure_equals("invalid copied blue color", + p.GetColor().GetBlue(), 211); + + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasreader_iterator_test.cpp work/libLAS-1.2.1/test/unit/lasreader_iterator_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasreader_iterator_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/lasreader_iterator_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,388 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "liblas_test.hpp" +#include "common.hpp" +using namespace liblas; + +namespace tut +{ + struct lasreader_iterator_data + { + std::string file10_; + std::ifstream ifs_; + LASReader reader_; + + lasreader_iterator_data() : + file10_(g_test_data_path + "//TO_core_last_clip.las"), + ifs_(file10_.c_str(), std::ios::in | std::ios::binary), + reader_(ifs_) + {} + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_lasreader_iterator("liblas::lasreader_iterator"); + + // Test default constructor + template<> + template<> + void to::test<1>() + { + lasreader_iterator it; + } + + // Test user-defined constructor + template<> + template<> + void to::test<2>() + { + lasreader_iterator it(reader_); + } + + // Test copy constructor with default initialized iterator + template<> + template<> + void to::test<3>() + { + lasreader_iterator it1; + lasreader_iterator it2(it1); + + ensure(it1 == it2); + } + + // Test copy constructor with initialized iterator + template<> + template<> + void to::test<4>() + { + lasreader_iterator it1(reader_); + lasreader_iterator it2(it1); + + ensure(it1 == it2); + } + + // Test assignment operator with default initialized iterator + template<> + template<> + void to::test<5>() + { + lasreader_iterator it1; + lasreader_iterator it2; + it1 = it2; + + ensure(it1 == it2); + } + + // Test assignment operator with initialized iterator + template<> + template<> + void to::test<6>() + { + lasreader_iterator it1(reader_); + lasreader_iterator it2; + it1 = it2; + + ensure(it1 == it2); + } + + // Test dereference operator + template<> + template<> + void to::test<7>() + { + lasreader_iterator it(reader_); + + test_file10_point1(*it); + } + + // Test pointer-to-member operator + template<> + template<> + void to::test<8>() + { + lasreader_iterator it(reader_); + + // test 1st point data record + ensure_distance(it->GetX(), double(630262.30), 0.0001); + ensure_distance(it->GetY(), double(4834500), 0.0001); + ensure_distance(it->GetZ(), double(51.53), 0.0001); + ensure_equals(it->GetIntensity(), 670); + ensure_equals(it->GetClassification(), liblas::uint8_t(1)); + ensure_equals(it->GetScanAngleRank(), 0); + ensure_equals(it->GetUserData(), 3); + ensure_equals(it->GetScanFlags(), 9); + ensure_distance(it->GetTime(), double(413665.23360000004), 0.0001); + } + + // Test pre-increment operator + template<> + template<> + void to::test<9>() + { + lasreader_iterator it(reader_); // move to 1st point + ++it; // move to 2nd record + + test_file10_point2(*it); + } + + // Test post-increment operator + template<> + template<> + void to::test<10>() + { + lasreader_iterator it(reader_); // move to 1st point + it++; // move to 2nd record + + test_file10_point2(*it); + } + + // Test equal-to operator + template<> + template<> + void to::test<11>() + { + lasreader_iterator it(reader_); // move to 1st point + lasreader_iterator end; + + ensure_not(end == it); + } + + // Test not-equal-to operator + template<> + template<> + void to::test<12>() + { + lasreader_iterator it(reader_); // move to 1st point + lasreader_iterator end; + + ensure(end != it); + } + + // Test iteration + template<> + template<> + void to::test<13>() + { + liblas::uint32_t const cnt = reader_.GetHeader().GetPointRecordsCount(); + lasreader_iterator it(reader_); // move to 1st point + lasreader_iterator end; + + liblas::uint32_t s = 0; + while (end != it) + { + s++; + ++it; + } + + ensure_equals(cnt, s); + } + + // Test std::distance operation + template<> + template<> + void to::test<14>() + { + liblas::uint32_t const cnt = reader_.GetHeader().GetPointRecordsCount(); + lasreader_iterator it(reader_); // move to 1st point + lasreader_iterator end; + + lasreader_iterator::difference_type const d = std::distance(it, end); + ensure_equals(d, cnt); + } + + // Test std::distance operation + template<> + template<> + void to::test<15>() + { + std::size_t a = std::distance(lasreader_iterator(reader_), lasreader_iterator()); + + // Reader state is set to "past-the-end-of-file" + // So, reset is needed + reader_.Reset(); + + std::size_t b = std::distance(lasreader_iterator(reader_), lasreader_iterator()); + + ensure_equals(a, b); + } + + // Test std::advance operation + template<> + template<> + void to::test<16>() + { + lasreader_iterator it(reader_); // move to 1st point + + std::advance(it, 1); // move to 2nd record + test_file10_point2(*it); + + std::advance(it, 2); // move to 4th record + test_file10_point4(*it); + } + + // Test std::copy algorithm + template<> + template<> + void to::test<17>() + { + liblas::uint32_t const size = reader_.GetHeader().GetPointRecordsCount(); + lasreader_iterator it(reader_); + lasreader_iterator end; + + typedef std::list list_t; + typedef std::back_insert_iterator inserter_t; + list_t cache; + + // Test copying LAS records to std::list based cache + std::copy(it, end, inserter_t(cache)); + ensure_equals(cache.size(), size); + + // Test copied data + list_t::const_iterator cit = cache.begin(); // 1st element + std::advance(cit, 1); // move to 2nd element in cache + test_file10_point2(*cit); + std::advance(cit, 2); // move to 4th element in cache + test_file10_point4(*cit); + } + + // Test std::count algorithm + template<> + template<> + void to::test<18>() + { + // Construct copy of 2nd point record from tested file + LASPoint pt; + pt.SetCoordinates(630282.45, 4834500, 51.63); + pt.SetIntensity(350); + pt.SetClassification(1); + pt.SetScanAngleRank(0); + pt.SetUserData(3); + pt.SetScanFlags(9); + pt.SetTime(413665.52880000003); + ensure(pt.IsValid()); + test_file10_point2(pt); + + lasreader_iterator it(reader_); + lasreader_iterator end; + + // Count records equal to given point object + lasreader_iterator::difference_type const expected = 1; + lasreader_iterator::difference_type n = std::count(it, end, pt); + ensure_equals(n, expected); + } + + // Test std::equal algorithm + template<> + template<> + void to::test<19>() + { + std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary); + LASReader reader(ifs); + + // Copy LAS records to std::list based cache + typedef std::list list_t; + typedef std::back_insert_iterator inserter_t; + list_t cache; + { + lasreader_iterator it(reader); + lasreader_iterator end; + ensure(it != end); + + std::copy(it, end, inserter_t(cache)); + ensure_equals(cache.size(), reader.GetHeader().GetPointRecordsCount()); + } + + // Reset reader to the beginning of LAS file + reader.Reset(); + + // Compare LAS file with cache + { + lasreader_iterator it(reader); + lasreader_iterator end; + ensure(it != end); + + bool eq = std::equal(it, end, cache.begin()); + ensure(eq); + } + } + + // Test std::find algorithm + template<> + template<> + void to::test<20>() + { + // Construct copy of 2nd point record from tested file + LASPoint pt; + pt.SetCoordinates(630282.45, 4834500, 51.63); + pt.SetIntensity(350); + pt.SetClassification(1); + pt.SetScanAngleRank(0); + pt.SetUserData(3); + pt.SetScanFlags(9); + pt.SetTime(413665.52880000003); + ensure(pt.IsValid()); + test_file10_point2(pt); + + lasreader_iterator it(reader_); + lasreader_iterator end; + + // find 2nd point data record + lasreader_iterator fit; + fit = std::find(it, end, pt); + ensure(fit != end); + test_file10_point2(*fit); + } + + // Test std::find_if algorithm + template<> + template<> + void to::test<21>() + { + lasreader_iterator it(reader_); + lasreader_iterator end; + + // find 2nd point data record comparing XY coordinates + lasreader_iterator fit; + fit = std::find_if(it, end, is_xy(630282.45, 4834500, 0.0001)); + ensure(fit != end); + test_file10_point2(*fit); + } + + // Test std::for_each algorithm + template<> + template<> + void to::test<22>() + { + lasreader_iterator it(reader_); + lasreader_iterator end; + + typedef liblas::detail::Point point_t; + typedef liblas::detail::Extents bbox_t; + + LASHeader const& h = reader_.GetHeader(); + bbox_t lasbbox(point_t(h.GetMinX(), h.GetMinY(), h.GetMinZ()), + point_t(h.GetMaxX(), h.GetMaxY(), h.GetMaxZ())); + + // Accumulate points extents to common bounding box + bbox_t bbox; + std::for_each(it, end, bbox_calculator(bbox)); + + ensure(lasbbox == bbox); + } +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasreader_test.cpp work/libLAS-1.2.1/test/unit/lasreader_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasreader_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/lasreader_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,162 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include +#include +#include "liblas_test.hpp" +#include "common.hpp" + +namespace tut +{ + struct lasreader_data + { + std::string file10_; + + lasreader_data() + : file10_(g_test_data_path + "//TO_core_last_clip.las") + {} + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_lasreader("liblas::LASReader"); + + // Test user-declared constructor + template<> + template<> + void to::test<1>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + ensure_equals(reader.GetVersion(), liblas::eLASVersion10); + } + + // Test reading header + template<> + template<> + void to::test<2>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + liblas::LASHeader const& hdr = reader.GetHeader(); + + test_file10_header(hdr); + } + + // Test GetPoint method + template<> + template<> + void to::test<3>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + // uninitialized point object, a null-point + liblas::LASPoint const& p = reader.GetPoint(); + ensure(p == liblas::LASPoint()); + } + + // Test ReadPoint and GetPoint pair + template<> + template<> + void to::test<4>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + // read 1st point + reader.ReadNextPoint(); + test_file10_point1(reader.GetPoint()); + + // read 2nd point + reader.ReadNextPoint(); + test_file10_point2(reader.GetPoint()); + + // read and skip 3rd point + reader.ReadNextPoint(); + + // read 4th point + reader.ReadNextPoint(); + test_file10_point4(reader.GetPoint()); + + // read and count remaining points from 5 to 8 + unsigned short c = 0; + while (reader.ReadNextPoint()) + { + ++c; + } + ensure_equals(c, 4); + } + + // Test ReadPointAt and GetPoint pair + template<> + template<> + void to::test<5>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + // read 1st point + reader.ReadPointAt(0); + test_file10_point1(reader.GetPoint()); + + // read 4th point + reader.ReadPointAt(3); + test_file10_point4(reader.GetPoint()); + + // read back to 2nd point + reader.ReadPointAt(1); + test_file10_point2(reader.GetPoint()); + } + + // Test operator[] and GetPoint pair + template<> + template<> + void to::test<6>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + // read 1st point + test_file10_point1(reader[0]); + + // read 4th point + test_file10_point4(reader[3]); + + // read back to 2nd point + test_file10_point2(reader[1]); + } + + // Test GetStream method + template<> + template<> + void to::test<7>() + { + std::ifstream ifs; + ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + std::istream& is = reader.GetStream(); + + ensure_equals(ifs, is); + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasspatialreference_test.cpp work/libLAS-1.2.1/test/unit/lasspatialreference_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasspatialreference_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/lasspatialreference_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,286 @@ +// $Id: lasspatialreference_test.cpp 1102 2009-03-16 14:57:12Z hobu $ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include "common.hpp" + +namespace tut +{ + struct lasspatialreference_data + { + liblas::LASSpatialReference m_default; + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_lasspatialreference("liblas::LASSpatialReference"); + + // Test default constructor + template<> + template<> + void to::test<1>() + { + ensure_equals(m_default.GetProj4(), ""); + ensure_equals(m_default.GetWKT(), ""); + } + +// // Test copy constructor +// template<> +// template<> +// void to::test<2>() +// { +// using liblas::LASSpatialReference; +// +// LASSpatialReference copy_of_default(m_default); +// test_default_header(copy_of_default); +// +// std::string sig("LASF and garbage"); +// +// LASHeader h1; +// +// h1.SetFileSignature(sig); +// ensure_not(h1.GetFileSignature() == sig); +// ensure_equals(h1.GetFileSignature().size(), 4); +// ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); +// +// LASHeader h2(h1); +// +// ensure_not(h2.GetFileSignature() == sig); +// ensure_equals(h2.GetFileSignature().size(), 4); +// ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); +// } +// +// +// // Test assignment operator +// template<> +// template<> +// void to::test<3>() +// { +// using liblas::LASHeader; +// +// LASHeader copy_of_default; +// copy_of_default = m_default; +// test_default_header(copy_of_default); +// +// } +// +// // Test Get/SetFileSignature +// template<> +// template<> +// void to::test<4>() +// { +// using liblas::LASHeader; +// +// std::string sig("LASF and garbage"); +// +// LASHeader h1; +// h1.SetFileSignature(sig); +// +// ensure_not(h1.GetFileSignature() == sig); +// ensure_equals(h1.GetFileSignature().size(), 4); +// ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); +// +// LASHeader h2; +// h2 = h1; +// +// ensure_not(h2.GetFileSignature() == sig); +// ensure_equals(h2.GetFileSignature().size(), 4); +// ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); +// } +// +// // Test Get/SetFileSourceId +// template<> +// template<> +// void to::test<5>() +// { +// using liblas::LASHeader; +// using liblas::uint16_t; +// +// uint16_t const id1 = 1; +// uint16_t const id2 = 65535; +// uint16_t const overflowed = 0; +// +// LASHeader h1; +// h1.SetFileSourceId(id1); +// ensure_equals(h1.GetFileSourceId(), id1); +// h1.SetFileSourceId(id2); +// ensure_equals(h1.GetFileSourceId(), id2); +// +// #ifdef _MSC_VER +// # pragma warning(push) +// # pragma warning(disable: 4305) // truncation from 'int' to 'liblas::uint16_t' +// # pragma warning(disable: 4309) // conditional expression is constant. +// #endif +// // Unsigned overflow +// // Likely compiler warning: truncation from int to liblas::uint16_t +// h1.SetFileSourceId(id2 + 1); +// ensure_equals(h1.GetFileSourceId(), overflowed); +// +// #ifdef _MSC_VER +// # pragma warning(push) +// #endif +// } +// +// // Test GetReserved +// template<> +// template<> +// void to::test<6>() +// { +// liblas::LASHeader h; +// ensure_equals(h.GetReserved(), 0); +// } +// +// // Test Set/GetProjectId +// template<> +// template<> +// void to::test<7>() +// { +// std::string strid("030B4A82-1B7C-11CF-9D53-00AA003C9CB6"); +// liblas::guid id(strid.c_str()); +// +// liblas::LASHeader h; +// h.SetProjectId(id); +// +// ensure_not(h.GetProjectId().is_null()); +// ensure_equals(h.GetProjectId(), id); +// } +// +// // Test handling minor/major version +// template<> +// template<> +// void to::test<8>() +// { +// liblas::LASHeader h; +// +// h.SetVersionMajor(1); +// h.SetVersionMinor(0); +// ensure_equals(h.GetVersionMajor(), 1); +// ensure_equals(h.GetVersionMinor(), 0); +// +// h.SetVersionMajor(1); +// h.SetVersionMinor(1); +// ensure_equals(h.GetVersionMajor(), 1); +// ensure_equals(h.GetVersionMinor(), 1); +// +// try +// { +// h.SetVersionMajor(2); +// ensure("std::out_of_range not thrown", false); +// } +// catch (std::out_of_range const& e) +// { +// ensure(e.what(), true); +// } +// +// try +// { +// h.SetVersionMinor(3); +// ensure("std::out_of_range not thrown", false); +// } +// catch (std::out_of_range const& e) +// { +// ensure(e.what(), true); +// } +// } +// +// // Test Get/SetSystemId +// template<> +// template<> +// void to::test<9>() +// { +// using liblas::LASHeader; +// +// std::string sysid1("Short Sys Id"); // 12 bytes +// std::string::size_type const len1 = sysid1.size(); +// std::string sysid2("Long System Identifier - XXX YYY"); // 32 bytes +// std::string::size_type const len2 = sysid2.size(); +// +// LASHeader h; +// +// h.SetSystemId(sysid1); +// ensure_equals(h.GetSystemId(), sysid1); +// ensure_equals(h.GetSystemId().size(), len1); +// ensure_equals(h.GetSystemId(true).size(), 32); +// +// h.SetSystemId(sysid2); +// ensure_equals(h.GetSystemId(), sysid2); +// ensure_equals(h.GetSystemId().size(), len2); +// ensure_equals(h.GetSystemId(true).size(), 32); +// } +// +// // Test Get/SetSoftwareId +// template<> +// template<> +// void to::test<10>() +// { +// using liblas::LASHeader; +// +// std::string softid1("Short Soft Id"); // 13 bytes +// std::string::size_type const len1 = softid1.size(); +// std::string softid2("Long Software Identifier - XX YY"); // 32 bytes +// std::string::size_type const len2 = softid2.size(); +// +// LASHeader h; +// h.SetSoftwareId(softid1); +// ensure_equals(h.GetSoftwareId(), softid1); +// ensure_equals(h.GetSoftwareId().size(), len1); +// ensure_equals(h.GetSoftwareId(true).size(), 32); +// +// h.SetSoftwareId(softid2); +// ensure_equals(h.GetSoftwareId(), softid2); +// ensure_equals(h.GetSoftwareId().size(), len2); +// ensure_equals(h.GetSoftwareId(true).size(), 32); +// } +// +// // Test GetPointRecordsByReturnCount +// template<> +// template<> +// void to::test<11>() +// { +// liblas::LASHeader h; +// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); +// +// h.SetPointRecordsByReturnCount(0, 100); +// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); +// ensure_equals(h.GetPointRecordsByReturnCount().at(0), 100); +// +// h.SetPointRecordsByReturnCount(1, 101); +// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); +// ensure_equals(h.GetPointRecordsByReturnCount().at(1), 101); +// +// h.SetPointRecordsByReturnCount(2, 102); +// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); +// ensure_equals(h.GetPointRecordsByReturnCount().at(2), 102); +// +// h.SetPointRecordsByReturnCount(3, 103); +// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); +// ensure_equals(h.GetPointRecordsByReturnCount().at(3), 103); +// +// h.SetPointRecordsByReturnCount(4, 104); +// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); +// ensure_equals(h.GetPointRecordsByReturnCount().at(4), 104); +// +// try +// { +// // 5 is out of range +// h.SetPointRecordsByReturnCount(5, 500); +// ensure("std::out_of_range not thrown", false); +// } +// catch (std::out_of_range const& e) +// { +// ensure(e.what(), true); +// } +// } + +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasvariablerecord_test.cpp work/libLAS-1.2.1/test/unit/lasvariablerecord_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/lasvariablerecord_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/lasvariablerecord_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,108 @@ +// $Id: lasvariablerecord_test.cpp 712 2008-05-14 22:47:43Z hobu $ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include + +namespace tut +{ + struct lasvariablerecord_data + { + liblas::LASVariableRecord m_default; + + void test_default(liblas::LASVariableRecord const& h) + { + ensure_equals("wrong default reserved bytes", + h.GetReserved(), liblas::uint16_t()); + + ensure_equals("wrong default record identifier", + h.GetRecordId(), liblas::uint16_t()); + + ensure_equals("wrong default record length", + h.GetRecordLength(), liblas::uint16_t()); + + ensure_equals("wrong default user identifier", + h.GetUserId(true).c_str(), std::string()); + + ensure_equals("wrong default description", + h.GetDescription(true).c_str(), std::string()); + } + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_lasvariablerecord("liblas::LASVariableRecord"); + + // Test default constructor + template<> + template<> + void to::test<1>() + { + test_default(m_default); + } + + // Test copy constructor + template<> + template<> + void to::test<2>() + { + liblas::LASVariableRecord hdr_copy(m_default); + test_default(hdr_copy); + } + + // Test assignment operator + template<> + template<> + void to::test<3>() + { + liblas::LASVariableRecord hdr_copy; + test_default(hdr_copy); + + hdr_copy = m_default; + test_default(hdr_copy); + } + + // Test equal function + template<> + template<> + void to::test<4>() + { + liblas::LASVariableRecord hdr; + ensure("two default headers not equal", m_default.equal(hdr)); + + liblas::LASVariableRecord hdr_copy(m_default); + ensure("copy of default header not equal", hdr.equal(m_default)); + } + + // Test equal-to operator + template<> + template<> + void to::test<5>() + { + liblas::LASVariableRecord hdr; + ensure("two default headers not equal", m_default == hdr); + + liblas::LASVariableRecord hdr_copy(m_default); + ensure("copy of default header not equal", hdr == m_default); + } + + // Test not-equal-to operator + template<> + template<> + void to::test<6>() + { + liblas::LASVariableRecord hdr; + ensure_not("two default headers not equal", m_default != hdr); + + liblas::LASVariableRecord hdr_copy(m_default); + ensure_not("copy of default header not equal", hdr != m_default); + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/laswriter_test.cpp work/libLAS-1.2.1/test/unit/laswriter_test.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/laswriter_test.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/laswriter_test.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,243 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "liblas_test.hpp" +#include "common.hpp" + +namespace tut +{ + struct laswriter_data + { + std::string tmpfile_; + std::string file10_; + + laswriter_data() : + tmpfile_(g_test_data_path + "//tmp.las"), + file10_(g_test_data_path + "//TO_core_last_clip.las") + {} + + ~laswriter_data() + { + // remove temporary file after each test case + int const rc = std::remove(tmpfile_.c_str()); + ensure_equals(rc, 0); + } + }; + + typedef test_group tg; + typedef tg::object to; + + tg test_group_laswriter("liblas::LASWriter"); + + // Test user-declared constructor + template<> + template<> + void to::test<1>() + { + // Create new LAS file using default header block + { + std::ofstream ofs; + ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); + + // LAS 1.2, Point Format 0 + liblas::LASHeader header; + liblas::LASWriter writer(ofs, header); + + ensure_equals(writer.GetVersion(), liblas::eLASVersion12); + + liblas::LASHeader const& hdr_default = writer.GetHeader(); + test_default_header(hdr_default); + } + + // Read previously created LAS file and check its header block + { + std::ifstream ifs; + ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + ensure_equals(reader.GetVersion(), liblas::eLASVersion12); + + liblas::LASHeader const& hdr_default = reader.GetHeader(); + test_default_header(hdr_default); + } + } + + // Test WritePoint method + template<> + template<> + void to::test<2>() + { + { + std::ofstream ofs; + ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); + + // LAS 1.1, Point Format 0 + liblas::LASHeader header; + liblas::LASWriter writer(ofs, header); + + liblas::LASPoint point; + + // Write 1st point + point.SetCoordinates(10, 20, 30); + point.SetIntensity(5); + point.SetReturnNumber(1); + point.SetNumberOfReturns(1); + point.SetScanDirection(1); + point.SetFlightLineEdge(1); + point.SetClassification(7); + point.SetScanAngleRank(90); + point.SetUserData(0); + point.SetPointSourceID(1); + + writer.WritePoint(point); + + // write 2nd point + point.SetCoordinates(40, 50, 60); + point.SetPointSourceID(2); + writer.WritePoint(point); + + // write 3rd point + point.SetCoordinates(70, 80, 90); + point.SetPointSourceID(3); + writer.WritePoint(point); + } + + // Read previously create LAS file with 3 point records + { + std::ifstream ifs; + ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + liblas::LASPoint point; // reusable cache + + // read 1st point + reader.ReadNextPoint(); + point = reader.GetPoint(); + ensure_distance(point.GetX(), 10.0, 0.1); + ensure_distance(point.GetY(), 20.0, 0.1); + ensure_distance(point.GetZ(), 30.0, 0.1); + ensure_equals(point.GetIntensity(), 5); + ensure_equals(point.GetReturnNumber(), 1); + ensure_equals(point.GetNumberOfReturns(), 1); + ensure_equals(point.GetScanDirection(), 1); + ensure_equals(point.GetFlightLineEdge(), 1); + ensure_equals(point.GetClassification(), 7); + ensure_equals(point.GetScanAngleRank(), 90); + ensure_equals(point.GetUserData(), 0); + ensure_equals(point.GetPointSourceID(), 1); + + // read 2nd point + reader.ReadNextPoint(); + point = reader.GetPoint(); + ensure_distance(point.GetX(), 40.0, 0.1); + ensure_distance(point.GetY(), 50.0, 0.1); + ensure_distance(point.GetZ(), 60.0, 0.1); + ensure_equals(point.GetIntensity(), 5); + ensure_equals(point.GetReturnNumber(), 1); + ensure_equals(point.GetNumberOfReturns(), 1); + ensure_equals(point.GetScanDirection(), 1); + ensure_equals(point.GetFlightLineEdge(), 1); + ensure_equals(point.GetClassification(), 7); + ensure_equals(point.GetScanAngleRank(), 90); + ensure_equals(point.GetUserData(), 0); + ensure_equals(point.GetPointSourceID(), 2); + + // read 3rd point + reader.ReadNextPoint(); + point = reader.GetPoint(); + ensure_distance(point.GetX(), 70.0, 0.1); + ensure_distance(point.GetY(), 80.0, 0.1); + ensure_distance(point.GetZ(), 90.0, 0.1); + ensure_equals(point.GetIntensity(), 5); + ensure_equals(point.GetReturnNumber(), 1); + ensure_equals(point.GetNumberOfReturns(), 1); + ensure_equals(point.GetScanDirection(), 1); + ensure_equals(point.GetFlightLineEdge(), 1); + ensure_equals(point.GetClassification(), 7); + ensure_equals(point.GetScanAngleRank(), 90); + ensure_equals(point.GetUserData(), 0); + ensure_equals(point.GetPointSourceID(), 3); + } + } + + + // Test WriteHeader method + template<> + template<> + void to::test<3>() + { + { + std::ofstream ofs; + ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); + + liblas::LASHeader header; + liblas::LASWriter writer(ofs, header); + + // test initially written header + liblas::LASHeader const& hdr_default = writer.GetHeader(); + test_default_header(hdr_default); + + // update some header data and overwrite header block + header.SetFileSourceId(65535); + header.SetSystemId("Unit Test libLAS System"); + header.SetSoftwareId("Unit Test libLAS Software"); + header.SetCreationDOY(100); + header.SetCreationYear(2008); + header.SetScale(1.123, 2.123, 3.123); + header.SetOffset(4.321, 5.321, 6.321); + + writer.WriteHeader(header); + } + + // read and check updated header block + { + std::ifstream ifs; + ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary); + liblas::LASReader reader(ifs); + + liblas::LASHeader const& header = reader.GetHeader(); + ensure_equals(header.GetFileSourceId(), 65535); + ensure_equals(header.GetSystemId(), std::string("Unit Test libLAS System")); + ensure_equals(header.GetSoftwareId(), std::string("Unit Test libLAS Software")); + ensure_equals(header.GetCreationDOY(), 100); + ensure_equals(header.GetCreationYear(), 2008); + ensure_equals(header.GetScaleX(), 1.123); + ensure_equals(header.GetScaleY(), 2.123); + ensure_equals(header.GetScaleZ(), 3.123); + ensure_equals(header.GetOffsetX(), 4.321); + ensure_equals(header.GetOffsetY(), 5.321); + ensure_equals(header.GetOffsetZ(), 6.321); + } + } + + // Test GetStream method + template<> + template<> + void to::test<4>() + { + std::ofstream ofs; + ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); + + liblas::LASHeader header; + liblas::LASWriter writer(ofs, header); + + std::ostream& os = writer.GetStream(); + + ensure_equals(ofs, os); // same streams + } +} + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/liblas_test_suite.cpp work/libLAS-1.2.1/test/unit/liblas_test_suite.cpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/liblas_test_suite.cpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/liblas_test_suite.cpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,53 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#include +#include +#include +#include + +namespace tut +{ + test_runner_singleton runner; + + // full path to trunk/test/data + std::string g_test_data_path; +} + +int main(int argc, char* argv[]) +{ + if (1 == argc) + { + tut::g_test_data_path = "../data"; // default path + } + else if (2 == argc) + { + tut::g_test_data_path = argv[1]; + } + else + { + std::cout << "Usage: liblas_test \n"; + return 1; + } + + std::cout << "libLAS Test Suite:\n=================="; + + tut::reporter reporter; + tut::runner.get().set_callback(&reporter); + + try + { + tut::runner.get().run_tests(); + } + catch (std::exception const& e) + { + std::cerr << "TUT raised exception: " << e.what() << std::endl; + return 1; + } + + return 0; +} diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/liblas_test.hpp work/libLAS-1.2.1/test/unit/liblas_test.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/liblas_test.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/liblas_test.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,18 @@ +// $Id$ +// +// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net +// Distributed under the BSD License +// (See accompanying file LICENSE.txt or copy at +// http://www.opensource.org/licenses/bsd-license.php) +// +#ifndef LIBLAS_TEST_HPP_INCLUDED +#define LIBLAS_TEST_HPP_INCLUDED + +namespace tut +{ + // full path to trunk/test/data + extern std::string g_test_data_path; +} + +#endif // LIBLAS_TEST_HPP_INCLUDED + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/Makefile.am work/libLAS-1.2.1/test/unit/Makefile.am --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/Makefile.am 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/Makefile.am 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,35 @@ +if GDAL_IS_CONFIG +GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 +endif + +if GEOTIFF_IS_CONFIG +GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 +endif + +AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail + + +INCLUDES = -I. -I../../include + +TESTS = liblas_test + +check_PROGRAMS = liblas_test + +liblas_test_LDADD = \ + $(top_builddir)/src/liblas.la \ + $(NULL) + +liblas_test_SOURCES = \ + common.cpp \ + guid_test.cpp \ + laserror_test.cpp \ + lasfile_test.cpp \ + lasheader_test.cpp \ + lasspatialreference_test.cpp \ + laspoint_test.cpp \ + lasreader_iterator_test.cpp \ + lasreader_test.cpp \ + lasvariablerecord_test.cpp \ + laswriter_test.cpp \ + liblas_test_suite.cpp + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/README work/libLAS-1.2.1/test/unit/tut/README --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/README 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/tut/README 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,516 @@ +-------------------------------------------------------------------- +TUT: C++ Template Unit Test Framework + +Version: TUT-2007-07-06 +Homepage: http://tut-framework.sourceforge.net/ +-------------------------------------------------------------------- + +Documentation TUT How-To minimum steps to make TUT work for you + +What is TUT + +TUT is a pure C++ unit test framework. Its name - TUT - stands for +Template Unit Tests. + +Features + +TUT provides all features required for unit testing: + + * Similar tests can be grouped together into test groups. Each + test group has its unique name and is located in a separate + compilation unit. One group can contain almost unlimited number + of tests (actually, the limit is the compiler template + recursion depth). + * User can run all the tests (regression), or just some selected + groups or even some tests in these groups. + * TUT provides special template functions to check the condition + validity at run-time and to force test failure if required. + Since C++ doesn't provide a facility for obtaining stack trace + of the throwed exception and TUT avoids macros, those functions + accept string marker to allow users easely determine the source + of exception. + * TUT contains callback that can be implemented by the calling code + to integrate with an IDE, for example. Callbacks tell listener + when a new test run started, when test runner switches to the + next tests group, when a test was completed (and what result it + has), and when test run was finished. The callbacks allow users + to produce their own visualization format for test process and results. + * Being a template library, it doesn't need compilation; just + include the header into the test modules. + +TUT tests organization + +Test application + +C++ produces executable code, so tests have to be compiled into a single +binary called test application. The application can be built in automated +mode to perform nightly tests. They also can be built manually when a +developer hunts for bugs. + +The test application contains tests, organized into test groups. + +Test groups + +The functionality of a tested application can be divided into a few separate +function blocks (e.g. User Rights, Export, Processing, ...). It is natural +to group together tests for each block. TUT invokes this test group. Each +test group has a unique human-readable name and normally is located in a +separate file. + +Tests + +Each single test usually checks only one specific element of functionality. +For example, for a container a test could check whether size() call +returns zero after the successful call to the clear() method. + +Writing simple test + +Preamble + +You are going to create a new class for your application. You decided to +write tests for the class to be sure it works while you are developing or, +possibly, enhancing it. Let's consider your class is shared pointer: +std::auto_ptr-alike type that shares the same object among instances. + +Prior to test writing, you should decide what to test. Maximalist's +approach requires to write so many tests that altering any single +line of your production code will break at least one of them. +Minimalist's approach allows one to write tests only for the most +general or the most complex use cases. The truth lies somewhere in +between, but only you, developer, know where. You should prepare +common successful and unsuccessful scenarios, and the scenarios for +testing any other functionality you believe might be broken in some way. + +For our shared_ptr we obviosly should test constructors, assignment operators, referencing and passing ownership. + +Skeleton + +If you don't have any implemented class to test yet, it would be good to +implement it as a set of stubs for a first time. Thus you'll get an +interface, and be able to write your tests. Yes, that's correct: you +should write your tests before writing code! First of all, writing tests +often helps to understand oddities in the current interface, and fix it. +Secondly, with the stubs all your tests will fail, so you'll be sure +they do their job. + +Creating Test Group + +Since we're writing unit tests, it would be a good idea to group the +tests for our class in one place to be able to run them separately. +It's also natural in C++ to place all the grouped tests into one +compilation unit (i.e. source file). So, to begin, we should create +a new file. Let's call it test_shared_ptr.cpp. (Final variant of the +test group can be found in examples/shared_ptr subdirectory of the +distribution package) + +// test_shared_ptr.cpp +#include + +namespace tut +{ +}; + + +As you see, you need to include TUT header file (as expected) and +use namespace tut for tests. You may also use anonymous namespace if +your compiler allows it (you will need to instantiate methods from +tut namespace and some compilers refuse to place such instantiations +into the anonymous namespace). + +A test group in TUT framework is described by the special template +test_group. The template parameter T is a type that will hold all +test-specific data during the test execution. Actually, the data +stored in T are member data of the test. Test object is inherited +from T, so any test can refer to the data in T as its member data. + +For simple test groups (where all data are stored in test local +variables) type T is an empty struct. + +#include + +namespace tut +{ + struct shared_ptr_data + { + }; +} + +But when tests have complex or repeating creation phase, you may put +data members into the T and provide constructor (and, if required, +destructor) for it. For each test, a new instance of T will be +created. To prepare your test for execution TUT will use default +constructor. Similarly, after the test has been finished, TUT +calls the destructor to clean up T. I.e.: + +#include + +namespace tut +{ + struct complex_data + { + connection* con; + complex_data(){ con = db_pool.get_connection(); } + ~complex_data(){ db_pool.release_connection(con); } + }; + + // each test from now will have con data member initialized + // by constructor: + ... + con->commit(); + ... + + +What will happen if the constructor throws an exception? TUT will treat +it as if test itself failed with exception, so this test will +not be executed. You'll see an exception mark near the test, and +if the constructor throwed something printable, a certain message will appear. + +Exception in destructor is threated a bit different. Reaching destruction +phase means that the test is passed, so TUT marks test with warning +status meaning that test itself was OK, but something bad has happend +after the test. + +Well, all we have written so far is just a type declaration. To work +with a group we have to have an object, so we must create the test group +object. Since we need only one test group object for each unit, we can +(and should, actually) make this object static. To prevent name clash with +other test group objects in the namespace tut, we should provide a +descriptive name, or, alternatively, we may put it into the anonymous +namespace. The former is more correct, but a descriptive name usually works +well too, unless you're too terse in giving names to objects. + +#include + +namespace tut +{ + struct shared_ptr_data + { + + }; + + typedef test_group tg; + tg shared_ptr_group("shared_ptr"); +}; + +As you see, any test group accepts a single parameter - its human-readable +name. This name is used to identify the group when a programmer wants to +execute all tests or a single test within the group. So this name shall +also be descriptive enough to avoid clashes. Since we're writing tests +for a specific unit, it's enough to name it after the unit name. + +Test group constructor will be called at unspecified moment at the test +application startup. The constructor performs self-registration; it calls +tut::runner and asks it to store the test group object name and location. +Any other test group in the system undergoes the same processing, i.e. +each test group object registers itself. Thus, test runner can iterate +all test groups or execute any test group by its name. + +Newly created group has no tests associated with it. To be more precise, +it has predefined set of dummy tests. By default, there are 50 tests in a +group, including dummy ones. To create a test group with higher volume +(e.g. when tests are generated by a script and their number is higher) +we must provide a higher border of test group size when it is instantiated: + +#include + +namespace tut +{ + struct huge_test_data + { + }; + + // test group with maximum 500 tests + typedef test_group testgroup; + testgroup huge_test_testgroup("huge group"); +}; + + +Note also, that your compiler will possibly need a command-line switch +or pragma to enlarge recursive instantiation depth. For g++, for +example, you should specify at least --ftemplate-depth-501 to increase +the depth. For more information see your compiler documentation. + +Creating Tests + +Now it's time to fill our test group with content. + +In TUT, all tests have unique numbers inside the test group. Some +people believe that textual names better describe failed tests in +reports. I agree; but in reality C++ templates work good with numbers +because they are compile-time constants and refuse to do the same +with strings, since strings are in fact addresses of character +buffers, i.e. run-time data. + +As I mentioned above, our test group already has a few dummy tests; +and we can replace any of them with something real just by writing +our own version: + +#include + +namespace tut +{ + struct shared_ptr_data{}; + + typedef test_group testgroup; + typedef testgroup::object testobject; + testgroup shared_ptr_testgroup("shared_ptr"); + + template<> + template<> + void testobject::test<1>() + { + // do nothing test + } +}; + + +So far this test does nothing, but it's enough to illustrate the concept. + +All tests in the group belong to the type test_group::object. This +class is directly inherited from our test data structure. In our case, it is + +class object : public shared_ptr_data { ... } + +This allows to access members of the data structure directly, since at +the same time they are members of the object type. We also typedef the +type with testobject for brevity. + +We mark our test with number 1. Previously, test group had a dummy test +with the same number, but now, since we've defined our own version, it +replaces the dummy test as more specialized one. It's how C++ template +ordering works. + +The test we've written always succeeds. Successful test returns with no +exceptions. Unsuccessful one either throws an exception, or fails at +fail() or ensure() methods (which anyway just throw the exception when failed). + +First real test + +Well, now we know enough to write the first real working test. This test +will create shared_ptr instances and check their state. We will define a +small structure (keepee) to use it as shared_ptr stored object type. + +#include +#include + +namespace tut +{ + struct shared_ptr_data + { + struct keepee{ int data; }; + }; + + typedef test_group testgroup; + typedef testgroup::object testobject; + testgroup shared_ptr_testgroup("shared_ptr"); + + /** + * Checks default constructor. + */ + template<> + template<> + void testobject::test<1>() + { + shared_ptr def; + ensure("null",def.get() == 0); + } +}; + + +That's all! The first line creates shared_ptr. If constructor throws +an exception, test will fail (exceptions, including '...', are catched +by the TUT framework). If the first line succeeds, we must check +whether the kept object is null one. To do this, we use test object +member function ensure(), which throws std::logic_error with a given +message if its second argument is not true. Finally, if destructor of +shared_ptr fails with exception, TUT also will report this test as failed. + +It's equally easy to write a test for the scenario where we expect to get +an exception: let's consider our class should throw an exception if it +has no stored object, and the operator -> is called. + +/** + * Checks operator -> throws instead of returning null. + */ +template<> +template<> +void testobject::test<2>() +{ + try + { + shared_ptr sp; + sp->data = 0; + fail("exception expected"); + } + catch( const std::runtime_error& ex ) + { + // ok + } +} + + +Here we expect the std::runtime_error. If operator doesn't throw it, +we'll force the test to fail using another member function: fail(). It +just throws std::logic_error with a given message. If operator throws +anything else, our test will fail too, since we intercept only +std::runtime_error, and any other exception means the test has failed. + +NB: our second test has number 2 in its name; it can, actually, be any +in range 1..Max; the only requirement is not to write tests with the +same numbers. If you did, compiler will force you to fix them anyway. + +And finally, one more test to demonstrate how to use the +ensure_equals template member function: + +/** + * Checks keepee counting. + */ +template<> +template<> +void testobject::test<3>() +{ + shared_ptr sp1(new keepee()); + shared_ptr sp2(sp1); + ensure_equals("second copy at sp1",sp1.count(),2); + ensure_equals("second copy at sp2",sp2.count(),2); +} + + +The test checks if the shared_ptr correctly counts references during +copy construction. What's interesting here is the template member +ensure_equals. It has an additional functionality comparing with similar +call ensure("second_copy",sp1.count()==2); it uses operator == to check +the equality of the two passed parameters and, what's more important, it +uses std::stream to format the passed parameters into a human-readable +message (smth like: "second copy: expected 2, got 1"). It means that +ensure_equals cannot be used with the types that don't have operator <<; +but for those having the operator it provides much more informational message. + +In contrast to JUnit assertEquals, where the expected value goes before +the actual one, ensure_equals() accepts the expected after the actual +value. I believe it's more natural to read ensure_equals("msg", count, 5) +as "ensure that count equals to 5" rather than JUnit's +"assert that 5 is the value of the count". + +Running tests + +Tests are already written, but an attempt to run them will be unsuccessful. +We need a few other bits to complete the test application. + +First of all, we need a main() method, simply because it must be in all +applications. Secondly, we need a test runner singleton. Remember I said +each test group should register itself in singleton? So, we need that +singleton. And, finally, we need a kind of a callback handler to visualize +our test results. + +The design of TUT doesn't strictly set a way the tests are visualized; +instead, it provides an opportunity to get the test results by means of +callbacks. Moreover it allows user to output the results in any format he +prefers. Of course, there is a "reference implementation" in the +example/subdirectory of the project. + +Test runner singleton is defined in tut.h, so all we need to activate it +is to declare an object of the type tut::test_runner_singleton in the main +module with a special name tut::runner. + +Now, with the test_runner we can run tests. Singleton has method get() +returning a reference to an instance of the test_runner class, which in +turn has methods run_tests() to run all tests in all groups, +run_tests(const std::string& groupname) to run all tests in a given group +and run_test(const std::string& grp,int n) to run one test in the specified group. + +// main.cpp +#include + +namespace tut +{ + test_runner_singleton runner; +} + +int main() +{ + // run all tests in all groups + runner.get().run_tests(); + + // run all tests in group "shared_ptr" + runner.get().run_tests("shared_ptr"); + + // run test number 5 in group "shared_ptr" + runner.get().run_test("shared_ptr",5); + + return 0; +} + +It's up to user to handle command-line arguments or GUI messages and map those +arguments/messages to actual calls to test runner. Again, as you see, TUT +doesn't restrict user here. + +But, the last question is still unanswered: how do we get our test results? +The answer lies inside tut::callback interface. User shall create its subclass, +and write up to three simple methods. He also can omit any method since they +have default no-op implementation. Each corresponding method is called in the +following cases: + + * a new test run started; + * test finished; + * test run finished. + +Here is a minimal implementation: + +class visualizator : public tut::callback +{ +public: + void run_started(){ } + + void test_completed(const tut::test_result& tr) + { + // ... show test result here ... + } + + void run_completed(){ } +}; + +The most important is the test_completed() method; its parameter has type +test_result, and contains everything about the finished test, from its group +name and number to the exception message, if any. Member result is an enum +that contains status of the test: ok, fail or ex. Take a look at the +examples/basic/main.cpp for more complete visualizator. + +Visualizator should be passed to the test_runner before run. Knowing that, +we are ready to write the final version of our main module: + +// main.cpp +#include + +namespace tut +{ + test_runner_singleton runner; +} + +class callback : public tut::callback +{ +public: + void run_started(){ std::cout << "\nbegin"; } + + void test_completed(const tut::test_result& tr) + { + std::cout << tr.test_pos << "=" << tr.result << std::flush; + } + + void run_completed(){ std::cout << "\nend"; } +}; + +int main() +{ + callback clbk; + runner.get().set_callback(&clbk); + + // run all tests in all groups + runner.get().run_tests(); + return 0; +} + +That's it. You are now ready to link and run our test application. Do it as often as possible; +once a day is a definite must. I hope, TUT will help you to make your application more +robust and relieve your testing pain. Feel free to send your questions, suggestions and +critical opinions to me; I'll do my best to address them asap. diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/tut_reporter.hpp work/libLAS-1.2.1/test/unit/tut/tut_reporter.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/tut_reporter.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/tut/tut_reporter.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,227 @@ +#ifndef TUT_REPORTER +#define TUT_REPORTER + +#include + +/** + * Template Unit Tests Framework for C++. + * http://tut.dozen.ru + * + * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com + */ +namespace +{ + +std::ostream& operator<<(std::ostream& os, const tut::test_result& tr) +{ + switch(tr.result) + { + case tut::test_result::ok: + os << '.'; + break; + case tut::test_result::fail: + os << '[' << tr.test << "=F]"; + break; + case tut::test_result::ex_ctor: + os << '[' << tr.test << "=C]"; + break; + case tut::test_result::ex: + os << '[' << tr.test << "=X]"; + break; + case tut::test_result::warn: + os << '[' << tr.test << "=W]"; + break; + case tut::test_result::term: + os << '[' << tr.test << "=T]"; + break; + } + + return os; +} + +} // end of namespace + +namespace tut +{ + +/** + * Default TUT callback handler. + */ +class reporter : public tut::callback +{ + std::string current_group; + typedef std::vector not_passed_list; + not_passed_list not_passed; + std::ostream& os; + +public: + + int ok_count; + int exceptions_count; + int failures_count; + int terminations_count; + int warnings_count; + + reporter() + : os(std::cout) + { + init(); + } + + reporter(std::ostream& out) + : os(out) + { + init(); + } + + void run_started() + { + init(); + } + + void test_completed(const tut::test_result& tr) + { + if (tr.group != current_group) + { + os << std::endl << tr.group << ": " << std::flush; + current_group = tr.group; + } + + os << tr << std::flush; + if (tr.result == tut::test_result::ok) + { + ok_count++; + } + else if (tr.result == tut::test_result::ex) + { + exceptions_count++; + } + else if (tr.result == tut::test_result::ex_ctor) + { + exceptions_count++; + } + else if (tr.result == tut::test_result::fail) + { + failures_count++; + } + else if (tr.result == tut::test_result::warn) + { + warnings_count++; + } + else + { + terminations_count++; + } + + if (tr.result != tut::test_result::ok) + { + not_passed.push_back(tr); + } + } + + void run_completed() + { + os << std::endl; + + if (not_passed.size() > 0) + { + not_passed_list::const_iterator i = not_passed.begin(); + while (i != not_passed.end()) + { + tut::test_result tr = *i; + + os << std::endl; + + os << "---> " << "group: " << tr.group + << ", test: test<" << tr.test << ">" + << (!tr.name.empty() ? (std::string(" : ") + tr.name) : std::string()) + << std::endl; + + os << " problem: "; + switch(tr.result) + { + case test_result::fail: + os << "assertion failed" << std::endl; + break; + case test_result::ex: + case test_result::ex_ctor: + os << "unexpected exception" << std::endl; + if( tr.exception_typeid != "" ) + { + os << " exception typeid: " + << tr.exception_typeid << std::endl; + } + break; + case test_result::term: + os << "would be terminated" << std::endl; + break; + case test_result::warn: + os << "test passed, but cleanup code (destructor) raised" + " an exception" << std::endl; + break; + default: + break; + } + + if (!tr.message.empty()) + { + if (tr.result == test_result::fail) + { + os << " failed assertion: \"" << tr.message << "\"" + << std::endl; + } + else + { + os << " message: \"" << tr.message << "\"" + << std::endl; + } + } + + ++i; + } + } + + os << std::endl; + + os << "tests summary:"; + if (terminations_count > 0) + { + os << " terminations:" << terminations_count; + } + if (exceptions_count > 0) + { + os << " exceptions:" << exceptions_count; + } + if (failures_count > 0) + { + os << " failures:" << failures_count; + } + if (warnings_count > 0) + { + os << " warnings:" << warnings_count; + } + os << " ok:" << ok_count; + os << std::endl; + } + + bool all_ok() const + { + return not_passed.empty(); + } + +private: + + void init() + { + ok_count = 0; + exceptions_count = 0; + failures_count = 0; + terminations_count = 0; + warnings_count = 0; + not_passed.clear(); + } +}; + +} + +#endif diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/tut_restartable.hpp work/libLAS-1.2.1/test/unit/tut/tut_restartable.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/tut_restartable.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/tut/tut_restartable.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,394 @@ +#ifndef TUT_RESTARTABLE_H_GUARD +#define TUT_RESTARTABLE_H_GUARD + +#include +#include +#include +#include + +/** + * Template Unit Tests Framework for C++. + * http://tut.dozen.ru + * + * Optional restartable wrapper for test_runner. Allows to restart test runs + * finished due to abnormal test application termination (such as segmentation + * fault or math error). + * + * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com + */ + +namespace tut +{ + +namespace util +{ + +/** + * Escapes non-alphabetical characters in string. + */ +std::string escape(const std::string& orig) +{ + std::string rc; + std::string::const_iterator i,e; + i = orig.begin(); + e = orig.end(); + + while (i != e) + { + if ((*i >= 'a' && *i <= 'z') || + (*i >= 'A' && *i <= 'Z') || + (*i >= '0' && *i <= '9') ) + { + rc += *i; + } + else + { + rc += '\\'; + rc += ('a'+(((unsigned int)*i) >> 4)); + rc += ('a'+(((unsigned int)*i) & 0xF)); + } + + ++i; + } + return rc; +} + +/** + * Un-escapes string. + */ +std::string unescape(const std::string& orig) +{ + std::string rc; + std::string::const_iterator i,e; + i = orig.begin(); + e = orig.end(); + + while (i != e) + { + if (*i != '\\') + { + rc += *i; + } + else + { + ++i; + if (i == e) + { + throw std::invalid_argument("unexpected end of string"); + } + unsigned int c1 = *i; + ++i; + if (i == e) + { + throw std::invalid_argument("unexpected end of string"); + } + unsigned int c2 = *i; + rc += (((c1 - 'a') << 4) + (c2 - 'a')); + } + + ++i; + } + return rc; +} + +/** + * Serialize test_result avoiding interfering with operator <<. + */ +void serialize(std::ostream& os, const tut::test_result& tr) +{ + os << escape(tr.group) << std::endl; + os << tr.test << ' '; + switch(tr.result) + { + case test_result::ok: + os << 0; + break; + case test_result::fail: + os << 1; + break; + case test_result::ex: + os << 2; + break; + case test_result::warn: + os << 3; + break; + case test_result::term: + os << 4; + break; + default: + throw std::logic_error("operator << : bad result_type"); + } + os << ' ' << escape(tr.message) << std::endl; +} + +/** + * deserialization for test_result + */ +void deserialize(std::istream& is, tut::test_result& tr) +{ + std::getline(is,tr.group); + if (is.eof()) + { + throw tut::no_more_tests(); + } + tr.group = unescape(tr.group); + + tr.test = -1; + is >> tr.test; + if (tr.test < 0) + { + throw std::logic_error("operator >> : bad test number"); + } + + int n = -1; + is >> n; + switch(n) + { + case 0: + tr.result = test_result::ok; + break; + case 1: + tr.result = test_result::fail; + break; + case 2: + tr.result = test_result::ex; + break; + case 3: + tr.result = test_result::warn; + break; + case 4: + tr.result = test_result::term; + break; + default: + throw std::logic_error("operator >> : bad result_type"); + } + + is.ignore(1); // space + std::getline(is,tr.message); + tr.message = unescape(tr.message); + if (!is.good()) + { + throw std::logic_error("malformed test result"); + } +} +}; + +/** + * Restartable test runner wrapper. + */ +class restartable_wrapper +{ + test_runner& runner_; + callback* callback_; + + std::string dir_; + std::string log_; // log file: last test being executed + std::string jrn_; // journal file: results of all executed tests + +public: + /** + * Default constructor. + * @param dir Directory where to search/put log and journal files + */ + restartable_wrapper(const std::string& dir = ".") + : runner_(runner.get()), + callback_(0), + dir_(dir) + { + // dozen: it works, but it would be better to use system path separator + jrn_ = dir_ + '/' + "journal.tut"; + log_ = dir_ + '/' + "log.tut"; + } + + /** + * Stores another group for getting by name. + */ + void register_group(const std::string& name, group_base* gr) + { + runner_.register_group(name,gr); + } + + /** + * Stores callback object. + */ + void set_callback(callback* cb) + { + callback_ = cb; + } + + /** + * Returns callback object. + */ + callback& get_callback() const + { + return runner_.get_callback(); + } + + /** + * Returns list of known test groups. + */ + groupnames list_groups() const + { + return runner_.list_groups(); + } + + /** + * Runs all tests in all groups. + */ + void run_tests() const + { + // where last run was failed + std::string fail_group; + int fail_test; + read_log_(fail_group,fail_test); + bool fail_group_reached = (fail_group == ""); + + // iterate over groups + tut::groupnames gn = list_groups(); + tut::groupnames::const_iterator gni,gne; + gni = gn.begin(); + gne = gn.end(); + while (gni != gne) + { + // skip all groups before one that failed + if (!fail_group_reached) + { + if (*gni != fail_group) + { + ++gni; + continue; + } + fail_group_reached = true; + } + + // first or restarted run + int test = (*gni == fail_group && fail_test >= 0) ? fail_test + 1 : 1; + while(true) + { + // last executed test pos + register_execution_(*gni,test); + + try + { + tut::test_result tr = runner_.run_test(*gni,test); + register_test_(tr); + } + catch (const tut::beyond_last_test&) + { + break; + } + catch(const tut::no_such_test&) + { + // it's ok + } + + ++test; + } + + ++gni; + } + + // show final results to user + invoke_callback_(); + + // truncate files as mark of successful finish + truncate_(); + } + +private: + /** + * Shows results from journal file. + */ + void invoke_callback_() const + { + runner_.set_callback(callback_); + runner_.get_callback().run_started(); + + std::string current_group; + std::ifstream ijournal(jrn_.c_str()); + while (ijournal.good()) + { + // read next test result + try + { + tut::test_result tr; + util::deserialize(ijournal,tr); + runner_.get_callback().test_completed(tr); + } + catch (const no_more_tests&) + { + break; + } + } + + runner_.get_callback().run_completed(); + } + + /** + * Register test into journal. + */ + void register_test_(const test_result& tr) const + { + std::ofstream ojournal(jrn_.c_str(), std::ios::app); + util::serialize(ojournal, tr); + ojournal << std::flush; + if (!ojournal.good()) + { + throw std::runtime_error("unable to register test result in file " + + jrn_); + } + } + + /** + * Mark the fact test going to be executed + */ + void register_execution_(const std::string& grp, int test) const + { + // last executed test pos + std::ofstream olog(log_.c_str()); + olog << util::escape(grp) << std::endl << test << std::endl << std::flush; + if (!olog.good()) + { + throw std::runtime_error("unable to register execution in file " + + log_); + } + } + + /** + * Truncate tests. + */ + void truncate_() const + { + std::ofstream olog(log_.c_str()); + std::ofstream ojournal(jrn_.c_str()); + } + + /** + * Read log file + */ + void read_log_(std::string& fail_group, int& fail_test) const + { + // read failure point, if any + std::ifstream ilog(log_.c_str()); + std::getline(ilog,fail_group); + fail_group = util::unescape(fail_group); + ilog >> fail_test; + if (!ilog.good()) + { + fail_group = ""; + fail_test = -1; + truncate_(); + } + else + { + // test was terminated... + tut::test_result tr(fail_group, fail_test, "", tut::test_result::term); + register_test_(tr); + } + } +}; + +} + +#endif + diff -ruN /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/tut.hpp work/libLAS-1.2.1/test/unit/tut/tut.hpp --- /usr/ports/devel/liblas12/work/libLAS-1.2.1/test/unit/tut/tut.hpp 1970-01-01 08:00:00.000000000 +0800 +++ work/libLAS-1.2.1/test/unit/tut/tut.hpp 2009-10-03 01:48:41.000000000 +0800 @@ -0,0 +1,1211 @@ +#ifndef TUT_H_GUARD +#define TUT_H_GUARD + +#include +#include +#include +#include +#include +#include +// NOTE: mloskot added for ensure_equals specialization +#include +#include + +#if defined(TUT_USE_SEH) +#include +#include +#endif + +/** + * Template Unit Tests Framework for C++. + * http://tut.dozen.ru + * + * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com + */ +namespace tut +{ + +/** + * The base for all TUT exceptions. + */ +struct tut_error : public std::exception +{ + tut_error(const std::string& msg) + : err_msg(msg) + { + } + + ~tut_error() throw() + { + } + + const char* what() const throw() + { + return err_msg.c_str(); + } + +private: + + std::string err_msg; +}; + +/** + * Exception to be throwed when attempted to execute + * missed test by number. + */ +struct no_such_test : public tut_error +{ + no_such_test() + : tut_error("no such test") + { + } + + ~no_such_test() throw() + { + } +}; + +/** + * No such test and passed test number is higher than + * any test number in current group. Used in one-by-one + * test running when upper bound is not known. + */ +struct beyond_last_test : public no_such_test +{ + beyond_last_test() + { + } + + ~beyond_last_test() throw() + { + } +}; + +/** + * Group not found exception. + */ +struct no_such_group : public tut_error +{ + no_such_group(const std::string& grp) + : tut_error(grp) + { + } + + ~no_such_group() throw() + { + } +}; + +/** + * Internal exception to be throwed when + * no more tests left in group or journal. + */ +struct no_more_tests +{ + no_more_tests() + { + } + + ~no_more_tests() throw() + { + } +}; + +/** + * Internal exception to be throwed when + * test constructor has failed. + */ +struct bad_ctor : public tut_error +{ + bad_ctor(const std::string& msg) + : tut_error(msg) + { + } + + ~bad_ctor() throw() + { + } +}; + +/** + * Exception to be throwed when ensure() fails or fail() called. + */ +struct failure : public tut_error +{ + failure(const std::string& msg) + : tut_error(msg) + { + } + + ~failure() throw() + { + } +}; + +/** + * Exception to be throwed when test desctructor throwed an exception. + */ +struct warning : public tut_error +{ + warning(const std::string& msg) + : tut_error(msg) + { + } + + ~warning() throw() + { + } +}; + +/** + * Exception to be throwed when test issued SEH (Win32) + */ +struct seh : public tut_error +{ + seh(const std::string& msg) + : tut_error(msg) + { + } + + ~seh() throw() + { + } +}; + +/** + * Return type of runned test/test group. + * + * For test: contains result of test and, possible, message + * for failure or exception. + */ +struct test_result +{ + /** + * Test group name. + */ + std::string group; + + /** + * Test number in group. + */ + int test; + + /** + * Test name (optional) + */ + std::string name; + + /** + * ok - test finished successfully + * fail - test failed with ensure() or fail() methods + * ex - test throwed an exceptions + * warn - test finished successfully, but test destructor throwed + * term - test forced test application to terminate abnormally + */ + enum result_type + { + ok, + fail, + ex, + warn, + term, + ex_ctor + }; + + result_type result; + + /** + * Exception message for failed test. + */ + std::string message; + std::string exception_typeid; + + /** + * Default constructor. + */ + test_result() + : test(0), + result(ok) + { + } + + /** + * Constructor. + */ + test_result(const std::string& grp, int pos, + const std::string& test_name, result_type res) + : group(grp), + test(pos), + name(test_name), + result(res) + { + } + + /** + * Constructor with exception. + */ + test_result(const std::string& grp,int pos, + const std::string& test_name, result_type res, + const std::exception& ex) + : group(grp), + test(pos), + name(test_name), + result(res), + message(ex.what()), + exception_typeid(typeid(ex).name()) + { + } +}; + +/** + * Interface. + * Test group operations. + */ +struct group_base +{ + virtual ~group_base() + { + } + + // execute tests iteratively + virtual void rewind() = 0; + virtual test_result run_next() = 0; + + // execute one test + virtual test_result run_test(int n) = 0; +}; + +/** + * Test runner callback interface. + * Can be implemented by caller to update + * tests results in real-time. User can implement + * any of callback methods, and leave unused + * in default implementation. + */ +struct callback +{ + /** + * Virtual destructor is a must for subclassed types. + */ + virtual ~callback() + { + } + + /** + * Called when new test run started. + */ + virtual void run_started() + { + } + + /** + * Called when a group started + * @param name Name of the group + */ + virtual void group_started(const std::string& /*name*/) + { + } + + /** + * Called when a test finished. + * @param tr Test results. + */ + virtual void test_completed(const test_result& /*tr*/) + { + } + + /** + * Called when a group is completed + * @param name Name of the group + */ + virtual void group_completed(const std::string& /*name*/) + { + } + + /** + * Called when all tests in run completed. + */ + virtual void run_completed() + { + } +}; + +/** + * Typedef for runner::list_groups() + */ +typedef std::vector groupnames; + +/** + * Test runner. + */ +class test_runner +{ + +public: + + /** + * Constructor + */ + test_runner() + : callback_(&default_callback_) + { + } + + /** + * Stores another group for getting by name. + */ + void register_group(const std::string& name, group_base* gr) + { + if (gr == 0) + { + throw tut_error("group shall be non-null"); + } + + // TODO: inline variable + groups::iterator found = groups_.find(name); + if (found != groups_.end()) + { + std::string msg("attempt to add already existent group " + name); + // this exception terminates application so we use cerr also + // TODO: should this message appear in stream? + std::cerr << msg << std::endl; + throw tut_error(msg); + } + + groups_[name] = gr; + } + + /** + * Stores callback object. + */ + void set_callback(callback* cb) + { + callback_ = cb == 0 ? &default_callback_ : cb; + } + + /** + * Returns callback object. + */ + callback& get_callback() const + { + return *callback_; + } + + /** + * Returns list of known test groups. + */ + const groupnames list_groups() const + { + groupnames ret; + const_iterator i = groups_.begin(); + const_iterator e = groups_.end(); + while (i != e) + { + ret.push_back(i->first); + ++i; + } + return ret; + } + + /** + * Runs all tests in all groups. + * @param callback Callback object if exists; null otherwise + */ + void run_tests() const + { + callback_->run_started(); + + const_iterator i = groups_.begin(); + const_iterator e = groups_.end(); + while (i != e) + { + callback_->group_started(i->first); + try + { + run_all_tests_in_group_(i); + } + catch (const no_more_tests&) + { + callback_->group_completed(i->first); + } + + ++i; + } + + callback_->run_completed(); + } + + /** + * Runs all tests in specified group. + */ + void run_tests(const std::string& group_name) const + { + callback_->run_started(); + + const_iterator i = groups_.find(group_name); + if (i == groups_.end()) + { + callback_->run_completed(); + throw no_such_group(group_name); + } + + callback_->group_started(group_name); + try + { + run_all_tests_in_group_(i); + } + catch (const no_more_tests&) + { + // ok + } + + callback_->group_completed(group_name); + callback_->run_completed(); + } + + /** + * Runs one test in specified group. + */ + test_result run_test(const std::string& group_name, int n) const + { + callback_->run_started(); + + const_iterator i = groups_.find(group_name); + if (i == groups_.end()) + { + callback_->run_completed(); + throw no_such_group(group_name); + } + + callback_->group_started(group_name); + try + { + test_result tr = i->second->run_test(n); + callback_->test_completed(tr); + callback_->group_completed(group_name); + callback_->run_completed(); + return tr; + } + catch (const beyond_last_test&) + { + callback_->group_completed(group_name); + callback_->run_completed(); + throw; + } + catch (const no_such_test&) + { + callback_->group_completed(group_name); + callback_->run_completed(); + throw; + } + } + +protected: + + typedef std::map groups; + typedef groups::iterator iterator; + typedef groups::const_iterator const_iterator; + groups groups_; + + callback default_callback_; + callback* callback_; + + +private: + + void run_all_tests_in_group_(const_iterator i) const + { + i->second->rewind(); + for ( ;; ) + { + test_result tr = i->second->run_next(); + callback_->test_completed(tr); + + if (tr.result == test_result::ex_ctor) + { + throw no_more_tests(); + } + } + } +}; + +/** + * Singleton for test_runner implementation. + * Instance with name runner_singleton shall be implemented + * by user. + */ +class test_runner_singleton +{ +public: + + static test_runner& get() + { + static test_runner tr; + return tr; + } +}; + +extern test_runner_singleton runner; + +/** + * Test object. Contains data test run upon and default test method + * implementation. Inherited from Data to allow tests to + * access test data as members. + */ +template +class test_object : public Data +{ +public: + + /** + * Default constructor + */ + test_object() + { + } + + void set_test_name(const std::string& current_test_name) + { + current_test_name_ = current_test_name; + } + + const std::string& get_test_name() const + { + return current_test_name_; + } + + /** + * Default do-nothing test. + */ + template + void test() + { + called_method_was_a_dummy_test_ = true; + } + + /** + * The flag is set to true by default (dummy) test. + * Used to detect usused test numbers and avoid unnecessary + * test object creation which may be time-consuming depending + * on operations described in Data::Data() and Data::~Data(). + * TODO: replace with throwing special exception from default test. + */ + bool called_method_was_a_dummy_test_; + +private: + + std::string current_test_name_; +}; + +namespace +{ + +/** + * Tests provided condition. + * Throws if false. + */ +void ensure(bool cond) +{ + if (!cond) + { + // TODO: default ctor? + throw failure(""); + } +} + +/** + * Tests provided condition. + * Throws if true. + */ +void ensure_not(bool cond) +{ + ensure(!cond); +} + +/** + * Tests provided condition. + * Throws if false. + */ +template +void ensure(const T msg, bool cond) +{ + if (!cond) + { + throw failure(msg); + } +} + +/** + * Tests provided condition. + * Throws if true. + */ +template +void ensure_not(const T msg, bool cond) +{ + ensure(msg, !cond); +} + +/** + * Tests two objects for being equal. + * Throws if false. + * + * NB: both T and Q must have operator << defined somewhere, or + * client code will not compile at all! + */ +template +void ensure_equals(const char* msg, const Q& actual, const T& expected) +{ + if (expected != actual) + { + std::stringstream ss; + ss << (msg ? msg : "") + << (msg ? ":" : "") + << " expected '" + << expected + << "' actual '" + << actual + << '\''; + throw failure(ss.str().c_str()); + } +} + +template +void ensure_equals(const Q& actual, const T& expected) +{ + ensure_equals<>(0, actual, expected); +} + +/** + * Specialization of ensure_equals for double type. + * NOTE: unofficial extension added by mloskot + */ +template <> +void ensure_equals(const char* msg, const double& actual, const double& expected) +{ + const double epsilon = std::numeric_limits::epsilon(); + const double diff = actual - expected; + + if ( !((diff <= epsilon) && (diff >= -epsilon )) ) + { + std::stringstream ss; + ss << (msg?msg:"") << (msg?": ":"") + << std::scientific << std::showpoint << std::setprecision(16) + << "expected " << expected + << " actual " << actual + << " with precision " << epsilon; + throw failure(ss.str().c_str()); + } +} + +template <> +void ensure_equals(const double& actual, const double& expected) +{ + ensure_equals<>(0, actual, expected); +} + +/** + * Tests two objects for being at most in given distance one from another. + * Borders are excluded. + * Throws if false. + * + * NB: T must have operator << defined somewhere, or + * client code will not compile at all! Also, T shall have + * operators + and -, and be comparable. + */ +template +void ensure_distance(const char* msg, const T& actual, const T& expected, + const T& distance) +{ + if (expected-distance >= actual || expected+distance <= actual) + { + std::stringstream ss; + ss << (msg ? msg : "") + << (msg? ":" : "") + << " expected (" + << expected-distance + << " - " + << expected+distance + << ") actual '" + << actual + << '\''; + throw failure(ss.str().c_str()); + } +} + +template +void ensure_distance(const T& actual, const T& expected, const T& distance) +{ + ensure_distance<>(0, actual, expected, distance); +} + +/** + * Unconditionally fails with message. + */ +void fail(const char* msg = "") +{ + throw failure(msg); +} + +} // end of namespace + +/** + * Walks through test tree and stores address of each + * test method in group. Instantiation stops at 0. + */ +template +struct tests_registerer +{ + static void reg(Group& group) + { + group.reg(n, &Test::template test); + tests_registerer::reg(group); + } +}; + +template +struct tests_registerer +{ + static void reg(Group&) + { + } +}; + +/** + * Test group; used to recreate test object instance for + * each new test since we have to have reinitialized + * Data base class. + */ +template +class test_group : public group_base +{ + const char* name_; + + typedef void (test_object::*testmethod)(); + typedef std::map tests; + typedef typename tests::iterator tests_iterator; + typedef typename tests::const_iterator tests_const_iterator; + typedef typename tests::const_reverse_iterator + tests_const_reverse_iterator; + typedef typename tests::size_type size_type; + + tests tests_; + tests_iterator current_test_; + + /** + * Exception-in-destructor-safe smart-pointer class. + */ + template + class safe_holder + { + T* p_; + bool permit_throw_in_dtor; + + safe_holder(const safe_holder&); + safe_holder& operator=(const safe_holder&); + + public: + safe_holder() + : p_(0), + permit_throw_in_dtor(false) + { + } + + ~safe_holder() + { + release(); + } + + T* operator->() const + { + return p_; + } + + T* get() const + { + return p_; + } + + /** + * Tell ptr it can throw from destructor. Right way is to + * use std::uncaught_exception(), but some compilers lack + * correct implementation of the function. + */ + void permit_throw() + { + permit_throw_in_dtor = true; + } + + /** + * Specially treats exceptions in test object destructor; + * if test itself failed, exceptions in destructor + * are ignored; if test was successful and destructor failed, + * warning exception throwed. + */ + void release() + { + try + { + if (delete_obj() == false) + { + throw warning("destructor of test object raised" + " an SEH exception"); + } + } + catch (const std::exception& ex) + { + if (permit_throw_in_dtor) + { + std::string msg = "destructor of test object raised" + " exception: "; + msg += ex.what(); + throw warning(msg); + } + } + catch( ... ) + { + if (permit_throw_in_dtor) + { + throw warning("destructor of test object raised an" + " exception"); + } + } + } + + /** + * Re-init holder to get brand new object. + */ + void reset() + { + release(); + permit_throw_in_dtor = false; + p_ = new T(); + } + + bool delete_obj() + { +#if defined(TUT_USE_SEH) + __try + { +#endif + T* p = p_; + p_ = 0; + delete p; +#if defined(TUT_USE_SEH) + } + __except(handle_seh_(::GetExceptionCode())) + { + if (permit_throw_in_dtor) + { + return false; + } + } +#endif + return true; + } + }; + +public: + + typedef test_object object; + + /** + * Creates and registers test group with specified name. + */ + test_group(const char* name) + : name_(name) + { + // register itself + runner.get().register_group(name_,this); + + // register all tests + tests_registerer::reg(*this); + } + + /** + * This constructor is used in self-test run only. + */ + test_group(const char* name, test_runner& another_runner) + : name_(name) + { + // register itself + another_runner.register_group(name_, this); + + // register all tests + tests_registerer, test_group, + MaxTestsInGroup>::reg(*this); + }; + + /** + * Registers test method under given number. + */ + void reg(int n, testmethod tm) + { + tests_[n] = tm; + } + + /** + * Reset test position before first test. + */ + void rewind() + { + current_test_ = tests_.begin(); + } + + /** + * Runs next test. + */ + test_result run_next() + { + if (current_test_ == tests_.end()) + { + throw no_more_tests(); + } + + // find next user-specialized test + safe_holder obj; + while (current_test_ != tests_.end()) + { + try + { + return run_test_(current_test_++, obj); + } + catch (const no_such_test&) + { + continue; + } + } + + throw no_more_tests(); + } + + /** + * Runs one test by position. + */ + test_result run_test(int n) + { + // beyond tests is special case to discover upper limit + if (tests_.rbegin() == tests_.rend()) + { + throw beyond_last_test(); + } + + if (tests_.rbegin()->first < n) + { + throw beyond_last_test(); + } + + // withing scope; check if given test exists + tests_iterator ti = tests_.find(n); + if (ti == tests_.end()) + { + throw no_such_test(); + } + + safe_holder obj; + return run_test_(ti, obj); + } + +private: + + /** + * VC allows only one exception handling type per function, + * so I have to split the method. + * + * TODO: refactoring needed! + */ + test_result run_test_(const tests_iterator& ti, safe_holder& obj) + { + std::string current_test_name; + try + { + if (run_test_seh_(ti->second,obj, current_test_name) == false) + { + throw seh("seh"); + } + } + catch (const no_such_test&) + { + throw; + } + catch (const warning& ex) + { + // test ok, but destructor failed + if (obj.get()) + { + current_test_name = obj->get_test_name(); + } + test_result tr(name_,ti->first, current_test_name, + test_result::warn, ex); + return tr; + } + catch (const failure& ex) + { + // test failed because of ensure() or similar method + if (obj.get()) + { + current_test_name = obj->get_test_name(); + } + test_result tr(name_,ti->first, current_test_name, + test_result::fail, ex); + return tr; + } + catch (const seh& ex) + { + // test failed with sigsegv, divide by zero, etc + if (obj.get()) + { + current_test_name = obj->get_test_name(); + } + test_result tr(name_, ti->first, current_test_name, + test_result::term, ex); + return tr; + } + catch (const bad_ctor& ex) + { + // test failed because test ctor failed; stop the whole group + if (obj.get()) + { + current_test_name = obj->get_test_name(); + } + test_result tr(name_, ti->first, current_test_name, + test_result::ex_ctor, ex); + return tr; + } + catch (const std::exception& ex) + { + // test failed with std::exception + if (obj.get()) + { + current_test_name = obj->get_test_name(); + } + test_result tr(name_, ti->first, current_test_name, + test_result::ex, ex); + return tr; + } + catch (...) + { + // test failed with unknown exception + if (obj.get()) + { + current_test_name = obj->get_test_name(); + } + test_result tr(name_, ti->first, current_test_name, + test_result::ex); + return tr; + } + + // test passed + test_result tr(name_,ti->first, current_test_name, test_result::ok); + return tr; + } + + /** + * Runs one under SEH if platform supports it. + */ + bool run_test_seh_(testmethod tm, safe_holder& obj, + std::string& current_test_name) + { +#if defined(TUT_USE_SEH) + __try + { +#endif + if (obj.get() == 0) + { + reset_holder_(obj); + } + + obj->called_method_was_a_dummy_test_ = false; + +#if defined(TUT_USE_SEH) + + __try + { +#endif + (obj.get()->*tm)(); +#if defined(TUT_USE_SEH) + } + __except(handle_seh_(::GetExceptionCode())) + { + // throw seh("SEH"); + current_test_name = obj->get_test_name(); + return false; + } +#endif + + if (obj->called_method_was_a_dummy_test_) + { + // do not call obj.release(); reuse object + throw no_such_test(); + } + + current_test_name = obj->get_test_name(); + obj.permit_throw(); + obj.release(); +#if defined(TUT_USE_SEH) + } + __except(handle_seh_(::GetExceptionCode())) + { + return false; + } +#endif + return true; + } + + void reset_holder_(safe_holder& obj) + { + try + { + obj.reset(); + } + catch (const std::exception& ex) + { + throw bad_ctor(ex.what()); + } + catch (...) + { + throw bad_ctor("test constructor has generated an exception;" + " group execution is terminated"); + } + } +}; + +#if defined(TUT_USE_SEH) +/** + * Decides should we execute handler or ignore SE. + */ +inline int handle_seh_(DWORD excode) +{ + switch(excode) + { + case EXCEPTION_ACCESS_VIOLATION: + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_BREAKPOINT: + case EXCEPTION_SINGLE_STEP: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_FLT_DENORMAL_OPERAND: + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + case EXCEPTION_FLT_INEXACT_RESULT: + case EXCEPTION_FLT_INVALID_OPERATION: + case EXCEPTION_FLT_OVERFLOW: + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_FLT_UNDERFLOW: + case EXCEPTION_INT_DIVIDE_BY_ZERO: + case EXCEPTION_INT_OVERFLOW: + case EXCEPTION_PRIV_INSTRUCTION: + case EXCEPTION_IN_PAGE_ERROR: + case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_NONCONTINUABLE_EXCEPTION: + case EXCEPTION_STACK_OVERFLOW: + case EXCEPTION_INVALID_DISPOSITION: + case EXCEPTION_GUARD_PAGE: + case EXCEPTION_INVALID_HANDLE: + return EXCEPTION_EXECUTE_HANDLER; + }; + + return EXCEPTION_CONTINUE_SEARCH; +} +#endif +} + +#endif + diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/aclocal.m4 work/liblas-src-1.2.1/aclocal.m4 --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/aclocal.m4 2009-10-03 01:02:34.000000000 +0800 +++ work/liblas-src-1.2.1/aclocal.m4 1970-01-01 08:00:00.000000000 +0800 @@ -1,8760 +0,0 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 56 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_quote(m4_if([$2], [], - m4_quote(lt_decl_tag_varnames), - m4_quote(m4_shift($@)))), - m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) -m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - -_LT_OUTPUT_LIBTOOL_INIT -]) - - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2008 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM -f \"$cfgfile\"; exit 1" 1 2 15 - $RM -f "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then - output_verbose_link_cmd=echo - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(lt_ECHO) -]) -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM -r conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM -r conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM -r conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM -r conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[[3-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -r -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -r -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | ecpc* ) - # Intel C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM -r conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM -r conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${F77-"f77"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${FC-"f95"} - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC="$lt_save_CC" -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC="$lt_save_CC" -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF - ;; - esac -]) - -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) - -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 5 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -m4_define([lt_combine], -[m4_if([$2], [], [], - [m4_if([$4], [], [], - [lt_join(m4_quote(m4_default([$1], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl -]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) - -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# Generated from ltversion.in. - -# serial 2976 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.2.4]) -m4_define([LT_PACKAGE_REVISION], [1.2976]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.4' -macro_revision='1.2976' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) - -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 4 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) - -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 3 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/las2las.c work/liblas-src-1.2.1/apps/las2las.c --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/las2las.c 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/las2las.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,802 +0,0 @@ -/*************************************************************************** - * $Id$ - * $Date$ - * - * Project: libLAS -- C/C++ read/write library for LAS LIDAR data - * Purpose: LAS translation with optional configuration - * Author: Martin Isenburg isenburg@cs.unc.edu - *************************************************************************** - * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu - * - * See LICENSE.txt in this source distribution for more information. - **************************************************************************/ - -#include -#include -#include -#include -#include - -#include "liblas.h" - -LASPointSummary* SummarizePoints(LASReaderH reader); -void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header); -void print_point(FILE *file, LASPointH point); -void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR); -void repair_header(FILE *file, LASHeaderH header, LASPointSummary* summary) ; - -#define LAS_FORMAT_10 0 -#define LAS_FORMAT_11 1 -#define LAS_FORMAT_12 2 - -void usage() -{ - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," las2las (version %s) usage:\n", LAS_GetVersion()); - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Clip las file to a bounding box, throwing out points that have invalid data:\n"); - fprintf(stderr," las2las -i in.las -clip 63000000 483450000 63050000 483500000 -o out.las --skip_invalid\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Read from stdin, eliminate intensities below 2000, and write to stdout:\n"); - fprintf(stderr," las2las --eliminate_intensity_below 2000 --stdin --stdout < in.las > out.las \n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Eliminate return number two:\n"); - fprintf(stderr," las2las -i in.las -eliminate_return 2 -o out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Eliminate scan angles above 15:\n"); - fprintf(stderr," las2las -i in.las -eliminate_scan_angle_above 15 -o out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Eliminate intensities below 1000:\n"); - fprintf(stderr," las2las -i in.las -eliminate_intensity_below 1000 --stdout > out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Eliminate intensities below 1000 and classifications that equal 2 (ground):\n"); - fprintf(stderr," las2las -i in.las --eliminate_class 2 --out out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Capture only first returns and clip to bounding box:\n"); - fprintf(stderr," las2las -i in.las -first_only -clip 63000000 483450000 63050000 483500000 -o out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Capture only last returns, eliminate intensities below 2000, and write to stdout:\n"); - fprintf(stderr," las2las --input in.las --last_only --eliminate_intensity_below 2000 --stdout > out.las\n"); - fprintf(stderr,"\n"); - - - fprintf(stderr, "\nFor more information, see the full documentation for las2las at:\n" - " http://liblas.org/browser/trunk/doc/las2las.txt\n"); - fprintf(stderr,"----------------------------------------------------------\n"); - -} - -void ptime(const char *const msg) -{ - float t= ((float)clock())/CLOCKS_PER_SEC; - fprintf(stderr, "cumulative CPU time thru %s = %f\n", msg, t); -} - -int main(int argc, char *argv[]) -{ - int i; - int verbose = FALSE; - int use_stdin = FALSE; - int use_stdout = FALSE; - char* file_name_in = 0; - char* file_name_out = 0; - double *clip_xy_min = NULL; - double *clip_xy_max = NULL; - int clip = FALSE; - int remove_extra_header = FALSE; - int elim_return = 0; - int elim_scan_angle_above = 0; - int elim_intensity_below = 0; - int elim_class = 0; - int clsidx = 0; - int first_only = FALSE; - int last_only = FALSE; - int skip_invalid = FALSE; - int format = LAS_FORMAT_12; - - LASReaderH reader = NULL; - LASHeaderH header = NULL; - LASHeaderH surviving_header = NULL; - LASPointH p = NULL; - LASWriterH writer = NULL; - - int first_surviving_point = TRUE; - unsigned int surviving_number_of_point_records = 0; - unsigned int surviving_number_of_points_by_return[] = {0,0,0,0,0,0,0,0}; - LASPointH surviving_point_min = NULL; - LASPointH surviving_point_max = NULL; - double surviving_gps_time_min; - double surviving_gps_time_max; - - int clipped = 0; - int eliminated_return = 0; - int eliminated_scan_angle = 0; - int eliminated_intensity = 0; - int eliminated_class = 0; - int eliminated_first_only = 0; - int eliminated_last_only = 0; - - double minx, maxx, miny, maxy, minz, maxz; - - LASPointSummary* summary = NULL; - - for (i = 1; i < argc; i++) { - if ( strcmp(argv[i],"-h") == 0 || - strcmp(argv[i],"--help") == 0 - ) - { - usage(); - exit(0); - } - else if ( strcmp(argv[i],"-v") == 0 || - strcmp(argv[i],"--verbose") == 0 - ) - { - verbose = TRUE; - } - else if ( strcmp(argv[i],"-s") == 0 || - strcmp(argv[i],"--skip_invalid") == 0 - ) - { - skip_invalid = TRUE; - } - else if ( strcmp(argv[i],"--input") == 0 || - strcmp(argv[i],"-input") == 0 || - strcmp(argv[i],"-i") == 0 || - strcmp(argv[i],"-in") == 0 - ) - { - i++; - file_name_in = argv[i]; - } - else if ( strcmp(argv[i],"--output") == 0 || - strcmp(argv[i],"--out") == 0 || - strcmp(argv[i],"-out") == 0 || - strcmp(argv[i],"-o") == 0 - ) - { - i++; - file_name_out = argv[i]; - } - - else if ( strcmp(argv[i],"--stdout") == 0 || - strcmp(argv[i],"-olas") == 0 - ) - { - use_stdout = TRUE; - file_name_out = "stdout"; - } - else if ( strcmp(argv[i],"--clip") == 0 || - strcmp(argv[i],"-clip") == 0 || - strcmp(argv[i],"-clip_xy") == 0 - ) - { - clip_xy_min = (double*) malloc (2 * sizeof(double)); - clip_xy_max = (double*) malloc( 2 * sizeof(double)); - i++; - clip_xy_min[0] = atof(argv[i]); - i++; - clip_xy_min[1] = atof(argv[i]); - i++; - clip_xy_max[0] = atof(argv[i]); - i++; - clip_xy_max[1] = atof(argv[i]); - clip = TRUE; - } - else if ( strcmp(argv[i],"--format") == 0 || - strcmp(argv[i],"-f") == 0 || - strcmp(argv[i],"-format") == 0 - ) - { - i++; - if (strcmp(argv[i], "1.0") == 0) { - format = LAS_FORMAT_10; - } - else if (strcmp(argv[i], "1.1") == 0) { - format = LAS_FORMAT_11; - } - else if (strcmp(argv[i], "1.2") == 0) { - format = LAS_FORMAT_12; - } - else { - LASError_Print("Format must be specified as 1.0, 1.1, or 1.2"); - } - - } - - else if ( strcmp(argv[i],"--eliminate_return") == 0 || - strcmp(argv[i],"-eliminate_return") == 0 || - strcmp(argv[i],"-elim_return") == 0 || - strcmp(argv[i],"-elim_ret") == 0 - ) - { - i++; - elim_return |= (1 << atoi(argv[i])); - } - else if ( strcmp(argv[i],"--eliminate_scan_angle_above") == 0 || - strcmp(argv[i],"-eliminate_scan_angle_above") == 0 || - strcmp(argv[i],"-elim_scan_angle_above") == 0 || - strcmp(argv[i],"--clip_scan_above") == 0 - ) - { - i++; - elim_scan_angle_above = atoi(argv[i]); - } - else if ( strcmp(argv[i],"--eliminate_class") == 0 || - strcmp(argv[i],"-eliminate_class") == 0 || - strcmp(argv[i],"-elim_class") == 0 || - strcmp(argv[i],"--class") == 0 - ) - { - i++; - elim_class = atoi(argv[i]); - } - else if ( strcmp(argv[i],"--eliminate_intensity_below") == 0 || - strcmp(argv[i],"-eliminate_intensity_below") == 0 || - strcmp(argv[i],"-elim_intensity_below") == 0 || - strcmp(argv[i],"--clip_intensity_below") == 0 - ) - { - i++; - elim_intensity_below = atoi(argv[i]); - } - else if ( strcmp(argv[i], "--stdin") == 0 || - strcmp(argv[i], "-ilas") == 0 - ) - { - use_stdin = TRUE; - } - else if ( strcmp(argv[i], "--first_only") == 0 || - strcmp(argv[i], "-first_only") == 0 - ) - { - first_only = TRUE; - } - else if ( strcmp(argv[i], "--last_only") == 0 || - strcmp(argv[i], "-last_only") == 0 - ) - { - last_only = TRUE; - } - else if ( strcmp(argv[i], "--remove_extra_header") == 0 || - strcmp(argv[i], "-remove_extra_header") == 0 - ) - { - remove_extra_header = TRUE; - } - else if (file_name_in == NULL && file_name_out == NULL) - { - file_name_in = argv[i]; - } - else if (file_name_in != NULL && file_name_out == NULL) - { - file_name_out = argv[i]; - } - else - { - fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); - usage(); - exit(1); - } - } - - if (use_stdin) file_name_in="stdin"; - if (file_name_in) - { - reader = LASReader_Create(file_name_in); - if (!reader) { - LASError_Print("Could not open file to read"); - exit(1); - } - } - else - { - LASError_Print("no input specified"); - usage(); - exit(1); - } - - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not fetch header"); - exit(1); - } - - if (verbose) { - ptime("start."); - fprintf(stderr, "first pass reading %d points ...\n", LASHeader_GetPointRecordsCount(header)); - } - - p = LASReader_GetNextPoint(reader); - - if (!p) { - if (LASError_GetLastErrorNum()) - LASError_Print("Not able to fetch a point. LASReader is invalid"); - else - LASError_Print("File does not contain any points to read."); - exit(1); - } - - while (p) - { - - if (last_only && LASPoint_GetReturnNumber(p) != LASPoint_GetNumberOfReturns(p)) - { - eliminated_last_only++; - p = LASReader_GetNextPoint(reader); - continue; - } - if (first_only && LASPoint_GetReturnNumber(p) != 1) - { - eliminated_first_only++; - p = LASReader_GetNextPoint(reader); - continue; - } - - if (clip && (LASPoint_GetX(p) < clip_xy_min[0] || LASPoint_GetY(p) < clip_xy_min[1])) - { - clipped++; - p = LASReader_GetNextPoint(reader); - continue; - } - if (clip && (LASPoint_GetX(p) > clip_xy_max[0] || LASPoint_GetY(p) > clip_xy_max[1])) - { - clipped++; - p = LASReader_GetNextPoint(reader); - continue; - } - if (elim_return && (elim_return & (1 << LASPoint_GetReturnNumber(p)))) - { - eliminated_return++; - p = LASReader_GetNextPoint(reader); - continue; - } - if (elim_scan_angle_above && (LASPoint_GetScanAngleRank(p) > elim_scan_angle_above || LASPoint_GetScanAngleRank(p) < -elim_scan_angle_above)) - { - eliminated_scan_angle++; - p = LASReader_GetNextPoint(reader); - continue; - } - - clsidx = LASPoint_GetClassification(p); - clsidx = (clsidx & 31); // 31 is max index in classification lookup table - assert(clsidx <= 31); - if (elim_class && (elim_class == clsidx)) - { - eliminated_class++; - p = LASReader_GetNextPoint(reader); - continue; - } - - if (elim_intensity_below && LASPoint_GetIntensity(p) < elim_intensity_below) - { - eliminated_intensity++; - p = LASReader_GetNextPoint(reader); - continue; - } - surviving_number_of_point_records++; - - if (LASPoint_GetReturnNumber(p)) - surviving_number_of_points_by_return[LASPoint_GetReturnNumber(p)-1]++; - else - surviving_number_of_points_by_return[LASPoint_GetReturnNumber(p)]++; - - if (first_surviving_point) - { - surviving_point_min = LASPoint_Copy(p); - surviving_point_max = LASPoint_Copy(p); - surviving_gps_time_min = LASPoint_GetTime(p); - surviving_gps_time_max = LASPoint_GetTime(p); - first_surviving_point = FALSE; - } - else - { - if (LASPoint_GetX(p) < LASPoint_GetX(surviving_point_min)) - LASPoint_SetX(surviving_point_min,LASPoint_GetX(p)); - else if (LASPoint_GetX(p) > LASPoint_GetX(surviving_point_max)) - LASPoint_SetX(surviving_point_max,LASPoint_GetX(p)); - - if (LASPoint_GetY(p) < LASPoint_GetY(surviving_point_min)) - LASPoint_SetY(surviving_point_min,LASPoint_GetY(p)); - else if (LASPoint_GetY(p) > LASPoint_GetY(surviving_point_max)) - LASPoint_SetY(surviving_point_max,LASPoint_GetY(p)); - - if (LASPoint_GetZ(p) < LASPoint_GetZ(surviving_point_min)) - LASPoint_SetZ(surviving_point_min,LASPoint_GetZ(p)); - else if (LASPoint_GetZ(p) > LASPoint_GetZ(surviving_point_max)) - LASPoint_SetZ(surviving_point_max,LASPoint_GetZ(p)); - - if (LASPoint_GetIntensity(p) < LASPoint_GetIntensity(surviving_point_min)) - LASPoint_SetIntensity(surviving_point_min,LASPoint_GetIntensity(p)); - else if (LASPoint_GetIntensity(p) > LASPoint_GetIntensity(surviving_point_max)) - LASPoint_SetIntensity(surviving_point_max,LASPoint_GetIntensity(p)); - - if (LASPoint_GetFlightLineEdge(p) < LASPoint_GetFlightLineEdge(surviving_point_min)) - LASPoint_SetFlightLineEdge(surviving_point_min,LASPoint_GetFlightLineEdge(p)); - else if (LASPoint_GetFlightLineEdge(p) > LASPoint_GetFlightLineEdge(surviving_point_max)) - LASPoint_SetFlightLineEdge(surviving_point_max,LASPoint_GetFlightLineEdge(p)); - - if (LASPoint_GetScanDirection(p) < LASPoint_GetScanDirection(surviving_point_min)) - LASPoint_SetScanDirection(surviving_point_min,LASPoint_GetScanDirection(p)); - else if (LASPoint_GetScanDirection(p) > LASPoint_GetScanDirection(surviving_point_max)) - LASPoint_SetScanDirection(surviving_point_max,LASPoint_GetScanDirection(p)); - - if (LASPoint_GetNumberOfReturns(p) < LASPoint_GetNumberOfReturns(surviving_point_min)) - LASPoint_SetNumberOfReturns(surviving_point_min,LASPoint_GetNumberOfReturns(p)); - else if (LASPoint_GetNumberOfReturns(p) > LASPoint_GetNumberOfReturns(surviving_point_max)) - LASPoint_SetNumberOfReturns(surviving_point_max,LASPoint_GetNumberOfReturns(p)); - - if (LASPoint_GetReturnNumber(p) < LASPoint_GetReturnNumber(surviving_point_min)) - LASPoint_SetReturnNumber(surviving_point_min,LASPoint_GetReturnNumber(p)); - else if (LASPoint_GetReturnNumber(p) > LASPoint_GetReturnNumber(surviving_point_max)) - LASPoint_SetReturnNumber(surviving_point_max,LASPoint_GetReturnNumber(p)); - - if (LASPoint_GetClassification(p) < LASPoint_GetClassification(surviving_point_min)) - LASPoint_SetClassification(surviving_point_min,LASPoint_GetClassification(p)); - else if (LASPoint_GetReturnNumber(p) > LASPoint_GetClassification(surviving_point_max)) - LASPoint_SetClassification(surviving_point_max,LASPoint_GetClassification(p)); - - if (LASPoint_GetScanAngleRank(p) < LASPoint_GetScanAngleRank(surviving_point_min)) - LASPoint_SetScanAngleRank(surviving_point_min,LASPoint_GetScanAngleRank(p)); - else if (LASPoint_GetScanAngleRank(p) > LASPoint_GetScanAngleRank(surviving_point_max)) - LASPoint_SetScanAngleRank(surviving_point_max,LASPoint_GetScanAngleRank(p)); - - if (LASPoint_GetUserData(p) < LASPoint_GetUserData(surviving_point_min)) - LASPoint_SetUserData(surviving_point_min,LASPoint_GetUserData(p)); - else if (LASPoint_GetUserData(p) > LASPoint_GetUserData(surviving_point_max)) - LASPoint_SetUserData(surviving_point_max,LASPoint_GetUserData(p)); - - if (LASPoint_GetTime(p) < LASPoint_GetTime(surviving_point_min)) - LASPoint_SetTime(surviving_point_min,LASPoint_GetTime(p)); - else if (LASPoint_GetTime(p) > LASPoint_GetTime(surviving_point_max)) - LASPoint_SetTime(surviving_point_max,LASPoint_GetTime(p)); - -/* - if (lasreader->point.point_source_ID < surviving_point_min.point_source_ID) surviving_point_min.point_source_ID = lasreader->point.point_source_ID; - else if (lasreader->point.point_source_ID > surviving_point_max.point_source_ID) surviving_point_max.point_source_ID = lasreader->point.point_source_ID; -*/ - } - - p = LASReader_GetNextPoint(reader); - } - - if (eliminated_first_only) - fprintf(stderr, - "eliminated based on first returns only: %d\n", - eliminated_first_only); - if (eliminated_last_only) - fprintf(stderr, - "eliminated based on last returns only: %d\n", - eliminated_last_only); - if (eliminated_class) - fprintf(stderr, - "eliminated classification: %d\n", - eliminated_class); - if (clipped) - fprintf(stderr, - "clipped: %d\n", - clipped); - if (eliminated_return) - fprintf(stderr, - "eliminated based on return number: %d\n", - eliminated_return); - if (eliminated_scan_angle) - fprintf(stderr, - "eliminated based on scan angle: %d\n", - eliminated_scan_angle); - if (eliminated_intensity) - fprintf(stderr, - "eliminated based on intensity: %d\n", - eliminated_intensity); - - LASReader_Destroy(reader); - LASHeader_Destroy(header); - - if (verbose) - { - fprintf(stderr, - "x %.3f %.3f %.3f\n", - LASPoint_GetX(surviving_point_min), - LASPoint_GetX(surviving_point_max), - LASPoint_GetX(surviving_point_max) - LASPoint_GetX(surviving_point_min) - ); - fprintf(stderr, - "y %.3f %.3f %.3f\n", - LASPoint_GetY(surviving_point_min), - LASPoint_GetY(surviving_point_max), - LASPoint_GetY(surviving_point_max) - LASPoint_GetY(surviving_point_min) - ); - fprintf(stderr, - "z %.3f %.3f %.3f\n", - LASPoint_GetZ(surviving_point_min), - LASPoint_GetZ(surviving_point_max), - LASPoint_GetZ(surviving_point_max) - LASPoint_GetZ(surviving_point_min) - ); - fprintf(stderr, - "intensity %d %d %d\n", - LASPoint_GetIntensity(surviving_point_min), - LASPoint_GetIntensity(surviving_point_max), - LASPoint_GetIntensity(surviving_point_max) - LASPoint_GetIntensity(surviving_point_min) - ); - fprintf(stderr, - "edge_of_flight_line %d %d %d\n", - LASPoint_GetFlightLineEdge(surviving_point_min), - LASPoint_GetFlightLineEdge(surviving_point_max), - LASPoint_GetFlightLineEdge(surviving_point_max) - LASPoint_GetFlightLineEdge(surviving_point_min) - ); - fprintf(stderr, - "scan_direction_flag %d %d %d\n", - LASPoint_GetScanDirection(surviving_point_min), - LASPoint_GetScanDirection(surviving_point_max), - LASPoint_GetScanDirection(surviving_point_max) - LASPoint_GetScanDirection(surviving_point_min) - ); - fprintf(stderr, - "number_of_returns_of_given_pulse %d %d %d\n", - LASPoint_GetNumberOfReturns(surviving_point_min), - LASPoint_GetNumberOfReturns(surviving_point_max), - LASPoint_GetNumberOfReturns(surviving_point_max) - LASPoint_GetNumberOfReturns(surviving_point_min) - ); - fprintf(stderr, - "return_number %d %d %d\n", - LASPoint_GetReturnNumber(surviving_point_min), - LASPoint_GetReturnNumber(surviving_point_max), - LASPoint_GetReturnNumber(surviving_point_max) - LASPoint_GetReturnNumber(surviving_point_min) - ); - fprintf(stderr, - "classification %d %d %d\n", - LASPoint_GetClassification(surviving_point_min), - LASPoint_GetClassification(surviving_point_max), - LASPoint_GetClassification(surviving_point_max) - LASPoint_GetClassification(surviving_point_min) - ); - fprintf(stderr, - "scan_angle_rank %d %d %d\n", - LASPoint_GetScanAngleRank(surviving_point_min), - LASPoint_GetScanAngleRank(surviving_point_max), - LASPoint_GetScanAngleRank(surviving_point_max) - LASPoint_GetScanAngleRank(surviving_point_min) - ); - fprintf(stderr, - "user_data %d %d %d\n", - LASPoint_GetUserData(surviving_point_min), - LASPoint_GetUserData(surviving_point_max), - LASPoint_GetUserData(surviving_point_max) - LASPoint_GetUserData(surviving_point_min) - ); - fprintf(stderr, - "gps_time %.8f %.8f %.8f\n", - LASPoint_GetTime(surviving_point_min), - LASPoint_GetTime(surviving_point_max), - LASPoint_GetTime(surviving_point_max) - LASPoint_GetTime(surviving_point_min) - ); -/* - fprintf(stderr, "point_source_ID %d %d %d\n",surviving_point_min.point_source_ID, surviving_point_max.point_source_ID, surviving_point_max.point_source_ID - surviving_point_min.point_source_ID); -*/ - } - - - if (file_name_out == NULL && !use_stdout) - { - LASError_Print("no output specified. exiting..."); - exit(1); - } - - - if (file_name_in) - { - reader = LASReader_Create(file_name_in); - if (!reader) { - LASError_Print("Could not open file to read"); - exit(1); - } - } - else - { - LASError_Print("no input specified"); - usage(); - exit(1); - } - - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not read header"); - exit(1); - } - - - surviving_header = LASHeader_Copy(header); - - LASHeader_SetPointRecordsCount(surviving_header, surviving_number_of_point_records); - LASHeader_SetSystemId(surviving_header, "MODIFICATION"); - - for (i = 0; i < 5; i++) LASHeader_SetPointRecordsByReturnCount(surviving_header, i, surviving_number_of_points_by_return[i]); - - minx = LASPoint_GetX(surviving_point_min) * LASHeader_GetScaleX(surviving_header) + LASHeader_GetOffsetX(surviving_header); - maxx = LASPoint_GetX(surviving_point_max) * LASHeader_GetScaleX(surviving_header) + LASHeader_GetOffsetX(surviving_header); - - miny = LASPoint_GetY(surviving_point_min) * LASHeader_GetScaleY(surviving_header) + LASHeader_GetOffsetY(surviving_header); - maxy = LASPoint_GetY(surviving_point_max) * LASHeader_GetScaleY(surviving_header) + LASHeader_GetOffsetY(surviving_header); - - minz = LASPoint_GetZ(surviving_point_min) * LASHeader_GetScaleZ(surviving_header) + LASHeader_GetOffsetZ(surviving_header); - maxz = LASPoint_GetZ(surviving_point_max) * LASHeader_GetScaleZ(surviving_header) + LASHeader_GetOffsetZ(surviving_header); - - if (format == LAS_FORMAT_10) { - LASHeader_SetVersionMinor(surviving_header, 0); - } else if (format == LAS_FORMAT_11){ - LASHeader_SetVersionMinor(surviving_header, 1); - } else if (format == LAS_FORMAT_12) { - LASHeader_SetVersionMinor(surviving_header, 2); - } - - -/* if (remove_extra_header) surviving_header.offset_to_point_data = surviving_header.header_size; -*/ - - if (verbose) { - fprintf(stderr, - "second pass reading %d and writing %d points ...\n", - LASHeader_GetPointRecordsCount(surviving_header), - surviving_number_of_point_records); - } - - if (use_stdout) file_name_out = "stdout"; - - writer = LASWriter_Create(file_name_out, surviving_header, LAS_MODE_WRITE); - if (!writer) { - LASError_Print("Could not open file to write"); - exit(1); - } - -/* - - if (!remove_extra_header) - { - for (unsigned int u = lasreader->header.header_size; u < lasreader->header.offset_to_point_data; u++) - { - fputc(fgetc(file_in),file_out); - } - } -*/ - - - LASReader_Destroy(reader); - reader = NULL; - if (file_name_in) - { - reader = LASReader_Create(file_name_in); - if (!reader) { - LASError_Print("Could not open file to read"); - exit(1); - } - } - else - { - LASError_Print("no input specified"); - usage(); - exit(1); - } - - p = LASReader_GetNextPoint(reader); - if (!p) { - if (LASError_GetLastErrorNum()) - LASError_Print("Not able to fetch a point. LASReader is invalid"); - else - LASError_Print("File does not contain any points to read."); - exit(1); - } - - while (p) { - - if (skip_invalid && !LASPoint_IsValid(p)) { - p = LASReader_GetNextPoint(reader); - continue; - } - if (last_only && LASPoint_GetReturnNumber(p) != LASPoint_GetNumberOfReturns(p)) - { - p = LASReader_GetNextPoint(reader); - continue; - } - if (first_only && LASPoint_GetReturnNumber(p) != 1) - { - p = LASReader_GetNextPoint(reader); - continue; - - } - if (clip_xy_min && (LASPoint_GetX(p) < clip_xy_min[0] || LASPoint_GetY(p) < clip_xy_min[1])) - { - p = LASReader_GetNextPoint(reader); - continue; - } - if (clip_xy_max && (LASPoint_GetX(p) > clip_xy_max[0] || LASPoint_GetY(p) > clip_xy_max[1])) - { - p = LASReader_GetNextPoint(reader); - continue; - } - if (elim_return && (elim_return & (1 << LASPoint_GetReturnNumber(p)))) - { - p = LASReader_GetNextPoint(reader); - continue; - } - if (elim_scan_angle_above && (LASPoint_GetScanAngleRank(p) > elim_scan_angle_above || LASPoint_GetScanAngleRank(p) < -elim_scan_angle_above)) - { - p = LASReader_GetNextPoint(reader); - continue; - } - if (elim_intensity_below && LASPoint_GetIntensity(p) < elim_intensity_below) - { - p = LASReader_GetNextPoint(reader); - continue; - } - - clsidx = LASPoint_GetClassification(p); - clsidx = (clsidx & 31); // 31 is max index in classification lookup table - assert(clsidx <= 31); - if (elim_class && (elim_class == clsidx)) - { - p = LASReader_GetNextPoint(reader); - continue; - } - LASWriter_WritePoint(writer,p); - - p = LASReader_GetNextPoint(reader); - } - - LASWriter_Destroy(writer); - LASReader_Destroy(reader); - LASHeader_Destroy(header); - LASHeader_Destroy(surviving_header); - LASPoint_Destroy(surviving_point_max); - LASPoint_Destroy(surviving_point_min); - - reader = LASReader_Create(file_name_out); - if (!reader) { - LASError_Print("Could not open file to read"); - exit(1); - } - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not read header"); - exit(1); - } - summary = SummarizePoints(reader); - if (verbose) { - print_point_summary(stderr, summary, header); - } - repair_header(stderr, header, summary) ; - - if (summary) { - LASPoint_Destroy(summary->pmin); - LASPoint_Destroy(summary->pmax); - free(summary); - } - - if (reader) { - LASReader_Destroy(reader); - reader = NULL; - } - - writer = LASWriter_Create(file_name_out, header, LAS_MODE_APPEND); - if (!writer) { - LASError_Print("Problem creating LASWriterH object for append"); - LASHeader_Destroy(header); - header = NULL; - exit(1); - } - LASWriter_Destroy(writer); - writer = NULL; - LASHeader_Destroy(header); - header = NULL; - - if (verbose) ptime("done."); - - return 0; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/las2ogr.cpp work/liblas-src-1.2.1/apps/las2ogr.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/las2ogr.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/las2ogr.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,377 +0,0 @@ -// $Id$ -// -// las2ogr translates LAS file to OGR datasource. -// Inspired by pylas.py script developed by Matthew Perry and Carl Anderson, -// available at http://code.google.com/p/pylas/ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#ifdef HAVE_GDAL -#if defined(_MSC_VER) && defined(USE_VLD) -#include -#endif -// liblas -#include -#include -#include -#include -// ogr -#include -//std -#include -#include -#include -#include -#include -#include - -// Anonymous namespace for local definitions -namespace { - -template -class ogr_wrapper -{ - typedef void(*deleter_type)(T p); - -public: - - ogr_wrapper(T p, deleter_type d) - : p_(p), del_(d) - {} - - ~ogr_wrapper() - { - do_delete(p_); - } - - void reset(T p) - { - do_delete(p_); - p_= p; - } - - operator T() - { - return get(); - } - - - T get() const - { - return p_; - } - - void swap(ogr_wrapper& other) - { - std::swap(p_, other.p_); - } - -private: - - ogr_wrapper(ogr_wrapper const& other); - ogr_wrapper& operator=(ogr_wrapper const& rhs); - - void do_delete(T p) - { - assert(del_); - if (0 != p) - del_(p); - } - - T p_; - deleter_type del_; - -}; - -bool term_progress(std::ostream& os, double complete) -{ - static int lastTick = -1; - int tick = static_cast(complete * 40.0); - - tick = std::min(40, std::max(0, tick)); - - // Have we started a new progress run? - if (tick < lastTick && lastTick >= 39) - lastTick = -1; - - if (tick <= lastTick) - return true; - - while (tick > lastTick) - { - lastTick++; - if (lastTick % 4 == 0) - os << (lastTick / 4) * 10; - else - os << "."; - } - - if( tick == 40 ) - os << " - done.\n"; - else - os.flush(); - - return true; -} - -OGRFieldDefnH create_field(const char* name, OGRFieldType type, int width, int precision) -{ - OGRFieldDefnH fld; - fld= OGR_Fld_Create(name, type); - OGR_Fld_SetWidth(fld, width); - OGR_Fld_SetPrecision(fld, precision); - - return fld; -} - -void create_layer_def(OGRLayerH lyr) -{ - assert(0 != lyr); - - std::string fldname("return_num"); - - OGRFieldDefnH fld = create_field("return_num", OFTInteger, 10, 0); - OGRErr err = OGR_L_CreateField(lyr, fld, 0); - if (OGRERR_NONE != err) - { - throw std::runtime_error("return_num field creation failed"); - } - - OGR_Fld_Destroy(fld); - - fld = create_field("angle", OFTInteger, 10, 0); - err = OGR_L_CreateField(lyr, fld, 0); - if (OGRERR_NONE != err) - { - throw std::runtime_error("angle field cration failed"); - } - - OGR_Fld_Destroy(fld); - - fld = create_field("intensity", OFTInteger, 10, 0); - err = OGR_L_CreateField(lyr, fld, 0); - if (OGRERR_NONE != err) - { - throw std::runtime_error("intensity field cration failed"); - } - - OGR_Fld_Destroy(fld); - - fld = create_field("asprsclass", OFTInteger, 10, 0); - err = OGR_L_CreateField(lyr, fld, 0); - if (OGRERR_NONE != err) - { - throw std::runtime_error("asprsclass field creation failed"); - } - - OGR_Fld_Destroy(fld); - - fld = create_field("return_tot", OFTInteger, 10, 0); - err = OGR_L_CreateField(lyr, fld, 0); - if (OGRERR_NONE != err) - { - throw std::runtime_error("return_tot field creation failed"); - } - - OGR_Fld_Destroy(fld); - - fld = create_field("gpstime", OFTReal, 10, 0); - err = OGR_L_CreateField(lyr, fld, 0); - if (OGRERR_NONE != err) - { - throw std::runtime_error("gpstime field cration failed"); - } - - OGR_Fld_Destroy(fld); -} - -void report_ogr_formats(std::ostream& os) -{ - os << "Supported OGR formats:"; - - for (int i = 0; i < OGRGetDriverCount(); ++i) - { - OGRSFDriverH drv = OGRGetDriver(i); - assert(0 != drv); - - if (OGR_Dr_TestCapability(drv, ODrCCreateDataSource)) - { - os << "\n - " << OGR_Dr_GetName(drv); - } - } - - os << "\nMore details at http://gdal.org/ogr/ogr_formats.html" << std::endl; -} - -void usage() -{ - std::cerr << "Usage: las2ogr OPTIONS\nOptions are:\n" - << "\t-h print this message\n" - << "\t-i \tinput ASPRS LAS file\n" - << "\t-o \toutput file\n" - << "\t-f \tOGR format for output file\n" - << "\t-formats\tlist supported OGR formats\n"; -} - -} // anonymous namespace - -int main(int argc, char* argv[]) -{ - int rc = 0; - - try - { - OGRRegisterAll(); - - // Parse command-line options - std::string in_file; - std::string out_file; - std::string out_frmt; - { - int on_arg = 1; - while (on_arg < argc) - { - std::string arg(argv[on_arg]); - if (arg == "-h") - { - usage(); - return 0; - } - else if (arg == "-formats") - { - report_ogr_formats(std::cout); - return 0; - } - else if (arg == "-i" && (on_arg + 1 < argc)) - { - ++on_arg; - assert(on_arg < argc); - in_file = argv[on_arg]; - } - else if (arg == "-o" && (on_arg + 1 < argc)) - { - ++on_arg; - assert(on_arg < argc); - out_file = argv[on_arg]; - out_frmt = "ESRI Shapefile"; // default output format - } - else if (arg == "-f" && (on_arg + 1 < argc)) - { - ++on_arg; - assert(on_arg < argc); - out_frmt = argv[on_arg]; - } - else - { - throw std::runtime_error(std::string("unrecognized parameter: ") + arg); - } - ++on_arg; - } - - if (in_file.empty() || out_file.empty() || out_frmt.empty()) - { - throw std::runtime_error("missing input paremeters"); - } - } - - // - // Source - // - std::cout << "Source:" << "\n - dataset: " << in_file << std::endl; - - std::ifstream ifs; - if (!liblas::Open(ifs, in_file.c_str())) - { - throw std::runtime_error(std::string("Can not open \'") + in_file + "\'"); - } - liblas::LASReader reader(ifs); - - // - // Target - // - std::string const lyrname(out_file.substr(0, out_file.find_last_of('.'))); - - std::cout << "Target:" - << "\n - format: " << out_frmt - << "\n - dataset: " << out_file - << "\n - layer: " << lyrname - << std::endl; - - OGRSFDriverH drv = OGRGetDriverByName(out_frmt.c_str()); - if (0 == drv) - { - throw std::runtime_error(out_frmt + " driver not available"); - } - - ogr_wrapper ds(OGR_Dr_CreateDataSource(drv, out_file.c_str(), 0), OGR_DS_Destroy); - if (0 == ds.get()) - { - throw std::runtime_error(out_file + " datasource creation failed"); - } - - OGRLayerH lyr = OGR_DS_CreateLayer(ds, lyrname.c_str(), 0, wkbPoint25D, 0); - if (0 == lyr) - { - throw std::runtime_error(out_file + " layer creation failed"); - } - - // Prepare layer schema - create_layer_def(lyr); - - // - // Translation of points cloud to features set - // - liblas::uint32_t i = 0; - liblas::uint32_t const size = reader.GetHeader().GetPointRecordsCount(); - - std::cout << "Translating " << size << " points:\n"; - - ogr_wrapper feat(OGR_F_Create(OGR_L_GetLayerDefn(lyr)), OGR_F_Destroy); - - while (reader.ReadNextPoint()) - { - liblas::LASPoint const& p = reader.GetPoint(); - - OGR_F_SetFieldInteger(feat, 0, p.GetReturnNumber()); - OGR_F_SetFieldInteger(feat, 1, p.GetScanAngleRank()); - OGR_F_SetFieldInteger(feat, 2, p.GetIntensity()); - OGR_F_SetFieldInteger(feat, 3, p.GetClassification()); - OGR_F_SetFieldInteger(feat, 4, p.GetNumberOfReturns()); - OGR_F_SetFieldDouble(feat, 5, p.GetTime()); - - ogr_wrapper geom(OGR_G_CreateGeometry(wkbPoint25D), OGR_G_DestroyGeometry); - OGR_G_SetPoint(geom, 0, p.GetX(), p.GetY(), p.GetZ()); - if (OGRERR_NONE != OGR_F_SetGeometry(feat, geom)) - { - throw std::runtime_error("geometry creation failed"); - } - - if (OGRERR_NONE != OGR_L_CreateFeature(lyr, feat)) - { - throw std::runtime_error("feature creation failed"); - } - - term_progress(std::cout, (i + 1) / static_cast(size)); - i++; - } - - std::cout << std::endl; - } - catch (std::exception const& e) - { - std::cerr << "Error: " << e.what() << std::endl; - rc = -1; - } - catch (...) - { - std::cerr << "Unknown error\n"; - rc = -1; - } - - return rc; -} -#endif // #ifdef HAVE_GDAL - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/las2txt.c work/liblas-src-1.2.1/apps/las2txt.c --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/las2txt.c 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/las2txt.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,583 +0,0 @@ -/*************************************************************************** - * $Id$ - * $Date$ - * - * Project: libLAS -- C/C++ read/write library for LAS LIDAR data - * Purpose: LAS translation to ASCII text with optional configuration - * Author: Martin Isenburg isenburg@cs.unc.edu - *************************************************************************** - * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu - * - * See LICENSE.txt in this source distribution for more information. - **************************************************************************/ - -#include -#include -#include -#include - -#include "liblas.h" - -void print_header(FILE *file, LASHeaderH header, const char* file_name); - -void usage() -{ - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," las2txt (version %s) usage:\n", LAS_GetVersion()); - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Convert a las file to text on stdout:\n"); - fprintf(stderr," las2txt lidar.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Convert using stdin and stdout:\n"); - fprintf(stderr," las2txt --stdin --stdout < lidar.las > lidar.txt\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Convert to text with a specified format :\n"); - fprintf(stderr," las2txt --parse xyziar lidar.las lidar.txt\n"); - fprintf(stderr,"\n"); - - - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," The '--parse txyz' flag specifies how to format each\n"); - fprintf(stderr," each line of the ASCII file. For example, 'txyzia'\n"); - fprintf(stderr," means that the first number of each line should be the\n"); - fprintf(stderr," gpstime, the next three numbers should be the x, y, and\n"); - fprintf(stderr," z coordinate, the next number should be the intensity\n"); - fprintf(stderr," and the next number should be the scan angle.\n"); - fprintf(stderr," The supported entries are:\n"); - fprintf(stderr," a - scan angle\n"); - fprintf(stderr," i - intensity\n"); - fprintf(stderr," n - number of returns for given pulse\n"); - fprintf(stderr," r - number of this return\n"); - fprintf(stderr," c - classification\n"); - fprintf(stderr," u - user data (does not currently work)\n"); - fprintf(stderr," p - point source ID\n"); - fprintf(stderr," e - edge of flight line\n"); - fprintf(stderr," d - direction of scan flag\n"); - fprintf(stderr," R - red channel of RGB color\n"); - fprintf(stderr," G - green channel of RGB color\n"); - fprintf(stderr," B - blue channel of RGB color\n"); - fprintf(stderr," M - vertex index number\n\n"); - - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," The '--sep space' flag specifies what separator to use. The\n"); - fprintf(stderr," default is a space but 'tab', 'komma', 'colon', 'hyphen',\n"); - fprintf(stderr," 'dot', or 'semicolon' are other possibilities.\n\n"); - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," The '--header pound' flag results in the header information\n"); - fprintf(stderr," being printed at the beginning of the ASCII file in form of\n"); - fprintf(stderr," a comment that starts with the special character '#'. Also\n"); - fprintf(stderr," possible are 'percent', 'dollar', 'semicolon', 'komma',\n"); - fprintf(stderr," 'star', 'colon', or 'semicolon' as that special character.\n"); - - fprintf(stderr, "\nFor more information, see the full documentation for las2txt at:\n" - " http://liblas.org/browser/trunk/doc/las2txt.txt\n"); - fprintf(stderr,"----------------------------------------------------------\n"); - -} - - -static int lidardouble2string(char* string, double value) -{ - int len; - len = sprintf(string, "%f", value) - 1; - while (string[len] == '0') len--; - if (string[len] != '.') len++; - string[len] = '\0'; - return len; -} - - -int main(int argc, char *argv[]) -{ - int i; - int use_stdin = FALSE; - int use_stdout = FALSE; - int skip_invalid = FALSE; - - int verbose = FALSE; - char* file_name_in = 0; - char* file_name_out = 0; - char separator_sign = ' '; - char header_comment_sign = '\0'; - char* parse_string = "xyz"; - char printstring[256]; - LASReaderH reader = NULL; - LASHeaderH header = NULL; - LASPointH p = NULL; - FILE* file_out = NULL; - int len; - - uint32_t index = 0; - - for (i = 1; i < argc; i++) - { - if ( strcmp(argv[i],"-h") == 0 || - strcmp(argv[i],"--help") == 0 - ) - { - usage(); - exit(0); - } - else if ( strcmp(argv[i],"-v") == 0 || - strcmp(argv[i],"--verbose") == 0 - ) - { - verbose = TRUE; - } - else if ( strcmp(argv[i],"-s") == 0 || - strcmp(argv[i],"--skip_invalid") == 0 - ) - { - skip_invalid = TRUE; - } - else if ( strcmp(argv[i], "--parse") == 0 || - strcmp(argv[i], "-parse") == 0 - ) - { - i++; - parse_string = argv[i]; - } - else if ( strcmp(argv[i], "--sep") == 0 || - strcmp(argv[i], "-sep") == 0 - ) - { - i++; - - if (strcmp(argv[i],"komma") == 0 || - strcmp(argv[i],"comma") == 0 ) - { - separator_sign = ','; - } - else if (strcmp(argv[i],"tab") == 0) - { - separator_sign = '\t'; - } - else if ( strcmp(argv[i],"dot") == 0 || - strcmp(argv[i],"period") == 0 - ) - { - separator_sign = '.'; - } - else if (strcmp(argv[i],"colon") == 0) - { - separator_sign = ':'; - } - else if ( strcmp(argv[i],"scolon") == 0 || - strcmp(argv[i],"semicolon") == 0 - ) - { - separator_sign = ';'; - } - else if ( strcmp(argv[i],"hyphen") == 0 || - strcmp(argv[i],"minus") == 0 - ) - { - separator_sign = '-'; - } - else if (strcmp(argv[i],"space") == 0) - { - separator_sign = ' '; - } - else - { - fprintf(stderr, "ERROR: unknown seperator '%s'\n",argv[i]); - usage(); - exit(1); - } - } - else if ( strcmp(argv[i], "--header") == 0 || - strcmp(argv[i], "--comment") == 0 || - strcmp(argv[i], "-header") == 0 || - strcmp(argv[i], "-comment") == 0 || - strcmp(argv[i], "-head") == 0 - ) - { - i++; - if (strcmp(argv[i],"komma") == 0 || - strcmp(argv[i],"comma") == 0 ) - { - header_comment_sign = ','; - } - else if (strcmp(argv[i],"colon") == 0) - { - header_comment_sign = ':'; - } - else if ( strcmp(argv[i],"scolon") == 0 || - strcmp(argv[i],"semicolon") == 0 - ) - { - header_comment_sign = ';'; - } - else if ( strcmp(argv[i],"pound") == 0 || - strcmp(argv[i],"hash") == 0 - ) - { - header_comment_sign = '#'; - } - else if (strcmp(argv[i],"percent") == 0) - { - header_comment_sign = '%'; - } - else if (strcmp(argv[i],"dollar") == 0) - { - header_comment_sign = '$'; - } - else if (strcmp(argv[i],"star") == 0) - { - header_comment_sign = '*'; - } - else - { - fprintf(stderr, "ERROR: unknown comment symbol '%s'\n",argv[i]); - usage(); - exit(1); - } - } - else if ( strcmp(argv[i], "--stdin") == 0 || - strcmp(argv[i], "-ilas") == 0 - ) - { - use_stdin = TRUE; - } - else if ( strcmp(argv[i], "--stdout") == 0 - ) - { - use_stdout = TRUE; - } - else if ( strcmp(argv[i],"--input") == 0 || - strcmp(argv[i],"-input") == 0 || - strcmp(argv[i],"-i") == 0 || - strcmp(argv[i],"-in") == 0 - ) - { - i++; - file_name_in = argv[i]; - } - else if ( strcmp(argv[i],"--output") == 0 || - strcmp(argv[i],"--out") == 0 || - strcmp(argv[i],"-out") == 0 || - strcmp(argv[i],"-o") == 0 - ) - { - i++; - file_name_out = argv[i]; - } - else if (file_name_in == 0 && file_name_out == 0) - { - file_name_in = argv[i]; - } - else if (file_name_in && file_name_out == 0) - { - file_name_out = argv[i]; - } - else - { - fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); - usage(); - exit(1); - } - } /* end looping through argc/argv */ - - - if (use_stdin) file_name_in = "stdin"; - reader = LASReader_Create(file_name_in); - if (!reader) { - LASError_Print("Unable to read file"); - exit(1); - } - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Unable to fetch header for file"); - exit(1); - } - - - - - - if (use_stdout) - { - file_out = stdout; - } - else - { - if (file_name_out == NULL) - { - if (file_name_in == NULL) - { - LASError_Print("No input filename was specified"); - usage(); - exit(1); - } - - len = (int)strlen(file_name_in); - file_name_out = strdup(file_name_in); - if (file_name_out[len-3] == '.' && file_name_out[len-2] == 'g' && file_name_out[len-1] == 'z') - { - len = len - 4; - } - while (len > 0 && file_name_out[len] != '.') - { - len--; - } - file_name_out[len] = '.'; - file_name_out[len+1] = 't'; - file_name_out[len+2] = 'x'; - file_name_out[len+3] = 't'; - file_name_out[len+4] = '\0'; - } - file_out = fopen(file_name_out, "w"); - - if (file_out == 0) - { - LASError_Print("Could not open file for write"); - usage(); - exit(1); - } - } - - - - if (verbose) - { - print_header(stderr, header, file_name_in); - } - - if (header_comment_sign) - { - - fprintf(file_out, - "%c file signature: '%s'\012", - header_comment_sign, - LASHeader_GetFileSignature(header) - ); - fprintf(file_out, - "%c file source ID: %d\012", - header_comment_sign, - LASHeader_GetFileSourceId(header) - ); - fprintf(file_out, - "%c reserved: %d\012", - header_comment_sign, - LASHeader_GetReserved(header) - ); - fprintf(file_out, - "%c project ID GUID: %s\012", - header_comment_sign, - LASHeader_GetProjectId(header) - ); - fprintf(file_out, - "%c version major.minor: %d.%d\012", - header_comment_sign, - LASHeader_GetVersionMajor(header), - LASHeader_GetVersionMinor(header) - ); - fprintf(file_out, - "%c system_identifier: '%s'\012", - header_comment_sign, - LASHeader_GetSystemId(header) - ); - fprintf(file_out, - "%c generating_software: '%s'\012", - header_comment_sign, - LASHeader_GetSoftwareId(header) - ); - fprintf(file_out, - "%c file creation day/year: %d/%d\012", - header_comment_sign, - LASHeader_GetCreationDOY(header), - LASHeader_GetCreationYear(header) - ); - fprintf(file_out, - "%c header size %d\012", - header_comment_sign, - LASHeader_GetHeaderSize(header) - ); - fprintf(file_out, - "%c offset to point data %d\012", - header_comment_sign, - LASHeader_GetDataOffset(header) - ); - fprintf(file_out, - "%c number var. length records %d\012", - header_comment_sign, - LASHeader_GetRecordsCount(header) - ); - fprintf(file_out, - "%c point data format %d\012", - header_comment_sign, - LASHeader_GetDataFormatId(header) - ); - fprintf(file_out, - "%c point data record length %d\012", - header_comment_sign, - LASHeader_GetDataRecordLength(header) - ); - fprintf(file_out, - "%c number of point records %d\012", - header_comment_sign, - LASHeader_GetPointRecordsCount(header) - ); - fprintf(file_out, - "%c number of points by return %d %d %d %d %d\012", - header_comment_sign, - LASHeader_GetPointRecordsByReturnCount(header, 0), - LASHeader_GetPointRecordsByReturnCount(header, 1), - LASHeader_GetPointRecordsByReturnCount(header, 2), - LASHeader_GetPointRecordsByReturnCount(header, 3), - LASHeader_GetPointRecordsByReturnCount(header, 4) - ); - fprintf(file_out, - "%c scale factor x y z %.6f %.6f %.6f\n", - header_comment_sign, - LASHeader_GetScaleX(header), - LASHeader_GetScaleY(header), - LASHeader_GetScaleZ(header) - ); - fprintf(file_out, - "%c offset x y z %.6f %.6f %.6f\n", - header_comment_sign, - LASHeader_GetOffsetX(header), - LASHeader_GetOffsetY(header), - LASHeader_GetOffsetZ(header) - ); - fprintf(file_out, - "%c min x y z %.6f %.6f %.6f\n", - header_comment_sign, - LASHeader_GetMinX(header), - LASHeader_GetMinY(header), - LASHeader_GetMinZ(header) - ); - fprintf(file_out, - "%c max x y z %.6f %.6f %.6f\n", - header_comment_sign, - LASHeader_GetMaxX(header), - LASHeader_GetMaxY(header), - LASHeader_GetMaxZ(header) - ); - - } - - - - p = LASReader_GetNextPoint(reader); - while (p) - { - - if (skip_invalid && !LASPoint_IsValid(p)) { - if (verbose) { - LASError_Print("Skipping writing invalid point..."); - } - p = LASReader_GetNextPoint(reader); - index -=1; - continue; - } - - i = 0; - for (;;) - { - LASColorH color = LASPoint_GetColor(p); - - switch (parse_string[i]) - { - /* // the x coordinate */ - case 'x': - lidardouble2string(printstring, LASPoint_GetX(p)); fprintf(file_out, printstring); - break; - /* // the y coordinate */ - case 'y': - lidardouble2string(printstring, LASPoint_GetY(p)); fprintf(file_out, printstring); - break; - /* // the z coordinate */ - case 'z': - lidardouble2string(printstring, LASPoint_GetZ(p)); fprintf(file_out, printstring); - break; - /* // the gps-time */ - case 't': - lidardouble2string(printstring,LASPoint_GetTime(p)); fprintf(file_out, printstring); - break; - /* // the intensity */ - case 'i': - fprintf(file_out, "%d", LASPoint_GetIntensity(p)); - break; - /* the scan angle */ - case 'a': - fprintf(file_out, "%d", LASPoint_GetScanAngleRank(p)); - break; - /* the number of the return */ - case 'r': - fprintf(file_out, "%d", LASPoint_GetReturnNumber(p)); - break; - /* the classification */ - case 'c': - fprintf(file_out, "%d", LASPoint_GetClassification(p)); - break; - /* the user data */ - case 'u': - fprintf(file_out, "%d", LASPoint_GetUserData(p)); - break; - /* the number of returns of given pulse */ - case 'n': - fprintf(file_out, "%d", LASPoint_GetNumberOfReturns(p)); - break; - /* the red channel color */ - case 'R': - fprintf(file_out, "%d", LASColor_GetRed(color)); - break; - /* the green channel color */ - case 'G': - fprintf(file_out, "%d", LASColor_GetGreen(color)); - break; - /* the blue channel color */ - case 'B': - fprintf(file_out, "%d", LASColor_GetBlue(color)); - break; - case 'M': - fprintf(file_out, "%d", index); - break; - case 'p': - fprintf(file_out, "%d", LASPoint_GetPointSourceId(p)); - break; - /* the edge of flight line flag */ - case 'e': - fprintf(file_out, "%d", LASPoint_GetFlightLineEdge(p)); - break; - /* the direction of scan flag */ - case 'd': - fprintf(file_out, "%d", LASPoint_GetScanDirection(p)); - break; - } - i++; - if (parse_string[i]) - { - fprintf(file_out, "%c", separator_sign); - } - else - { - fprintf(file_out, "\012"); - break; - } - - LASColor_Destroy(color); - - } - - p = LASReader_GetNextPoint(reader); - index +=1; - } - - - LASReader_Destroy(reader); - LASHeader_Destroy(header); - - - - fclose(file_out); - - return 0; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/lascommon.c work/liblas-src-1.2.1/apps/lascommon.c --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/lascommon.c 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/lascommon.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,637 +0,0 @@ -#include -#include -#include -#include - -#ifdef HAVE_GEOTIFF -#include -#endif - - -static const char * LASPointClassification [] = { - "Created, never classified", - "Unclassified", - "Ground", - "Low Vegetation", - "Medium Vegetation", - "High Vegetation", - "Building", - "Low Point (noise)", - "Model Key-point (mass point)", - "Water", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Overlap Points", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition", - "Reserved for ASPRS Definition" -}; - - -LASPointSummary* SummarizePoints(LASReaderH reader) { - - LASPointSummary* summary; - LASPointH p = NULL; - LASColorH color = NULL; - LASColorH min_color = NULL; - LASColorH max_color = NULL; - - uint8_t cls = 0; - uint16_t red = 0; - uint16_t green = 0; - uint16_t blue = 0; - - uint16_t ptsrc = 0; - - int i = 0; - - summary = (LASPointSummary*) malloc(sizeof(LASPointSummary)); - - summary->number_of_point_records = 0; - for (i=0; i<8;i++) - summary->number_of_points_by_return[i] = 0; - for (i=0; i<8;i++) - summary->number_of_returns_of_given_pulse[i] = 0; - for (i=0; i<32;i++) - summary->classification[i] = 0; - summary->classification_synthetic = 0; - summary->classification_keypoint = 0; - summary->classification_withheld = 0; - - - - - p = LASReader_GetNextPoint(reader); - - if (!p) { - if (LASError_GetLastErrorNum()) - LASError_Print("Not able to fetch a point. LASReaderH is invalid"); - else - LASError_Print("File does not contain any points to read."); - exit(1); - } - - summary->pmin = LASPoint_Copy(p); - summary->pmax = LASPoint_Copy(p); - - /* If we got this far we have one point */ - i = 1; - while (p) - { - - summary->x = LASPoint_GetX(p); - LASPoint_SetX(summary->pmin, MIN(summary->x, LASPoint_GetX(summary->pmin))); - LASPoint_SetX(summary->pmax, MAX(summary->x, LASPoint_GetX(summary->pmax))); - - summary->y = LASPoint_GetY(p); - LASPoint_SetY(summary->pmin, MIN(summary->y, LASPoint_GetY(summary->pmin))); - LASPoint_SetY(summary->pmax, MAX(summary->y, LASPoint_GetY(summary->pmax))); - - summary->z = LASPoint_GetZ(p); - LASPoint_SetZ(summary->pmin, MIN(summary->z, LASPoint_GetZ(summary->pmin))); - LASPoint_SetZ(summary->pmax, MAX(summary->z, LASPoint_GetZ(summary->pmax))); - - summary->intensity = LASPoint_GetIntensity(p); - LASPoint_SetIntensity(summary->pmin, MIN(summary->intensity, LASPoint_GetIntensity(summary->pmin))); - LASPoint_SetIntensity(summary->pmax, MAX(summary->intensity, LASPoint_GetIntensity(summary->pmax))); - - summary->t = LASPoint_GetTime(p); - LASPoint_SetTime(summary->pmin, MIN(summary->t, LASPoint_GetTime(summary->pmin))); - LASPoint_SetTime(summary->pmax, MAX(summary->t, LASPoint_GetTime(summary->pmax))); - - summary->retnum = LASPoint_GetReturnNumber(p); - LASPoint_SetReturnNumber(summary->pmin, MIN(summary->retnum, LASPoint_GetReturnNumber(summary->pmin))); - LASPoint_SetReturnNumber(summary->pmax, MAX(summary->retnum, LASPoint_GetReturnNumber(summary->pmax))); - - summary->numret = LASPoint_GetNumberOfReturns(p); - LASPoint_SetNumberOfReturns(summary->pmin, MIN(summary->numret, LASPoint_GetNumberOfReturns(summary->pmin))); - LASPoint_SetNumberOfReturns(summary->pmax, MAX(summary->numret, LASPoint_GetNumberOfReturns(summary->pmax))); - - summary->scandir = LASPoint_GetScanDirection(p); - LASPoint_SetScanDirection(summary->pmin, MIN(summary->scandir, LASPoint_GetScanDirection(summary->pmin))); - LASPoint_SetScanDirection(summary->pmax, MAX(summary->scandir, LASPoint_GetScanDirection(summary->pmax))); - - summary->fedge = LASPoint_GetFlightLineEdge(p); - LASPoint_SetFlightLineEdge(summary->pmin, MIN(summary->fedge, LASPoint_GetFlightLineEdge(summary->pmin))); - LASPoint_SetFlightLineEdge(summary->pmax, MAX(summary->fedge, LASPoint_GetFlightLineEdge(summary->pmax))); - - summary->scan_angle = LASPoint_GetScanAngleRank(p); - LASPoint_SetScanAngleRank(summary->pmin, MIN(summary->scan_angle, LASPoint_GetScanAngleRank(summary->pmin))); - LASPoint_SetScanAngleRank(summary->pmax, MAX(summary->scan_angle, LASPoint_GetScanAngleRank(summary->pmax))); - - summary->user_data = LASPoint_GetUserData(p); - LASPoint_SetUserData(summary->pmin, MIN(summary->user_data, LASPoint_GetUserData(summary->pmin))); - LASPoint_SetUserData(summary->pmax, MAX(summary->user_data, LASPoint_GetUserData(summary->pmax))); - - summary->number_of_point_records = i; - - if (LASPoint_GetReturnNumber(p)) - summary->number_of_points_by_return[LASPoint_GetReturnNumber(p)-1]++; - else - summary->number_of_points_by_return[LASPoint_GetReturnNumber(p)]++; - - summary->number_of_returns_of_given_pulse[LASPoint_GetNumberOfReturns(p)]++; - - cls = LASPoint_GetClassification(p); - LASPoint_SetClassification(summary->pmin, MIN(cls, LASPoint_GetClassification(summary->pmin))); - LASPoint_SetClassification(summary->pmax, MAX(cls, LASPoint_GetClassification(summary->pmax))); - - ptsrc = LASPoint_GetPointSourceId(p); - LASPoint_SetPointSourceId(summary->pmin, MIN(ptsrc, LASPoint_GetPointSourceId(summary->pmin))); - LASPoint_SetPointSourceId(summary->pmax, MAX(ptsrc, LASPoint_GetPointSourceId(summary->pmax))); - - color = LASPoint_GetColor(p); - min_color = LASPoint_GetColor(summary->pmin); - max_color = LASPoint_GetColor(summary->pmax); - - red = MIN(LASColor_GetRed(min_color), LASColor_GetRed(color)); - green = MIN(LASColor_GetGreen(min_color), LASColor_GetGreen(color)); - blue = MIN(LASColor_GetBlue(min_color), LASColor_GetBlue(color)); - - LASColor_SetRed(min_color, red); - LASColor_SetGreen(min_color, green); - LASColor_SetBlue(min_color, blue); - - LASPoint_SetColor(summary->pmin, min_color); - LASColor_Destroy(min_color); - - red = MAX(LASColor_GetRed(max_color), LASColor_GetRed(color)); - green = MAX(LASColor_GetGreen(max_color), LASColor_GetGreen(color)); - blue = MAX(LASColor_GetBlue(max_color), LASColor_GetBlue(color)); - - LASColor_SetRed(max_color, red); - LASColor_SetGreen(max_color, green); - LASColor_SetBlue(max_color, blue); - - LASPoint_SetColor(summary->pmax, max_color); - LASColor_Destroy(max_color); - - LASColor_Destroy(color); - - - - summary->classification[(cls & 31)]++; - if (cls & 32) summary->classification_synthetic++; - if (cls & 64) summary->classification_keypoint++; - if (cls & 128) summary->classification_withheld++; - - /* - // if (lasreader->point.point_source_ID < point_min.point_source_ID) point_min.point_source_ID = lasreader->point.point_source_ID; - // else if (lasreader->point.point_source_ID > point_max.point_source_ID) point_max.point_source_ID = lasreader->point.point_source_ID; - - */ - p = LASReader_GetNextPoint(reader); - - if (LASError_GetLastErrorNum()) { - LASError_Print("Not able to fetch point"); - exit(1); - } - - i++; - } - - return summary; -} - -void print_point(FILE *file, LASPointH point) { - - fprintf(file, "---------------------------------------------------------\n"); - - fprintf(file, " X: \t\t%.6f\n", - LASPoint_GetX(point) - ); - fprintf(file, " Y: \t\t%.6f\n", - LASPoint_GetY(point) - ); - fprintf(file, " Z: \t\t%.6f\n", - LASPoint_GetZ(point) - ); - fprintf(file, " Time:\t\t\t%.6f\n", - LASPoint_GetTime(point) - ); - fprintf(file, " Return Number:\t%d\n", - LASPoint_GetReturnNumber(point) - ); - fprintf(file, " Return Count:\t\t%d\n", - LASPoint_GetNumberOfReturns(point) - ); - fprintf(file, " Flightline Edge:\t%d\n", - LASPoint_GetFlightLineEdge(point) - ); - fprintf(file, " Intensity:\t\t%d\n", - LASPoint_GetIntensity(point) - ); - fprintf(file, " Scan Direction Flag:\t%d\n", - LASPoint_GetScanDirection(point) - ); - fprintf(file, " Scan Angle Rank:\t%d\n", - LASPoint_GetScanAngleRank(point) - ); - - fprintf(file, " Classification:\t%d\n", - LASPoint_GetClassification(point) - ); - fprintf(file, " Color:\t%d %d %d\n", - LASColor_GetRed(LASPoint_GetColor(point)), - LASColor_GetGreen(LASPoint_GetColor(point)), - LASColor_GetBlue(LASPoint_GetColor(point)) - ); -} -void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header) { - - long rgpsum = 0; - long pbretsum = 0; - - int i = 0; - - if (!summary) {LASError_Print("Point Summary does not exist!"); exit(1);} - - fprintf(file, "\n---------------------------------------------------------\n"); - fprintf(file, " Point Inspection Summary\n"); - fprintf(file, "---------------------------------------------------------\n"); - - fprintf(file, " Header Point Count: %d\n", - LASHeader_GetPointRecordsCount(header)); - - fprintf(file, " Actual Point Count: %d\n", - summary->number_of_point_records); - - fprintf(file, "\n Minimum and Maximum Attributes (min,max)\n"); - fprintf(file, "---------------------------------------------------------\n"); - - fprintf(file, " Min X,Y,Z: \t\t%.6f,%.6f,%.6f\n", - LASPoint_GetX(summary->pmin), - LASPoint_GetY(summary->pmin), - LASPoint_GetZ(summary->pmin) - ); - fprintf(file, " Max X,Y,Z: \t\t%.6f,%.6f,%.6f\n", - LASPoint_GetX(summary->pmax), - LASPoint_GetY(summary->pmax), - LASPoint_GetZ(summary->pmax) - ); - fprintf(file, " Bounding Box:\t\t%.2f,%.2f,%.2f,%.2f\n", - LASPoint_GetX(summary->pmin), - LASPoint_GetY(summary->pmin), - LASPoint_GetX(summary->pmax), - LASPoint_GetY(summary->pmax) - ); - fprintf(file, " Time:\t\t\t%.6f,%.6f\n", - LASPoint_GetTime(summary->pmin), - LASPoint_GetTime(summary->pmax) - ); - fprintf(file, " Return Number:\t%d,%d\n", - LASPoint_GetReturnNumber(summary->pmin), - LASPoint_GetReturnNumber(summary->pmax) - ); - fprintf(file, " Return Count:\t\t%d,%d\n", - LASPoint_GetNumberOfReturns(summary->pmin), - LASPoint_GetNumberOfReturns(summary->pmax) - ); - fprintf(file, " Flightline Edge:\t%d,%d\n", - LASPoint_GetFlightLineEdge(summary->pmin), - LASPoint_GetFlightLineEdge(summary->pmax) - ); - fprintf(file, " Intensity:\t\t%d,%d\n", - LASPoint_GetIntensity(summary->pmin), - LASPoint_GetIntensity(summary->pmax) - ); - fprintf(file, " Scan Direction Flag:\t%d,%d\n", - LASPoint_GetScanDirection(summary->pmin), - LASPoint_GetScanDirection(summary->pmax) - ); - fprintf(file, " Scan Angle Rank:\t%d,%d\n", - LASPoint_GetScanAngleRank(summary->pmin), - LASPoint_GetScanAngleRank(summary->pmax) - ); - fprintf(file, " Classification:\t%d,%d\n", - LASPoint_GetClassification(summary->pmin), - LASPoint_GetClassification(summary->pmax) - ); - fprintf(file, " Point Source Id:\t%d,%d\n", - LASPoint_GetPointSourceId(summary->pmin), - LASPoint_GetPointSourceId(summary->pmax) - ); - fprintf(file, " Minimum Color:\t %d %d %d\n", - LASColor_GetRed(LASPoint_GetColor(summary->pmin)), - LASColor_GetGreen(LASPoint_GetColor(summary->pmin)), - LASColor_GetBlue(LASPoint_GetColor(summary->pmin)) - ); - - fprintf(file, " Maximum Color:\t %d %d %d\n", - LASColor_GetRed(LASPoint_GetColor(summary->pmax)), - LASColor_GetGreen(LASPoint_GetColor(summary->pmax)), - LASColor_GetBlue(LASPoint_GetColor(summary->pmax)) - ); - - fprintf(file, "\n Number of Points by Return\n"); - fprintf(file, "---------------------------------------------------------\n"); - - for (i = 0; i < 5; i++) { - pbretsum = pbretsum + summary->number_of_points_by_return[i]; - fprintf(file, "\t(%d) %d", i,summary->number_of_points_by_return[i]); - } - fprintf(file, "\n Total Points: %ld\n", pbretsum); - - fprintf(file, "\n Number of Returns by Pulse\n"); - fprintf(file, "---------------------------------------------------------\n"); - - for (i = 1; i < 8; i++) { - rgpsum = rgpsum + summary->number_of_returns_of_given_pulse[i]; - fprintf(file, "\t(%d) %d", i,summary->number_of_returns_of_given_pulse[i]); - } - fprintf(file, "\n Total Pulses: %ld\n", rgpsum); - - - for (i = 0; i < 5; i++) { - if (LASHeader_GetPointRecordsByReturnCount(header, i) != summary->number_of_points_by_return[i]) - { - fprintf(file, " \n Actual number of points by return \n is different from header (actual, header):\n"); - for (i = 0; i < 5; i++) { - fprintf(file, "\t(%d,%d)", - summary->number_of_points_by_return[i], - LASHeader_GetPointRecordsByReturnCount(header, i) - ); - } - fprintf(file, "\n"); - } - } - - fprintf(file, "\n Point Classifications\n"); - fprintf(file, "---------------------------------------------------------\n"); - - for (i = 0; i < 32; i++) { - if (summary->classification[i]) { - fprintf(file, "\t%8d %s (%d)\n", - summary->classification[i], - LASPointClassification[i], - i); - } - } - - if (summary->classification_synthetic || summary->classification_keypoint || summary->classification_withheld) { - fprintf(file, "\n Point Classification Histogram\n"); - fprintf(file, "---------------------------------------------------------\n"); - - if (summary->classification_synthetic) fprintf(file, " +-> flagged as synthetic: %d\n", summary->classification_synthetic); - if (summary->classification_keypoint) fprintf(file, " +-> flagged as keypoints: %d\n", summary->classification_keypoint); - if (summary->classification_withheld) fprintf(file, " +-> flagged as withheld: %d\n", summary->classification_withheld); - } -} - - - -void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR) { - - char *pszSignature = NULL; - char *pszProjectId = NULL; - char *pszSystemId = NULL; - char *pszSoftwareId = NULL; - char *pszProj4 = NULL; - - char *pszVLRUser = NULL; - char *pszVLRDescription = NULL; - uint16_t nVLRLength = 0; - uint16_t nVLRRecordId = 0; - - LASVLRH pVLR = NULL; - LASSRSH pSRS = NULL; - uint32_t nVLR = 0; - int i = 0; - -#ifdef HAVE_GEOTIFF - const GTIF* pGTIF = NULL; -#else - const void* pGTIF = NULL; -#endif - - pszSignature = LASHeader_GetFileSignature(header); - pszProjectId = LASHeader_GetProjectId(header); - pszSystemId = LASHeader_GetSystemId(header); - pszSoftwareId = LASHeader_GetSoftwareId(header); - - pSRS = LASHeader_GetSRS(header); - pszProj4 = LASSRS_GetProj4(pSRS); - pGTIF = LASSRS_GetGTIF(pSRS); - - nVLR = LASHeader_GetRecordsCount(header); - - - - - fprintf(file, "\n---------------------------------------------------------\n"); - fprintf(file, " Header Summary\n"); - fprintf(file, "---------------------------------------------------------\n"); - - - fprintf(file, " File Name: %s\n", file_name); - - if (strcmp(pszSignature,"LASF") !=0) { - LASError_Print("File signature is not 'LASF'... aborting"); - exit(1); - } - fprintf(file, " Version: %d.%d\n", - LASHeader_GetVersionMajor(header), - LASHeader_GetVersionMinor(header)); - - fprintf(file, " Source ID: %d\n", - LASHeader_GetFileSourceId(header) ) ; - - fprintf(file, " Reserved: %d\n", - LASHeader_GetReserved(header) ); - - fprintf(file, " Project ID/GUID: '%s'\n", - pszProjectId); - - fprintf(file, " System Identifier: '%s'\n", - pszSystemId); - - fprintf(file, " Generating Software: '%s'\n", - pszSoftwareId); - - fprintf(file, " File Creation Day/Year: %d/%d\n", - LASHeader_GetCreationDOY(header), - LASHeader_GetCreationYear(header)); - - fprintf(file, " Header Size %d\n", - LASHeader_GetHeaderSize(header)); - - fprintf(file, " Offset to Point Data %d\n", - LASHeader_GetDataOffset(header)); - - fprintf(file, " Number Var. Length Records %d\n", - LASHeader_GetRecordsCount(header)); - - fprintf(file, " Point Data Format %d\n", - LASHeader_GetDataFormatId(header)); - - fprintf(file, " Point Data Record Length %d\n", - LASHeader_GetDataRecordLength(header)); - - fprintf(file, " Number of Point Records %d\n", - LASHeader_GetPointRecordsCount(header)); - - fprintf(file, " Number of Points by Return %d %d %d %d %d\n", - LASHeader_GetPointRecordsByReturnCount(header, 0), - LASHeader_GetPointRecordsByReturnCount(header, 1), - LASHeader_GetPointRecordsByReturnCount(header, 2), - LASHeader_GetPointRecordsByReturnCount(header, 3), - LASHeader_GetPointRecordsByReturnCount(header, 4)); - - fprintf(file, " Scale Factor X Y Z %.6g %.6g %.6g\n", - LASHeader_GetScaleX(header), - LASHeader_GetScaleY(header), - LASHeader_GetScaleZ(header)); - - fprintf(file, " Offset X Y Z %.6f %.6f %.6f\n", - LASHeader_GetOffsetX(header), - LASHeader_GetOffsetY(header), - LASHeader_GetOffsetZ(header)); - - fprintf(file, " Min X Y Z %.6f %.6f %.6f\n", - LASHeader_GetMinX(header), - LASHeader_GetMinY(header), - LASHeader_GetMinZ(header)); - - fprintf(file, " Max X Y Z %.6f %.6f %.6f\n", - LASHeader_GetMaxX(header), - LASHeader_GetMaxY(header), - LASHeader_GetMaxZ(header)); - - fprintf(file, " Spatial Reference %s\n", - pszProj4); -#ifdef HAVE_LIBGEOTIFF - if (pGTIF) GTIFPrint((GTIF*)pGTIF, 0, 0); -#endif - if (nVLR && !bSkipVLR) { - - fprintf(file, "\n---------------------------------------------------------\n"); - fprintf(file, " VLR Summary\n"); - fprintf(file, "---------------------------------------------------------\n"); - - for (i = 0; i < (int)nVLR; i++) { - pVLR = LASHeader_GetVLR(header, i); - - if (LASError_GetLastErrorNum()) { - LASError_Print("Unable to fetch VLR"); - exit(1); - } - - pszVLRUser = LASVLR_GetUserId(pVLR); - pszVLRDescription = LASVLR_GetDescription(pVLR); - nVLRLength = LASVLR_GetRecordLength(pVLR); - nVLRRecordId = LASVLR_GetRecordId(pVLR); - - - fprintf(file, " User: '%s' - Description: '%s'\n", pszVLRUser, pszVLRDescription); - fprintf(file, " ID: %d Length: %d\n\n", nVLRRecordId, nVLRLength); - - LASVLR_Destroy(pVLR); - pVLR = NULL; - - free(pszVLRUser); - free(pszVLRDescription); - } - - } - free(pszSignature); - free(pszProjectId); - free(pszSystemId); - free(pszSoftwareId); - free(pszProj4); -} - -void repair_header(FILE *file, LASHeaderH header, LASPointSummary* summary) { - - int repair_bounding_box = FALSE; - int update_return_counts = FALSE; - int err = 0; - int i = 0; - - if (! header) { - LASError_Print("Inputted header to repair_header was NULL "); - exit(1); - } - - if (! summary) { - LASError_Print("Inputted summary to repair_header was NULL "); - exit(1); - - } - - - if (! repair_bounding_box) { - if ( LASHeader_GetMinX(header) != LASPoint_GetX(summary->pmin) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMinY(header) != LASPoint_GetY(summary->pmin) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMinZ(header) != LASPoint_GetZ(summary->pmin) ) - repair_bounding_box = TRUE; - - if ( LASHeader_GetMaxX(header) != LASPoint_GetX(summary->pmax) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMaxY(header) != LASPoint_GetY(summary->pmax) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMaxZ(header) != LASPoint_GetZ(summary->pmax) ) - repair_bounding_box = TRUE; - } - - if (repair_bounding_box) { - fprintf(file, " Reparing Bounding Box...\n"); - err = LASHeader_SetMin( header, - LASPoint_GetX(summary->pmin), - LASPoint_GetY(summary->pmin), - LASPoint_GetZ(summary->pmin) - ); - if (err) { - LASError_Print("Could not set minimum for header "); - exit(1); - } - err = LASHeader_SetMax( header, - LASPoint_GetX(summary->pmax), - LASPoint_GetY(summary->pmax), - LASPoint_GetZ(summary->pmax) - ); - if (err) { - LASError_Print("Could not set minimum for header "); - exit(1); - } - - } - - - for (i = 0; i < 5; i++) { - - if (LASHeader_GetPointRecordsByReturnCount(header, i) != - summary->number_of_points_by_return[i]) - { - update_return_counts = TRUE; - break; - } - } - - if (update_return_counts) { - fprintf(file, " Reparing Point Count by Return...\n"); - for (i = 0; i < 5; i++) { - LASHeader_SetPointRecordsByReturnCount( header, - i, - summary->number_of_points_by_return[i]); - } - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/lasinfo.c work/liblas-src-1.2.1/apps/lasinfo.c --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/lasinfo.c 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/lasinfo.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,418 +0,0 @@ -/*************************************************************************** - * $Id$ - * $Date$ - * - * Project: libLAS -- C/C++ read/write library for LAS LIDAR data - * Purpose: LAS information reporting and setting - * Author: Martin Isenburg isenburg@cs.unc.edu - *************************************************************************** - * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu - * - * See LICENSE.txt in this source distribution for more information. - **************************************************************************/ - -/* TODO: Remove before releasing */ -#if defined(_MSC_VER) && defined(USE_VLD) -#include -#endif - - -#include -#include -#include - -#include - - -LASPointSummary* SummarizePoints(LASReaderH reader); -void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header); -void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR); - -void usage() -{ - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," lasinfo (version %s) usage:\n", LAS_GetVersion()); - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Printing simple header info:\n"); - fprintf(stderr," lasinfo lidar.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Checking point information:\n"); - fprintf(stderr," lasinfo --input lidar.las --check\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Print header info and point summary and redirect output to a file:\n"); - fprintf(stderr," lasinfo --check --input lidar.las 2> output.txt\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Read from stdin, scan the points, and skip printing VLR info:\n"); - fprintf(stderr," lasinfo --stdin --check --skip_vlr < lidar.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Repairing header info to reflect point data:\n"); - fprintf(stderr," lasinfo -i lidar.las --repair\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Altering header info:\n"); - fprintf(stderr, " lasinfo -i lidar.las --system_identifier \"hello world!\" " - "--generating_software \"this is a test (-:\" --file_creation 8 2007\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Print this output:\n"); - fprintf(stderr, " lasinfo --help\n"); - fprintf(stderr,"\n"); - - fprintf(stderr, "\nFor more information, see the full documentation for lasinfo at:\n" - " http://liblas.org/browser/trunk/doc/lasinfo.txt\n"); - fprintf(stderr,"----------------------------------------------------------\n"); - -} - - - -int main(int argc, char *argv[]) -{ - int i; - char* file_name = NULL; - - LASReaderH reader = NULL; - LASHeaderH header = NULL; - LASWriterH writer = NULL; - - int check_points = FALSE; - int repair_header = FALSE; - int change_header = FALSE; - int repair_bounding_box = FALSE; - int use_stdin = FALSE; - int update_return_counts = FALSE; - int skip_vlr = FALSE; - - - char *system_identifier = NULL; - char *generating_software = NULL; - uint8_t file_creation_day = 0; - uint8_t file_creation_year = 0; - - int err = 0; - - LASPointSummary* summary = NULL; - - for (i = 1; i < argc; i++) - { - if ( strcmp(argv[i],"-h") == 0 || - strcmp(argv[i],"--help") == 0 - ) - { - usage(); - exit(0); - } - else if ( strcmp(argv[i],"--input") == 0 || - strcmp(argv[i],"-input") == 0 || - strcmp(argv[i],"-i") == 0 || - strcmp(argv[i],"-in") == 0 - ) - { - i++; - file_name = argv[i]; - } - else if ( strcmp(argv[i], "--points") == 0 || - strcmp(argv[i], "--check") == 0 || - strcmp(argv[i], "--check_points") == 0 || - strcmp(argv[i], "-c") == 0 || - strcmp(argv[i], "-points") == 0 || - strcmp(argv[i], "-check") == 0 || - strcmp(argv[i], "-check_points") == 0 - ) - { - check_points = TRUE; - } - else if ( strcmp(argv[i], "--nocheck") == 0 || - strcmp(argv[i], "-nocheck") == 0 - ) - { - check_points = FALSE; - } - else if ( strcmp(argv[i], "--stdin") == 0 || - strcmp(argv[i], "-ilas") == 0 - ) - { - use_stdin = TRUE; - } - - else if ( strcmp(argv[i], "--repair") == 0 || - strcmp(argv[i], "-r") == 0 || - strcmp(argv[i], "-repair_header") == 0 || - strcmp(argv[i], "-repair") == 0 - ) - { - repair_header = TRUE; - check_points = TRUE; - } - - else if ( strcmp(argv[i], "--repair_bb") == 0 || - strcmp(argv[i], "--repair_bounding_box") == 0 || - strcmp(argv[i], "--repair_boundingbox") == 0 || - strcmp(argv[i], "-repair_bb") == 0 || - strcmp(argv[i], "-repair_bounding_box") == 0 || - strcmp(argv[i], "-repair_boundingbox") == 0 || - strcmp(argv[i], "-repair") == 0 || - strcmp(argv[i], "-rb") == 0 - - ) - { - repair_bounding_box = TRUE; - check_points = TRUE; - } - - else if ( strcmp(argv[i],"--system_identifier") == 0 || - strcmp(argv[i],"-system_identifier") == 0 || - strcmp(argv[i],"-s") == 0 || - strcmp(argv[i],"-sys_id") == 0) - { - i++; - system_identifier = (char*) malloc(31 * sizeof(char)); - strcpy(system_identifier, argv[i]); - change_header = TRUE; - } - - else if ( strcmp(argv[i],"--generating_software") == 0 || - strcmp(argv[i],"-generating_software") == 0 || - strcmp(argv[i],"-g") == 0 || - strcmp(argv[i],"-gen_soft") == 0) - { - i++; - generating_software = (char*) malloc(31*sizeof(char)); - strcpy(generating_software, argv[i]); - change_header = TRUE; - } - - else if ( strcmp(argv[i],"--file_creation") == 0 || - strcmp(argv[i],"-file_creation") == 0) - { - /* XXX - mloskot: Consider replacing atoi with strtol, - see http://www.iso-9899.info/wiki/Converting */ - i++; - file_creation_day = (uint8_t)atoi(argv[i]); - i++; - file_creation_year = (uint8_t)atoi(argv[i]); - change_header = TRUE; - } - else if ( strcmp(argv[i],"--skip_vlr") == 0 || - strcmp(argv[i],"--no_vlr") == 0) - { - skip_vlr = TRUE; - } - else if (file_name == NULL) - { - file_name = argv[i]; - } - else - { - usage(); - exit(1); - fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); - } - } - - if (use_stdin) { - file_name = "stdin"; - } - - if (!file_name) { - LASError_Print("No filename was provided to be opened"); - usage(); - exit(1); - } - - reader = LASReader_Create(file_name); - if (!reader) { - LASError_Print("Could not open file "); - exit(1); - } - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not get LASHeader "); - exit(1); - } - - - - print_header(stdout, header, file_name, skip_vlr); - - if (change_header) { - if (system_identifier) { - err = LASHeader_SetSystemId (header, system_identifier); - if (err) LASError_Print("Could not set SystemId"); - } - if (generating_software) { - err = LASHeader_SetSoftwareId(header, generating_software); - if (err) LASError_Print("Could not set SoftwareId"); - } - if ( file_creation_day || file_creation_year) { - err = LASHeader_SetCreationDOY(header, file_creation_day); - if (err) LASError_Print("Could not set file creation day"); - err = LASHeader_SetCreationYear(header, file_creation_year); - if (err) LASError_Print("Could not set file creation year"); - } - - /* We need to wipe out the reader and make a writer. */ - if (reader) { - LASReader_Destroy(reader); - reader = NULL; - } - - writer = LASWriter_Create(file_name, header, LAS_MODE_APPEND); - if (!writer) { - LASError_Print("Problem creating LASWriterH object"); - LASHeader_Destroy(header); - header = NULL; - exit(1); - } - - if (writer) LASWriter_Destroy(writer); - writer = NULL; - if (header) LASHeader_Destroy(header); - header = NULL; - } - - if (check_points) - { - if (!reader) { - reader = LASReader_Create(file_name); - if (!reader) { - LASError_Print("Could not open file "); - exit(1); - } - } - - if (! header) { - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not get LASHeader "); - exit(1); - } - } - - if (!summary) - summary = SummarizePoints(reader); - print_point_summary(stdout, summary, header); - - if (repair_header) { - fprintf(stdout, "\n---------------------------------------------------------\n"); - fprintf(stdout, " Repair Summary\n"); - fprintf(stdout, "---------------------------------------------------------\n"); - - - if (use_stdin) { - LASError_Print("Cannot update header information on piped input!"); - exit(1); - } - - - if (! header) { - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not get LASHeader "); - exit(1); - } - } - - if (! repair_bounding_box) { - if ( LASHeader_GetMinX(header) != LASPoint_GetX(summary->pmin) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMinY(header) != LASPoint_GetY(summary->pmin) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMinZ(header) != LASPoint_GetZ(summary->pmin) ) - repair_bounding_box = TRUE; - - if ( LASHeader_GetMaxX(header) != LASPoint_GetX(summary->pmax) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMaxY(header) != LASPoint_GetY(summary->pmax) ) - repair_bounding_box = TRUE; - if ( LASHeader_GetMaxZ(header) != LASPoint_GetZ(summary->pmax) ) - repair_bounding_box = TRUE; - } - - if (repair_bounding_box) { - fprintf(stdout, " Reparing Bounding Box...\n"); - err = LASHeader_SetMin( header, - LASPoint_GetX(summary->pmin), - LASPoint_GetY(summary->pmin), - LASPoint_GetZ(summary->pmin) - ); - if (err) { - LASError_Print("Could not set minimum for header "); - exit(1); - } - err = LASHeader_SetMax( header, - LASPoint_GetX(summary->pmax), - LASPoint_GetY(summary->pmax), - LASPoint_GetZ(summary->pmax) - ); - if (err) { - LASError_Print("Could not set minimum for header "); - exit(1); - } - - } - - - for (i = 0; i < 5; i++) { - - if (LASHeader_GetPointRecordsByReturnCount(header, i) != - summary->number_of_points_by_return[i]) - { - update_return_counts = TRUE; - break; - } - } - - if (update_return_counts) { - fprintf(stdout, " Reparing Point Count by Return...\n"); - for (i = 0; i < 5; i++) { - LASHeader_SetPointRecordsByReturnCount( header, - i, - summary->number_of_points_by_return[i]); - } - } - - - - - if (reader) { - LASReader_Destroy(reader); - reader = NULL; - } - - writer = LASWriter_Create(file_name, header, LAS_MODE_APPEND); - if (!writer) { - LASError_Print("Problem creating LASWriterH object for append"); - LASHeader_Destroy(header); - header = NULL; - exit(1); - } - LASWriter_Destroy(writer); - writer = NULL; - LASHeader_Destroy(header); - header = NULL; - - - } - if (summary) { - LASPoint_Destroy(summary->pmin); - LASPoint_Destroy(summary->pmax); - free(summary); - - } - -} - - if (reader) LASReader_Destroy(reader); - if (header) LASHeader_Destroy(header); - - - return 0; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/lasmerge.c work/liblas-src-1.2.1/apps/lasmerge.c --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/lasmerge.c 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/lasmerge.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,512 +0,0 @@ -/*************************************************************************** - * $Id$ - * $Date$ - * - * Project: libLAS -- C/C++ read/write library for LAS LIDAR data - * Purpose: LAS file merging - * Author: Martin Isenburg isenburg@cs.unc.edu - *************************************************************************** - * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu - * - * See LICENSE.txt in this source distribution for more information. - **************************************************************************/ - - -#include -#include -#include -#include - -#include "liblas.h" - -LASPointSummary* SummarizePoints(LASReaderH reader); -void print_point_summary(FILE *file, LASPointSummary* summary, LASHeaderH header); -void print_header(FILE *file, LASHeaderH header, const char* file_name, int bSkipVLR); - -void usage() -{ - - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," lasmerge (version %s) usage:\n", LAS_GetVersion()); - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Merge using a list of files:\n"); - fprintf(stderr," lasmerge -i lasfiles.txt -o out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Manually list files to merge:\n"); - fprintf(stderr," lasmerge -i file1.las -i file2.las -i file3.las -o out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Merge to stdout:\n"); - fprintf(stderr," lasmerge -i file1.las -i file2.las --stdout\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Merge and set scale:\n"); - fprintf(stderr, " lasmerge --input lasfiles.txt --scale 0.01 --output out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Merge and set scale individually:\n"); - fprintf(stderr, " lasmerge --input lasfiles.txt --xyz_scale 0.01 0.01 0.1 --output out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Merge and set offset individually:\n"); - fprintf(stderr, " lasmerge --input lasfiles.txt --xyz_offset 0.01 0.01 0.1 --output out.las\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Print this output:\n"); - fprintf(stderr, " lasmerge --help\n"); - fprintf(stderr,"\n"); - - fprintf(stderr, "For more information, see the full documentation for lasmerge at:\n" - " http://liblas.org/browser/trunk/doc/lasmerge.txt\n"); - fprintf(stderr,"----------------------------------------------------------\n"); - -} - -void ptime(const char *const msg) -{ - float t= ((float)clock())/CLOCKS_PER_SEC; - fprintf(stderr, "cumulative CPU time thru %s = %f\n", msg, t); -} - -int main(int argc, char *argv[]) -{ - int i; - int verbose = FALSE; - int skip_vlr = FALSE; - int num_file_name_in = 0; - int alloced_file_name_in = 32; - char** file_names_in = (char**)malloc(sizeof(char*)*alloced_file_name_in); - char* file_name_out = 0; - int use_stdout = FALSE; - double xyz_scale[3] = {0.0, 0.0, 0.0}; - double xyz_offset[3] = {0.0, 0.0, 0.0}; - - double minx, miny, maxx, maxy, minz, maxz; - double x_scale_factor, y_scale_factor, z_scale_factor; - - - LASHeaderH merged_header=NULL; - LASHeaderH header = NULL; - LASReaderH reader = NULL; - LASWriterH writer = NULL; - LASPointH p = NULL; - - FILE* file = NULL; - - int smallest_int = (1<<31)+10; - int largest_int = smallest_int-1-20; - - int same = TRUE; - LASPointSummary* summary = NULL; - - for (i = 1; i < argc; i++) - { - if ( strcmp(argv[i],"-h") == 0 || - strcmp(argv[i],"--help") == 0 - ) - { - usage(); - exit(0); - } - else if ( strcmp(argv[i],"-v") == 0 || - strcmp(argv[i],"--verbose") == 0 - ) - { - verbose = TRUE; - } - else if ( strcmp(argv[i],"--input") == 0 || - strcmp(argv[i],"-input") == 0 || - strcmp(argv[i],"-i") == 0 || - strcmp(argv[i],"-in") == 0 - ) - { - i++; - if (num_file_name_in == alloced_file_name_in) - { - alloced_file_name_in *= 2; - file_names_in = (char**)realloc(file_names_in,sizeof(char*)*alloced_file_name_in); - } - file_names_in[num_file_name_in] = argv[i]; - num_file_name_in++; - } - else if ( strcmp(argv[i],"--output") == 0 || - strcmp(argv[i],"--out") == 0 || - strcmp(argv[i],"-out") == 0 || - strcmp(argv[i],"-o") == 0 - ) - { - i++; - file_name_out = argv[i]; - } - else if ( strcmp(argv[i],"--scale") == 0 || - strcmp(argv[i],"-scale") == 0 || - strcmp(argv[i],"-s") == 0 - ) - { - - i++; - sscanf(argv[i], "%lf", &(xyz_scale[2])); - xyz_scale[0] = xyz_scale[1] = xyz_scale[2]; - } - else if ( strcmp(argv[i],"--xyz_scale") == 0 || - strcmp(argv[i],"-xyz_scale") == 0 - ) - - { - i++; - sscanf(argv[i], "%lf", &(xyz_scale[0])); - i++; - sscanf(argv[i], "%lf", &(xyz_scale[1])); - i++; - sscanf(argv[i], "%lf", &(xyz_scale[2])); - } - else if ( strcmp(argv[i],"--xyz_offset") == 0 || - strcmp(argv[i],"-xyz_offset") == 0 - ) - { - i++; - sscanf(argv[i], "%lf", &(xyz_offset[0])); - i++; - sscanf(argv[i], "%lf", &(xyz_offset[1])); - i++; - sscanf(argv[i], "%lf", &(xyz_offset[2])); - } - else if ( strcmp(argv[i],"--stdout") == 0 || - strcmp(argv[i],"-olas") == 0 - ) - { - use_stdout = TRUE; - file_name_out = "stdout"; - } - else if ( strcmp(argv[i],"--skip_vlr") == 0 || - strcmp(argv[i],"--no_vlr") == 0) - { - skip_vlr = TRUE; - } - else if (i == argc - 2 && num_file_name_in == 0 && file_name_out == 0) - { - file_names_in[0] = argv[i]; - num_file_name_in = 1; - } - else if (i == argc - 1 && num_file_name_in == 0 && file_name_out == 0) - { - file_names_in[0] = argv[i]; - num_file_name_in = 1; - } - else if (i == argc - 1 && num_file_name_in != 0 && file_name_out == 0) - { - file_name_out = argv[i]; - } - else - { - fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); - usage(); - exit(1); - } - } - - if (num_file_name_in == 0) - { - fprintf(stderr, "ERROR: no input specified\n"); - usage(); - exit(1); - } - - if ( num_file_name_in == 1 && - strstr(file_names_in[0],".las") == 0 && - strstr(file_names_in[0],".LAS") == 0 - ) - { - char line[512]; - - num_file_name_in = 0; - file = fopen(file_names_in[0], "r"); - while (fgets(line, sizeof(char) * 512, file)) - { - if (strstr(line,".las") || strstr(line,".LAS") ) - { - if (num_file_name_in == alloced_file_name_in) - { - alloced_file_name_in *= 2; - file_names_in = (char**)realloc(file_names_in,sizeof(char*)*alloced_file_name_in); - } - file_names_in[num_file_name_in] = strdup(line); - i = (int)strlen(file_names_in[num_file_name_in]) - 1; - while ( i && - file_names_in[num_file_name_in][i] != 's' && - file_names_in[num_file_name_in][i] != 'S' && - file_names_in[num_file_name_in][i] != 'z' && - file_names_in[num_file_name_in][i] != 'Z') - i--; - if (i) - { - file_names_in[num_file_name_in][i+1] = '\0'; - num_file_name_in++; - } - else - { - fprintf(stderr, "WARNING: cannot parse line '%s'\n",line); - } - } - else - { - fprintf(stderr, "WARNING: no a valid LAS file name '%s'\n",line); - } - } - } - - - if (verbose) ptime("starting first pass."); - fprintf(stderr, "first pass ... reading headers of %d LAS files...\n", num_file_name_in); - - for (i = 0; i < num_file_name_in; i++) - { - reader = LASReader_Create(file_names_in[i]); - if (!reader) { - LASError_Print("Could not get LASReader "); - exit(1); - } - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not get LASHeader "); - exit(1); - } - - - if (i == 0) - { - merged_header = LASReader_GetHeader(reader); - } - else - { - LASHeader_SetPointRecordsCount( merged_header, - LASHeader_GetPointRecordsCount(merged_header) + - LASHeader_GetPointRecordsCount(header)); - LASHeader_SetPointRecordsByReturnCount( merged_header, - 0, - LASHeader_GetPointRecordsByReturnCount(merged_header,0) + - LASHeader_GetPointRecordsByReturnCount(header,0)); - LASHeader_SetPointRecordsByReturnCount( merged_header, - 1, - LASHeader_GetPointRecordsByReturnCount(merged_header,1) + - LASHeader_GetPointRecordsByReturnCount(header,1)); - LASHeader_SetPointRecordsByReturnCount( merged_header, - 2, - LASHeader_GetPointRecordsByReturnCount(merged_header,2) + - LASHeader_GetPointRecordsByReturnCount(header,2)); - LASHeader_SetPointRecordsByReturnCount( merged_header, - 3, - LASHeader_GetPointRecordsByReturnCount(merged_header,3) + - LASHeader_GetPointRecordsByReturnCount(header,3)); - LASHeader_SetPointRecordsByReturnCount( merged_header, - 4, - LASHeader_GetPointRecordsByReturnCount(merged_header,4) + - LASHeader_GetPointRecordsByReturnCount(header,4)); - - LASHeader_SetSystemId(merged_header, "MERGED"); - - minx = LASHeader_GetMinX(merged_header); - maxx = LASHeader_GetMaxX(merged_header); - miny = LASHeader_GetMinY(merged_header); - maxy = LASHeader_GetMaxY(merged_header); - minz = LASHeader_GetMinZ(merged_header); - maxz = LASHeader_GetMaxZ(merged_header); - - if (minx > LASHeader_GetMinX(header)) minx = LASHeader_GetMinX(header); - if (maxx < LASHeader_GetMaxX(header)) maxx = LASHeader_GetMaxX(header); - if (miny > LASHeader_GetMinY(header)) miny = LASHeader_GetMinY(header); - if (maxy < LASHeader_GetMaxY(header)) maxy = LASHeader_GetMaxY(header); - if (minz > LASHeader_GetMinZ(header)) minz = LASHeader_GetMinZ(header); - if (maxz < LASHeader_GetMaxZ(header)) maxz = LASHeader_GetMaxZ(header); - - LASHeader_SetMin(merged_header, minx, miny, minz); - LASHeader_SetMax(merged_header, maxx, maxy, maxz); - } - - LASHeader_Destroy(header); - LASReader_Destroy(reader); - } - - if (verbose) - { - fprintf(stderr, " number_of_point_records %d\n", - LASHeader_GetPointRecordsCount(merged_header)); - fprintf(stderr, " number of points by return %d %d %d %d %d\n", - LASHeader_GetPointRecordsByReturnCount(merged_header, 0), - LASHeader_GetPointRecordsByReturnCount(merged_header, 1), - LASHeader_GetPointRecordsByReturnCount(merged_header, 2), - LASHeader_GetPointRecordsByReturnCount(merged_header, 3), - LASHeader_GetPointRecordsByReturnCount(merged_header, 4)); - fprintf(stderr, " min x y z %.6f %.6f %.6f\n", - LASHeader_GetMinX(merged_header), - LASHeader_GetMinY(merged_header), - LASHeader_GetMinZ(merged_header)); - fprintf(stderr, " max x y z %.6f %.6f %.6f\n", - LASHeader_GetMaxX(merged_header), - LASHeader_GetMaxY(merged_header), - LASHeader_GetMaxZ(merged_header)); - } - - if (xyz_scale) - { - LASHeader_SetScale( merged_header, - xyz_scale[0], - xyz_scale[1], - xyz_scale[2]); - } - - if (xyz_offset) - { - LASHeader_SetOffset(merged_header, - xyz_offset[0], - xyz_offset[1], - xyz_offset[2] ); - } - - x_scale_factor = LASHeader_GetScaleX(merged_header); - if (((LASHeader_GetMaxX(merged_header) - LASHeader_GetOffsetX(merged_header)) / LASHeader_GetScaleX(merged_header)) > largest_int || - ((LASHeader_GetMinX(merged_header) - LASHeader_GetOffsetX(merged_header)) / LASHeader_GetScaleX(merged_header)) < smallest_int ) - { - x_scale_factor = 0.0000001; - while (((LASHeader_GetMaxX(merged_header) - LASHeader_GetOffsetX(merged_header)) / x_scale_factor) > largest_int || - ((LASHeader_GetMinX(merged_header) - LASHeader_GetOffsetX(merged_header)) / x_scale_factor) < smallest_int ) - { - x_scale_factor *= 10; - } - fprintf(stderr, "x_scale_factor of merged_header changed to %g\n", x_scale_factor); - } - - y_scale_factor = LASHeader_GetScaleY(merged_header); - if (((LASHeader_GetMaxY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) > largest_int || - ((LASHeader_GetMinY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) < smallest_int ) - { - y_scale_factor = 0.0000001; - while (((LASHeader_GetMaxY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) > largest_int || - ((LASHeader_GetMinY(merged_header) - LASHeader_GetOffsetY(merged_header)) / y_scale_factor) < smallest_int ) - { - y_scale_factor *= 10; - } - fprintf(stderr, "y_scale_factor of merged_header changed to %g\n", y_scale_factor); - } - - z_scale_factor = LASHeader_GetScaleZ(merged_header); - if (((LASHeader_GetMaxZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) > largest_int || - ((LASHeader_GetMinZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) < smallest_int ) - { - z_scale_factor = 0.0000001; - while (((LASHeader_GetMaxZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) > largest_int || - ((LASHeader_GetMinZ(merged_header) - LASHeader_GetOffsetZ(merged_header)) / z_scale_factor) < smallest_int )\ - { - z_scale_factor *= 10; - } - fprintf(stderr, "z_scale_factor of merged_header changed to %g\n", z_scale_factor); - } - - LASHeader_SetScale( merged_header, - x_scale_factor, - y_scale_factor, - z_scale_factor); - - if (file_name_out == NULL && !use_stdout) - { - LASError_Print("no output was specified "); - exit(1); - } - - writer = LASWriter_Create(file_name_out, merged_header, LAS_MODE_WRITE); - if (!writer) { - LASError_Print("Could not create LASWriter "); - exit(1); - } - - if (verbose) ptime("starting second pass."); - fprintf(stderr, "second pass ... merge %d LAS files into one ...\n", num_file_name_in); - - for (i = 0; i < num_file_name_in; i++) - { - reader = LASReader_Create(file_names_in[i]); - if (!reader) { - LASError_Print("Could not get LASReader "); - exit(1); - } - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not get LASHeader "); - exit(1); - } - - same = TRUE; - if (LASHeader_GetOffsetX(merged_header) != LASHeader_GetOffsetX(header)) same = FALSE; - if (LASHeader_GetOffsetY(merged_header) != LASHeader_GetOffsetY(header)) same = FALSE; - if (LASHeader_GetOffsetZ(merged_header) != LASHeader_GetOffsetZ(header)) same = FALSE; - - if (LASHeader_GetScaleX(merged_header) != LASHeader_GetScaleX(header)) same = FALSE; - if (LASHeader_GetScaleY(merged_header) != LASHeader_GetScaleY(header)) same = FALSE; - if (LASHeader_GetScaleZ(merged_header) != LASHeader_GetScaleZ(header)) same = FALSE; - - - if (same) - { - p = LASReader_GetNextPoint(reader); - while (p) - { - LASWriter_WritePoint(writer, p); - p = LASReader_GetNextPoint(reader); - } - } - else - { - p = LASReader_GetNextPoint(reader); - while (p) - { - LASPoint_SetX(p,(0.5 + (LASPoint_GetX(p) - LASHeader_GetOffsetX(merged_header)) / LASHeader_GetScaleX(merged_header))); - LASPoint_SetY(p,(0.5 + (LASPoint_GetY(p) - LASHeader_GetOffsetY(merged_header)) / LASHeader_GetScaleY(merged_header))); - LASPoint_SetZ(p,(0.5 + (LASPoint_GetZ(p) - LASHeader_GetOffsetZ(merged_header)) / LASHeader_GetScaleZ(merged_header))); - LASWriter_WritePoint(writer, p); - p = LASReader_GetNextPoint(reader); - } - } - - LASHeader_Destroy(header); - LASReader_Destroy(reader); - reader = NULL; - } - - LASHeader_Destroy(merged_header); - LASWriter_Destroy(writer); - - if (verbose) ptime("done."); - - if (verbose) { - reader = LASReader_Create(file_name_out); - if (!reader) { - LASError_Print("Could not open file "); - exit(1); - } - - header = LASReader_GetHeader(reader); - if (!header) { - LASError_Print("Could not get LASHeader "); - exit(1); - } - - print_header(stderr, header, file_name_out, skip_vlr); - summary = SummarizePoints(reader); - print_point_summary(stderr, summary, header); - - LASHeader_Destroy(header); - header = NULL; - LASReader_Destroy(reader); - reader = NULL; - - LASPoint_Destroy(summary->pmin); - LASPoint_Destroy(summary->pmax); - free(summary); - } - - return 0; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/liblas-config.in work/liblas-src-1.2.1/apps/liblas-config.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/liblas-config.in 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/apps/liblas-config.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,53 +0,0 @@ -#!/bin/sh - - - -usage() -{ - cat <&2 -fi - -case $1 in - --libs) - echo @LIBS@ - ;; - - --defines) - echo @DEFS@ - ;; - - --includes) - echo @GEOTIFF_INC@ @GDAL_INC@ - ;; - - --cflags) - echo @CFLAGS@ - ;; - - --cxxflags) - echo @CXXFLAGS@ - ;; - - --version) - echo @RELEASE_VERSION@ - ;; - - *) - usage 1 1>&2 - ;; - -esac diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/Makefile.am work/liblas-src-1.2.1/apps/Makefile.am --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/Makefile.am 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/Makefile.am 1970-01-01 08:00:00.000000000 +0800 @@ -1,27 +0,0 @@ -if GDAL_IS_CONFIG -GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -endif - -if GEOTIFF_IS_CONFIG -GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -endif - -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include/liblas/capi -I../include - -lasinfo_SOURCES = lasinfo.c lascommon.c -las2las_SOURCES = las2las.c lascommon.c -lasmerge_SOURCES = lasmerge.c lascommon.c -las2txt_SOURCES = las2txt.c lascommon.c -txt2las_SOURCES = txt2las.c - - -bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las - -bin_SCRIPTS = liblas-config - -if GDAL_IS_CONFIG -las2ogr_SOURCES = las2ogr.cpp -bin_PROGRAMS += las2ogr -endif - -LDADD = ../src/liblas.la diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/Makefile.in work/liblas-src-1.2.1/apps/Makefile.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/Makefile.in 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/apps/Makefile.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,582 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -bin_PROGRAMS = lasinfo$(EXEEXT) las2las$(EXEEXT) lasmerge$(EXEEXT) \ - las2txt$(EXEEXT) txt2las$(EXEEXT) $(am__EXEEXT_1) -@GDAL_IS_CONFIG_TRUE@am__append_1 = las2ogr -subdir = apps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/liblas-config.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = liblas-config -@GDAL_IS_CONFIG_TRUE@am__EXEEXT_1 = las2ogr$(EXEEXT) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_las2las_OBJECTS = las2las.$(OBJEXT) lascommon.$(OBJEXT) -las2las_OBJECTS = $(am_las2las_OBJECTS) -las2las_LDADD = $(LDADD) -las2las_DEPENDENCIES = ../src/liblas.la -am__las2ogr_SOURCES_DIST = las2ogr.cpp -@GDAL_IS_CONFIG_TRUE@am_las2ogr_OBJECTS = las2ogr.$(OBJEXT) -las2ogr_OBJECTS = $(am_las2ogr_OBJECTS) -las2ogr_LDADD = $(LDADD) -las2ogr_DEPENDENCIES = ../src/liblas.la -am_las2txt_OBJECTS = las2txt.$(OBJEXT) lascommon.$(OBJEXT) -las2txt_OBJECTS = $(am_las2txt_OBJECTS) -las2txt_LDADD = $(LDADD) -las2txt_DEPENDENCIES = ../src/liblas.la -am_lasinfo_OBJECTS = lasinfo.$(OBJEXT) lascommon.$(OBJEXT) -lasinfo_OBJECTS = $(am_lasinfo_OBJECTS) -lasinfo_LDADD = $(LDADD) -lasinfo_DEPENDENCIES = ../src/liblas.la -am_lasmerge_OBJECTS = lasmerge.$(OBJEXT) lascommon.$(OBJEXT) -lasmerge_OBJECTS = $(am_lasmerge_OBJECTS) -lasmerge_LDADD = $(LDADD) -lasmerge_DEPENDENCIES = ../src/liblas.la -am_txt2las_OBJECTS = txt2las.$(OBJEXT) -txt2las_OBJECTS = $(am_txt2las_OBJECTS) -txt2las_LDADD = $(LDADD) -txt2las_DEPENDENCIES = ../src/liblas.la -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(las2las_SOURCES) $(las2ogr_SOURCES) $(las2txt_SOURCES) \ - $(lasinfo_SOURCES) $(lasmerge_SOURCES) $(txt2las_SOURCES) -DIST_SOURCES = $(las2las_SOURCES) $(am__las2ogr_SOURCES_DIST) \ - $(las2txt_SOURCES) $(lasinfo_SOURCES) $(lasmerge_SOURCES) \ - $(txt2las_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GDAL_INC = @GDAL_INC@ -GDAL_PREFIX = @GDAL_PREFIX@ -GEOTIFF_INC = @GEOTIFF_INC@ -GEOTIFF_PREFIX = @GEOTIFF_PREFIX@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE_VERSION = @RELEASE_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -@GDAL_IS_CONFIG_TRUE@GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -@GEOTIFF_IS_CONFIG_TRUE@GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include/liblas/capi -I../include -lasinfo_SOURCES = lasinfo.c lascommon.c -las2las_SOURCES = las2las.c lascommon.c -lasmerge_SOURCES = lasmerge.c lascommon.c -las2txt_SOURCES = las2txt.c lascommon.c -txt2las_SOURCES = txt2las.c -bin_SCRIPTS = liblas-config -@GDAL_IS_CONFIG_TRUE@las2ogr_SOURCES = las2ogr.cpp -LDADD = ../src/liblas.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu apps/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -liblas-config: $(top_builddir)/config.status $(srcdir)/liblas-config.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -las2las$(EXEEXT): $(las2las_OBJECTS) $(las2las_DEPENDENCIES) - @rm -f las2las$(EXEEXT) - $(LINK) $(las2las_OBJECTS) $(las2las_LDADD) $(LIBS) -las2ogr$(EXEEXT): $(las2ogr_OBJECTS) $(las2ogr_DEPENDENCIES) - @rm -f las2ogr$(EXEEXT) - $(CXXLINK) $(las2ogr_OBJECTS) $(las2ogr_LDADD) $(LIBS) -las2txt$(EXEEXT): $(las2txt_OBJECTS) $(las2txt_DEPENDENCIES) - @rm -f las2txt$(EXEEXT) - $(LINK) $(las2txt_OBJECTS) $(las2txt_LDADD) $(LIBS) -lasinfo$(EXEEXT): $(lasinfo_OBJECTS) $(lasinfo_DEPENDENCIES) - @rm -f lasinfo$(EXEEXT) - $(LINK) $(lasinfo_OBJECTS) $(lasinfo_LDADD) $(LIBS) -lasmerge$(EXEEXT): $(lasmerge_OBJECTS) $(lasmerge_DEPENDENCIES) - @rm -f lasmerge$(EXEEXT) - $(LINK) $(lasmerge_OBJECTS) $(lasmerge_LDADD) $(LIBS) -txt2las$(EXEEXT): $(txt2las_OBJECTS) $(txt2las_DEPENDENCIES) - @rm -f txt2las$(EXEEXT) - $(LINK) $(txt2las_OBJECTS) $(txt2las_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/las2las.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/las2ogr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/las2txt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lascommon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasmerge.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2las.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-binPROGRAMS install-binSCRIPTS - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-binSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-binSCRIPTS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/txt2las.c work/liblas-src-1.2.1/apps/txt2las.c --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/apps/txt2las.c 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/apps/txt2las.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,916 +0,0 @@ -/*************************************************************************** - * $Id$ - * $Date$ - * - * Project: libLAS -- C/C++ read/write library for LAS LIDAR data - * Purpose: ASCII text to LAS translation - * Author: Martin Isenburg isenburg@cs.unc.edu - *************************************************************************** - * Copyright (c) 2007, Martin Isenburg isenburg@cs.unc.edu - * - * See LICENSE.txt in this source distribution for more information. - **************************************************************************/ - -#include -#include -#include -#include - -#define LAS_FORMAT_10 0 -#define LAS_FORMAT_11 1 -#define LAS_FORMAT_12 2 - -void usage() -{ - - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," txt2las (version %s) usage:\n", LAS_GetVersion()); - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Parse a text file with a given format:\n"); - fprintf(stderr," txt2las -parse tsxyz lidar.txt\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Set the scale:\n"); - fprintf(stderr," txt2las --parse xyz --scale 0.02 -i lidar.txt -o lidar.laz\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"Set the xyz scale:\n"); - fprintf(stderr," txt2las --parse xsysz --verbose --xyz_scale 0.02 0.02 0.01 lidar.txt\n"); - fprintf(stderr,"\n"); - - fprintf(stderr,"----------------------------------------------------------\n"); - fprintf(stderr," The '--parse txyz' flag specifies how to format each\n"); - fprintf(stderr," each line of the ASCII file. For example, 'txyzia'\n"); - fprintf(stderr," means that the first number of each line should be the\n"); - fprintf(stderr," gpstime, the next three numbers should be the x, y, and\n"); - fprintf(stderr," z coordinate, the next number should be the intensity\n"); - fprintf(stderr," and the next number should be the scan angle.\n"); - fprintf(stderr," The supported entries are:\n"); - fprintf(stderr," a - scan angle\n"); - fprintf(stderr," i - intensity\n"); - fprintf(stderr," n - number of returns for given pulse\n"); - fprintf(stderr," r - number of this return\n"); - fprintf(stderr," c - classification\n"); - fprintf(stderr," u - user data (does not currently work)\n"); - fprintf(stderr," p - point source ID\n"); - fprintf(stderr," e - edge of flight line\n"); - fprintf(stderr," d - direction of scan flag\n"); - fprintf(stderr," R - red channel of RGB color\n"); - fprintf(stderr," G - green channel of RGB color\n"); - fprintf(stderr," B - blue channel of RGB color\n\n"); - - fprintf(stderr,"\n----------------------------------------------------------\n"); - fprintf(stderr," The '-scale 0.02' flag specifies the quantization. The\n"); - fprintf(stderr," default value of 0.01 means that the smallest increment\n"); - fprintf(stderr," two between coordinates is 0.01. If measurements are in\n"); - fprintf(stderr," meters this corresponds to centimeter accuracy, which is\n"); - fprintf(stderr," commonly considered sufficient for LIDAR data.\n"); - - fprintf(stderr,"\n----------------------------------------------------------\n"); - fprintf(stderr," Other parameters such as '--xyz_offset 500000 2000000 0'\n"); - fprintf(stderr," or '-xyz_scale 0.02 0.02 0.01' or '-file_creation 67 2003'\n"); - fprintf(stderr," or '-system_identifier \"Airborne One Leica 50,000 Hz\"'\n"); - fprintf(stderr," or '-generating_software \"TerraScan\"' are available too.\n"); - - fprintf(stderr, "For more information, see the full documentation for txt2las at:\n" - " http://liblas.org/browser/trunk/doc/txt2las.txt\n"); - fprintf(stderr,"----------------------------------------------------------\n"); - -} - -static void VecUpdateMinMax3dv(double min[3], double max[3], const double v[3]) -{ - if (v[0]max[0]) max[0]=v[0]; - if (v[1]max[1]) max[1]=v[1]; - if (v[2]max[2]) max[2]=v[2]; -} - -static void VecCopy3dv(double v[3], const double a[3]) -{ - v[0] = a[0]; - v[1] = a[1]; - v[2] = a[2]; -} - -static int parse(const char* parse_string, const char* line, double* xyz, LASPointH point, double* gps_time) -{ - int temp_i; - float temp_f; - const char* p = parse_string; - const char* l = line; - - LASColorH color = LASColor_Create(); - - while (p[0]) - { - /* // we expect the x coordinate */ - if (p[0] == 'x') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%lf", &(xyz[0])) != 1) return FALSE; - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the y coordinate */ - else if (p[0] == 'y') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%lf", &(xyz[1])) != 1) return FALSE; - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the x coordinate */ - else if (p[0] == 'z') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%lf", &(xyz[2])) != 1) return FALSE; - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect a string or a number that we don't care about */ - else if (p[0] == 's') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the intensity */ - else if (p[0] == 'i') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%f", &temp_f) != 1) return FALSE; - if (temp_f < 0.0f || temp_f > 65535.0f) - fprintf(stderr, - "WARNING: intensity %g is out of range of unsigned short\n", - temp_f); - LASPoint_SetIntensity(point, (int)temp_f); -/* point->intensity = (unsigned short)temp_f; */ - /* // then advance to next white space*/ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the scan angle */ - else if (p[0] == 'a') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%f", &temp_f) != 1) return FALSE; - if (temp_f < -128.0f || temp_f > 127.0f) - fprintf(stderr, - "WARNING: scan angle %g is out of range of char\n", - temp_f); - LASPoint_SetScanAngleRank(point, (int)temp_f); -/* point->scan_angle_rank = (char)temp_f; */ - /* // then advance to next white space*/ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the number of returns of given pulse */ - else if (p[0] == 'n') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 7) - fprintf(stderr, - "WARNING: return number %d is out of range of three bits\n", - temp_i); - LASPoint_SetNumberOfReturns(point, temp_i); -/* point->number_of_returns_of_given_pulse = temp_i & 7; */ - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the number of the return */ - else if (p[0] == 'r') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 7) - fprintf(stderr, - "WARNING: return number %d is out of range of three bits\n", - temp_i); -/* point->return_number = temp_i & 7; */ - LASPoint_SetReturnNumber(point, temp_i); - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the classification */ - else if (p[0] == 'c') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 255) - fprintf(stderr, - "WARNING: classification %d is out of range of unsigned char\n", - temp_i); - LASPoint_SetClassification(point, temp_i); -/* point->classification = (unsigned char)temp_i; */ - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the user data */ - else if (p[0] == 'u') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 255) - fprintf(stderr, - "WARNING: user data %d is out of range of unsigned char\n", - temp_i); - - LASPoint_SetUserData(point, temp_i); -/* point->user_data = temp_i & 255; */ - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the point source ID */ - else if (p[0] == 'p') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 65535) - fprintf(stderr, - "WARNING: point source ID %d is out of range of unsigned short\n", - temp_i); -/* point->point_source_ID = temp_i & 65535; */ - LASPoint_SetPointSourceId(point, temp_i); - /*// then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the edge of flight line flag */ - else if (p[0] == 'e') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 1) - fprintf(stderr, - "WARNING: edge of flight line flag %d is out of range of boolean flag\n", - temp_i); - LASPoint_SetFlightLineEdge(point, temp_i ? 1: 0); -/* point->edge_of_flight_line = (temp_i ? 1 : 0); */ - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the direction of scan flag */ - else if (p[0] == 'd') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - if (temp_i < 0 || temp_i > 1) - fprintf(stderr, - "WARNING: direction of scan flag %d is out of range of boolean flag\n", - temp_i); - LASPoint_SetScanDirection(point, temp_i ? 1: 0); -/* point->scan_direction_flag = (temp_i ? 1 : 0); */ - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the gps time */ - else if (p[0] == 't') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%lf", gps_time) != 1) return FALSE; - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the red channel of the RGB field */ - else if (p[0] == 'R') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - LASColor_SetRed(color, temp_i); - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the green channel of the RGB field */ - else if (p[0] == 'G') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - LASColor_SetGreen(color, temp_i); - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - /* // we expect the blue channel of the RGB field */ - else if (p[0] == 'B') - { - /* // first skip white spaces */ - while (l[0] && (l[0] == ' ' || l[0] == ',' || l[0] == '\t')) l++; - if (l[0] == 0) return FALSE; - if (sscanf(l, "%d", &temp_i) != 1) return FALSE; - LASColor_SetBlue(color, temp_i); - /* // then advance to next white space */ - while (l[0] && l[0] != ' ' && l[0] != ',' && l[0] != '\t') l++; - } - - else - { - fprintf(stderr, "ERROR: next symbol '%s' unknown in parse control string\n", p); - } - p++; - } - LASPoint_SetColor(point, color); - LASColor_Destroy(color); - return TRUE; -} - - -int main(int argc, char *argv[]) -{ - int i; - int dry = FALSE; - int verbose = FALSE; - char* file_name_in = 0; - char* file_name_out = 0; - double xyz_min[3] = {0.0, 0.0, 0.0}; - double xyz_max[3] = {0.0, 0.0, 0.0}; - double xyz_scale[3] = {0.01,0.01,0.01}; - double xyz_offset[3] = {0.0,0.0,0.0}; - unsigned int number_of_point_records = 0; - unsigned int number_of_points_by_return[8] = {0,0,0,0,0,0,0,0}; - char* parse_string = "xyz"; - int file_creation_day = 0; - int file_creation_year = 0; - char* system_identifier = 0; - char* generating_software = 0; -#define MAX_CHARACTERS_PER_LINE 512 - char line[MAX_CHARACTERS_PER_LINE]; - double xyz[3]; - LASPointH point = NULL; - double gps_time; - FILE* file_in = NULL; - char* parse_less = NULL; - LASHeaderH header = NULL; - LASWriterH writer = NULL; - LASError err; - int format = LAS_FORMAT_12; - - int xyz_min_quant[3] = {0, 0, 0}; - int xyz_max_quant[3] = {0, 0, 0}; - - double xyz_min_dequant[3] = {0.0, 0.0, 0.0}; - double xyz_max_dequant[3] = {0.0, 0.0, 0.0}; - - for (i = 1; i < argc; i++) - { - if ( strcmp(argv[i],"-h") == 0 || - strcmp(argv[i],"--help") == 0 - ) - { - usage(); - exit(0); - } - else if ( strcmp(argv[i],"-v") == 0 || - strcmp(argv[i],"--verbose") == 0 - ) - { - verbose = TRUE; - } - else if ( strcmp(argv[i],"-d") == 0 || - strcmp(argv[i],"-dry") == 0 || - strcmp(argv[i],"--dry") == 0 - ) - { - dry = TRUE; - } - else if ( strcmp(argv[i],"--parse") == 0 || - strcmp(argv[i],"-parse") == 0 || - strcmp(argv[i],"-p") == 0 - ) - { - i++; - parse_string = argv[i]; - } - else if ( strcmp(argv[i],"--scale") == 0 || - strcmp(argv[i],"-scale") == 0 || - strcmp(argv[i],"-s") == 0 - ) - { - - i++; - sscanf(argv[i], "%lf", &(xyz_scale[2])); - xyz_scale[0] = xyz_scale[1] = xyz_scale[2]; - } - else if ( strcmp(argv[i],"--xyz_scale") == 0 || - strcmp(argv[i],"-xyz_scale") == 0 - ) - - { - i++; - sscanf(argv[i], "%lf", &(xyz_scale[0])); - i++; - sscanf(argv[i], "%lf", &(xyz_scale[1])); - i++; - sscanf(argv[i], "%lf", &(xyz_scale[2])); - } - else if ( strcmp(argv[i],"--xyz_offset") == 0 || - strcmp(argv[i],"-xyz_offset") == 0 - ) - { - i++; - sscanf(argv[i], "%lf", &(xyz_offset[0])); - i++; - sscanf(argv[i], "%lf", &(xyz_offset[1])); - i++; - sscanf(argv[i], "%lf", &(xyz_offset[2])); - } - else if ( strcmp(argv[i],"--input") == 0 || - strcmp(argv[i],"-input") == 0 || - strcmp(argv[i],"-i") == 0 || - strcmp(argv[i],"-in") == 0 - ) - { - i++; - file_name_in = argv[i]; - } - - else if ( strcmp(argv[i],"--output") == 0 || - strcmp(argv[i],"--out") == 0 || - strcmp(argv[i],"-out") == 0 || - strcmp(argv[i],"-o") == 0 - ) - { - i++; - file_name_out = argv[i]; - } - - else if ( strcmp(argv[i],"--format") == 0 || - strcmp(argv[i],"-f") == 0 || - strcmp(argv[i],"-format") == 0 - ) - { - i++; - if (strcmp(argv[i], "1.0") == 0) { - format = LAS_FORMAT_10; - } - else if (strcmp(argv[i], "1.1") == 0) { - format = LAS_FORMAT_11; - } - else if (strcmp(argv[i], "1.2") == 0) { - format = LAS_FORMAT_12; - } - else { - LASError_Print("Format must be specified as 1.0, 1.1, or 1.2"); - } - - } - else if ( strcmp(argv[i],"--system_identifier") == 0 || - strcmp(argv[i],"-system_identifier") == 0 || - strcmp(argv[i],"-s") == 0 || - strcmp(argv[i],"-sys_id") == 0) - { - i++; - system_identifier = (char*) malloc(31 * sizeof(char)); - strcpy(system_identifier, argv[i]); - } - - else if ( strcmp(argv[i],"--generating_software") == 0 || - strcmp(argv[i],"-generating_software") == 0 || - strcmp(argv[i],"-g") == 0 || - strcmp(argv[i],"-gen_soft") == 0) - { - i++; - generating_software = (char*) malloc(31*sizeof(char)); - strcpy(generating_software, argv[i]); - } - - else if ( strcmp(argv[i],"--file_creation") == 0 || - strcmp(argv[i],"-file_creation") == 0) - { - i++; - file_creation_day = (unsigned short)atoi(argv[i]); - i++; - file_creation_year = (unsigned short)atoi(argv[i]); - } - else if ( file_name_in == NULL && - file_name_out == NULL - ) - { - file_name_in = argv[i]; - } - else if ( file_name_in && - file_name_out == NULL - ) - { - file_name_out = argv[i]; - } - else - { - fprintf(stderr, "ERROR: unknown argument '%s'\n",argv[i]); - usage(); - exit(1); - } - } - - /* create output file name if none specified and no piped output requested */ - if (file_name_out == NULL && file_name_in != NULL) - { - int len = (int)strlen(file_name_in); - file_name_out = strdup(file_name_in); - - while (len > 0 && file_name_out[len] != '.') - { - len--; - } - file_name_out[len] = '.'; - file_name_out[len+1] = 'l'; - file_name_out[len+2] = 'a'; - file_name_out[len+3] = 's'; - file_name_out[len+4] = '\0'; - } - - - /* make sure that input and output are not *both* piped */ - if (file_name_in == NULL && file_name_out == NULL) - { - LASError_Print("both input and output filenames are null!"); - usage(); - exit(1); - } - - file_in = fopen(file_name_in, "r"); - - if (file_in == NULL) - { - LASError_Print("could not open file to read for first pass"); - exit(1); - } - - /* create a cheaper parse string that only looks for 'x' 'y' 'z' and 'r' */ - parse_less = strdup(parse_string); - for (i = 0; i < (int)strlen(parse_string); i++) - { - if (parse_less[i] != 'x' && - parse_less[i] != 'y' && - parse_less[i] != 'z' && - parse_less[i] != 'r') - { - parse_less[i] = 's'; - } - } - - do - { - parse_less[i] = '\0'; - printf("nuking %d for %c\n", i, parse_less[i]); - i--; - } while (parse_less[i] == 's'); - - - /* first pass to figure out the bounding box and number of returns */ - if (verbose) { - fprintf(stderr, - "first pass over file '%s' with parse '%s'\n", - file_name_in, - parse_less); - } - - /* read the first line */ - while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) - { - point = LASPoint_Create(); - if (parse(parse_less, line, xyz, point, &gps_time)) - { - /* init the bounding box */ - VecCopy3dv(xyz_min, xyz); - VecCopy3dv(xyz_max, xyz); - - /* mark that we found the first point */ - number_of_point_records = 1; - - /* create return histogram */ - number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; - - /* we can stop this loop */ - break; - } - else - { - fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", - line, - parse_less); - - } - LASPoint_Destroy(point); - point = NULL; - } - - /* did we manage to parse a line? */ - if (number_of_point_records != 1) - { - fprintf(stderr, "ERROR: could not parse any lines with '%s'\n", - parse_less); - exit(1); - } - - /* loop over the remaining lines */ - while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) - { - point = LASPoint_Create(); - if (parse(parse_less, line, xyz, point, &gps_time)) - { - /* update bounding box */ - VecUpdateMinMax3dv(xyz_min, xyz_max, xyz); - - /* count points */ - number_of_point_records++; - - /* create return histogram */ - number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; - } - else - { - fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", - line, - parse_less); - - } - LASPoint_Destroy(point); - point = NULL; - } - - /* output some stats */ - if (verbose) - { - fprintf(stderr, - "npoints %d min %g %g %g max %g %g %g\n", - number_of_point_records, - xyz_min[0], - xyz_min[1], - xyz_min[2], - xyz_max[0], - xyz_max[1], - xyz_max[2] - ); - fprintf(stderr, - "return histogram %d %d %d %d %d %d %d %d\n", - number_of_points_by_return[0], - number_of_points_by_return[1], - number_of_points_by_return[2], - number_of_points_by_return[3], - number_of_points_by_return[4], - number_of_points_by_return[5], - number_of_points_by_return[6], - number_of_points_by_return[7] - ); - } - - /* close the input file */ - fclose(file_in); - - /* compute bounding box after quantization */ - for (i = 0; i < 3; i++) - { - xyz_min_quant[i] = (int)(0.5 + (xyz_min[i] - xyz_offset[i]) / xyz_scale[i]); - xyz_max_quant[i] = (int)(0.5 + (xyz_max[i] - xyz_offset[i]) / xyz_scale[i]); - } - - for (i = 0; i < 3; i++) - { - xyz_min_dequant[i] = xyz_offset[i] + (xyz_min_quant[i] * xyz_scale[i]); - xyz_max_dequant[i] = xyz_offset[i] + (xyz_max_quant[i] * xyz_scale[i]); - } - - -#define log_xor !=0==! - - /* make sure there is not sign flip */ - for (i = 0; i < 3; i++) - { - if ((xyz_min[i] > 0) log_xor (xyz_min_dequant[i] > 0)) - { - fprintf(stderr, - "WARNING: quantization sign flip for %s min coord %g -> %g. use offset or scale up\n", - (i ? (i == 1 ? "y" : "z") : "x"), - xyz_min[i], - xyz_min_dequant[i] - ); - } - if ((xyz_max[i] > 0) log_xor (xyz_max_dequant[i] > 0)) - { - fprintf(stderr, - "WARNING: quantization sign flip for %s max coord %g -> %g. use offset or scale up\n", - (i ? (i == 1 ? "y" : "z") : "x"), - xyz_max[i], - xyz_max_dequant[i] - ); - } - } - -#undef log_xor - - /* populate the header */ - - header = LASHeader_Create(); - - if (system_identifier) LASHeader_SetSystemId(header, system_identifier); - if (generating_software) LASHeader_SetSoftwareId(header, generating_software); - LASHeader_SetCreationDOY(header, file_creation_day); - LASHeader_SetCreationYear(header, file_creation_year); - - - if (format == LAS_FORMAT_10) { - LASHeader_SetVersionMinor(header, 0); - } else if (format == LAS_FORMAT_11){ - LASHeader_SetVersionMinor(header, 1); - } else if (format == LAS_FORMAT_12) { - LASHeader_SetVersionMinor(header, 2); - } - - if (strstr(parse_string,"t") && (strstr(parse_string, "R") || strstr(parse_string, "G") ||strstr(parse_string, "B") ) ) - { - fprintf(stderr, "Setting point format to 3, overriding version to 1.2 -- RGB + time\n"); - LASHeader_SetDataFormatId(header, 3); - LASHeader_SetVersionMinor(header, 2); - } - else if ((strstr(parse_string, "R") || strstr(parse_string, "G") ||strstr(parse_string, "B") ) ) - { - fprintf(stderr, "Setting point format to 2, overriding version to 1.2 -- RGB\n"); - LASHeader_SetDataFormatId(header, 2); - LASHeader_SetVersionMinor(header, 2); - } - else if (strstr(parse_string,"t")) - { - fprintf(stderr, "Setting point format to 1\n"); - LASHeader_SetDataFormatId(header, 1); - } - - else - { - LASHeader_SetDataFormatId(header, 0); - } - LASHeader_SetPointRecordsCount(header, number_of_point_records); - LASHeader_SetScale(header, xyz_scale[0], xyz_scale[1], xyz_scale[2]); - LASHeader_SetOffset(header, xyz_offset[0], xyz_offset[1], xyz_offset[2]); - LASHeader_SetMin(header, xyz_min_dequant[0], xyz_min_dequant[1], xyz_min_dequant[2]); - LASHeader_SetMax(header, xyz_max_dequant[0], xyz_max_dequant[1], xyz_max_dequant[2]); - LASHeader_SetPointRecordsByReturnCount(header, 0, number_of_points_by_return[1]); - LASHeader_SetPointRecordsByReturnCount(header, 1, number_of_points_by_return[2]); - LASHeader_SetPointRecordsByReturnCount(header, 2, number_of_points_by_return[3]); - LASHeader_SetPointRecordsByReturnCount(header, 3, number_of_points_by_return[4]); - LASHeader_SetPointRecordsByReturnCount(header, 4, number_of_points_by_return[5]); - - - - - /* reopen input file for the second pass */ - file_in = fopen(file_name_in, "r"); - - if (file_in == 0) - { - fprintf(stderr, "ERROR: could not open '%s' for second pass\n",file_name_in); - exit(1); - } - - /* - because the output goes to a file we can do everything in a - single pass and compute the header information along the way - */ - - /* open output file */ - printf("Creating file...\n"); - writer = LASWriter_Create(file_name_out, header, LAS_MODE_WRITE); - if (!writer) { - LASError_Print("Could not open file for write mode "); - exit(1); - } - - if (verbose) { - fprintf(stderr, - "scanning %s with parse '%s' writing to %s\n", - file_name_in , - parse_string, - file_name_out - ); - } - - - /* read the first line */ - while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) - { - point = LASPoint_Create(); - if (parse(parse_string, line, xyz, point, &gps_time)) - { - /* init the bounding box */ - VecCopy3dv(xyz_min, xyz); - VecCopy3dv(xyz_max, xyz); - - /* mark that we found the first point */ - number_of_point_records = 1; - - /* create return histogram */ - number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; - - /* compute the quantized x, y, and z values */ - LASPoint_SetX(point, xyz[0]); - LASPoint_SetY(point, xyz[1]); - LASPoint_SetZ(point, xyz[2]); - - /* write the first point */ - err = LASWriter_WritePoint(writer, point); - if (err) { - LASError_Print("could not write point"); - exit(1); - } - - /* we can stop this loop */ - break; - } - else - { - fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", - line, - parse_string); - } - LASPoint_Destroy(point); - point = NULL; - } - - /* did we manage to parse a line? */ - if (number_of_point_records != 1) - { - fprintf(stderr, "ERROR: could not parse any lines with '%s'\n", - parse_less); - exit(1); - } - - /* loop over the remaining lines */ - while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in)) - { - point = LASPoint_Create(); - if (parse(parse_string, line, xyz, point, &gps_time)) - { - /* update bounding box */ - VecUpdateMinMax3dv(xyz_min, xyz_max, xyz); - - /* count points */ - number_of_point_records++; - - /* create return histogram */ - number_of_points_by_return[LASPoint_GetReturnNumber(point)]++; - - /* compute the quantized x, y, and z values */ - LASPoint_SetX(point, xyz[0]); - LASPoint_SetY(point, xyz[1]); - LASPoint_SetZ(point, xyz[2]); - - /* write the first point */ - err = LASWriter_WritePoint(writer, point); - if (err) { - LASError_Print("could not write point"); - exit(1); - } - - } - else - { - fprintf(stderr, "WARNING: cannot parse '%s' with '%s'. skipping ...\n", - line, - parse_string); - } - LASPoint_Destroy(point); - point = NULL; - } - - - /* close up stuff */ - fclose(file_in); - LASWriter_Destroy(writer); - if (verbose) - { - fprintf(stderr, "done.\n"); - } - - - return 0; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/AUTHORS work/liblas-src-1.2.1/AUTHORS --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/AUTHORS 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/AUTHORS 1970-01-01 08:00:00.000000000 +0800 @@ -1,14 +0,0 @@ -Mateusz Loskot -mateusz at loskot.net - -Howard Butler -hobu.inc at gmail.com - -Martin Vales -mrodriguez at stereocarto.com - -Phillipe Vachon -philippe at cowpig.ca - -Frank Warmerdam -warmerdam at pobox.com \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/ChangeLog work/liblas-src-1.2.1/ChangeLog --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/ChangeLog 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/ChangeLog 1970-01-01 08:00:00.000000000 +0800 @@ -1,1100 +0,0 @@ -2009-03-25 16:58 hobu - - * trunk/nmake.opt: tweak some comments - -2009-03-25 16:52 hobu - - * trunk/configure.ac: name our dist target to liblas-src and ensure - that the .bz2 file is made with 'make dist' - -2009-03-25 11:22 mloskot - - * trunk: Updated svn:ignore property. - -2009-03-25 11:21 mloskot - - * trunk/build/msvc90, trunk/build/msvc90/las2las, - trunk/build/msvc90/las2txt, trunk/build/msvc90/lasdiff, - trunk/build/msvc90/lasinfo, trunk/build/msvc90/lasmerge, - trunk/build/msvc90/liblas_c_dll, trunk/build/msvc90/liblas_lib, - trunk/build/msvc90/liblas_test, trunk/build/msvc90/txt2las: Updated - svn:ignore property. - -2009-03-25 11:14 mloskot - - * trunk/apps/makefile.vc, trunk/nmake.opt: nmake.opt: Added support of - EXT_NMAKE_OPT for building libLAS with NMAKE (Ticket #117). - Improved detection of GDAL_HOME and GEOTIFF_HOME - check if - directories exist. Added auto-magical determination of version of - Visual C++ compiler based on NMAKE version (see WARNING in - NMAKE). - -2009-03-25 09:56 mloskot - - * trunk/nmake.opt: Fixed LF to CRLF in nmake.opt. - -2009-03-25 09:43 mloskot - - * trunk/src: Updated svn:ignore property for src. - -2009-03-23 09:47 mloskot - - * trunk/build/msvc90/liblas_lib/liblas_lib.vcproj: build/msvc90: - updated project files after renaming classes LASSRS and LASVLR." - -2009-03-22 20:13 hobu - - * trunk/include/liblas/lascolor.hpp, trunk/src/lascolor.cpp: fix #116, - LASColor has no == operation - -2009-03-22 20:12 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: Fix - #115, add Get/SetPointSourceId to C API - -2009-03-20 21:16 mloskot - - * trunk/src/makefile.vc: Renamed class LASVLR to LASVariableRecord in - src/makefile.vc (Ticket #114). - -2009-03-20 20:59 mloskot - - * trunk/src/Makefile.am: Renamed class LASVLR to LASVariableRecord in - src/Makefile.am (Ticket 14). The C API has not been touched. - -2009-03-20 20:55 mloskot - - * trunk/build/msvc80/liblas_dll/liblas_dll.vcproj, - trunk/build/msvc80/liblas_lib/liblas_lib.vcproj, - trunk/build/msvc80/liblas_test/liblas_test.vcproj, - trunk/build/msvc90/liblas_dll/liblas_dll.vcproj, - trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, - trunk/build/msvc90/liblas_test/liblas_test.vcproj, - trunk/include/Makefile.am, trunk/include/liblas/lasheader.hpp, - trunk/include/liblas/lasreader.hpp, - trunk/include/liblas/lasrecordheader.hpp, - trunk/include/liblas/lasspatialreference.hpp, - trunk/include/liblas/lasvariablerecord.hpp, trunk/src/CMakeLists.txt, - trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp, - trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, - trunk/src/detail/writer.cpp, trunk/src/las_c_api.cpp, - trunk/src/lasheader.cpp, trunk/src/lasrecordheader.cpp, - trunk/src/lasspatialreference.cpp, trunk/src/lasvariablerecord.cpp, - trunk/test/unit/CMakeLists.txt, trunk/test/unit/Makefile.am, - trunk/test/unit/lasrecordheader_test.cpp, - trunk/test/unit/lasvariablerecord_test.cpp: Renamed class LASVLR to - LASVariableRecord (Ticket #114). The C API has not been touched. - -2009-03-20 20:42 mloskot - - * trunk/test/unit/Makefile.am: Renamed class LASSRS to - LASSpatialReference in test/unit/Makefile.am (Ticket #113). - -2009-03-20 20:35 mloskot - - * trunk/build/msvc80/liblas_lib/liblas_lib.vcproj, - trunk/build/msvc80/liblas_test/liblas_test.vcproj, - trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, - trunk/include/Makefile.am, trunk/include/liblas/detail/fwd.hpp, - trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/detail/writer.hpp, - trunk/include/liblas/lasheader.hpp, - trunk/include/liblas/lasreader.hpp, - trunk/include/liblas/lasspatialreference.hpp, - trunk/include/liblas/lassrs.hpp, trunk/include/liblas/laswriter.hpp, - trunk/src/CMakeLists.txt, trunk/src/Makefile.am, - trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp, - trunk/src/las_c_api.cpp, trunk/src/lasheader.cpp, - trunk/src/lasreader.cpp, trunk/src/lasspatialreference.cpp, - trunk/src/lassrs.cpp, trunk/src/laswriter.cpp, trunk/src/makefile.vc, - trunk/test/unit/lasheader_test.cpp, - trunk/test/unit/lasspatialreference_test.cpp, - trunk/test/unit/lassrs_test.cpp: Renamed class LASSRS to - LASSpatialReference (Ticket #113). The C API has not been - touched. - -2009-03-20 18:02 hobu - - * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, - trunk/nmake.opt, trunk/python/setup.py: increment versions in prep - for 1.2.0b3 - -2009-03-20 17:19 hobu - - * trunk/python/tests/Header.txt: try to fix date test again - -2009-03-20 16:59 hobu - - * trunk/python/tests/SRS.txt, trunk/python/tests/VLR.txt: Guards for - when we have no HAVE_LIBGEOTIFF - -2009-03-20 16:59 hobu - - * trunk/python/tests/File.txt: Make sure that void functions return - None for ctype or we'll get unexpected jtrunk back - -2009-03-20 16:57 hobu - - * trunk/python/liblas/core.py: Make sure that void functions return - None for ctype or we'll get unexpected jtrunk back - -2009-03-20 16:50 hobu - - * trunk/python/liblas/core.py: don't know where LASReader_Destroy - went - -2009-03-20 16:25 hobu - - * trunk/src/las_c_api.cpp: We use #ifdef _WIN32 instead of #ifdef - WIN32 for strncasecmp - -2009-03-20 01:31 mloskot - - * trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/lasreader.hpp, trunk/src/detail/reader.cpp, - trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp, - trunk/src/detail/reader12.cpp, trunk/src/lasreader.cpp: Fixed - weakness of MakePIMPL by reverting changes applied as r984 and - bringing m_pimpl back to constness. There is no need to re-create - internal reader object and reassign it to m_pimpl, because reader - state can be correctly reset by simple call of LASReader::Init. - This fix is also related to Ticket #85. All 87 test cases pass. - -2009-03-20 01:27 mloskot - - * trunk/test/unit/lasreader_iterator_test.cpp: Fixed LF. - -2009-03-20 00:45 mloskot - - * trunk/build/msvc80/liblas_lib/liblas_lib.vcproj, - trunk/build/msvc80/liblas_test/liblas_test.vcproj: Updated - build/msvc80 adding new files. Use $(SolutionDir) macro in unit - test runner, instead of relative path. - -2009-03-20 00:44 mloskot - - * trunk/test/unit/liblas_test_suite.cpp: Cleanup - -2009-03-20 00:35 mloskot - - * trunk/test/unit/lasreader_iterator_test.cpp: Fixed missing reset - operation on reader when re-using it with iterators (#85). - -2009-03-20 00:31 mloskot - - * trunk/src/lasreader.cpp: Fixed but with incompletely re-initialized - LASReader after reset. The MakePIMPL idea is weak. - -2009-03-19 22:34 hobu - - * trunk/python/liblas/core.py, trunk/python/tests/File.txt: beef up - test for _Destroy being called twice - -2009-03-19 22:11 hobu - - * trunk/src/las_c_api.cpp: strncasecmp doesn't exist on windows - -2009-03-19 18:16 hobu - - * trunk/src/las_c_api.cpp: fix #112, rename VALIDATE_POINTER0 and - VALIDATE_POINTER1 - -2009-03-19 04:20 hobu - - * trunk/include/liblas/lasheader.hpp, trunk/python/liblas/file.py, - trunk/python/tests/File.txt, trunk/src/las_c_api.cpp, - trunk/src/lasheader.cpp: stop tracking open readers/writers in - order to allow multiple readers to operate on a file #111 - -2009-03-18 03:40 hobu - - * trunk/include/liblas/detail/writer.hpp: dummy struct for when we - don't have GDAL - -2009-03-17 17:30 hobu - - * trunk/apps/las2txt.c: fix #109, las2txt doesn't output RGB - -2009-03-17 17:24 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: fix - #110, LASSRS VLR methods for C API - -2009-03-17 17:19 hobu - - * trunk/python/liblas/core.py, trunk/python/liblas/srs.py, - trunk/python/tests/SRS.txt: Add VLR methods to srs object - -2009-03-17 17:12 hobu - - * trunk/src/detail/writer.cpp: oops #108 - -2009-03-17 16:58 hobu - - * trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/detail/writer.hpp, trunk/python/tests/SRS.txt, - trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp: Fix #108, - LASWriter::SetSRS and LASReader::SetSRS don't work - -2009-03-17 16:56 hobu - - * trunk/python/liblas/file.py: clean up __del__ a bit when core is - already deleted - -2009-03-17 16:55 hobu - - * trunk/python/liblas/point.py: complete #106, add descale/scale - convenience methods to liblas.point - -2009-03-17 04:15 hobu - - * trunk/src/lassrs.cpp: clean up a bit - -2009-03-17 04:05 hobu - - * trunk/include/liblas/capi/liblas.h, - trunk/include/liblas/detail/reader.hpp, trunk/python/liblas/core.py, - trunk/python/liblas/file.py, trunk/python/tests/SRS.txt, - trunk/src/detail/reader.cpp, trunk/src/las_c_api.cpp, - trunk/src/lassrs.cpp: start fixing LASReader/LASWriter SetSRS - methods - -2009-03-16 14:57 hobu - - * trunk/test/unit/Makefile.am, trunk/test/unit/common.cpp, - trunk/test/unit/lasheader_test.cpp, - trunk/test/unit/laspoint_test.cpp, trunk/test/unit/lassrs_test.cpp: - making mloskot proud by adding to the tests - -2009-03-13 17:35 hobu - - * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, - trunk/nmake.opt, trunk/python/setup.py: increment versions to 1.2.0b2 - in preparation for release - -2009-03-13 17:34 hobu - - * trunk/apps/makefile.vc: link GEOTIFF_LIB to everything because we - do GTIFPrint when available now. - -2009-03-13 04:35 hobu - - * trunk/configure.ac: try again on r1098 - -2009-03-13 04:30 hobu - - * trunk/configure.ac: try again on r1097 - -2009-03-13 04:04 hobu - - * trunk/configure.ac: don't overwrite GEOTIFF_INC in the GDAL source - tree case with the wrong stuff - -2009-03-12 19:53 hobu - - * trunk/apps/las2las.c: default to writing 1.2 files for las2las, can - be overriden with --format - -2009-03-12 19:53 hobu - - * trunk/apps/txt2las.c: clean up logic for RGB parsing, support - setting the format - -2009-03-12 19:40 hobu - - * trunk/apps/txt2las.c: support setting RGB colors in txt2las #103 - -2009-03-12 17:40 hobu - - * trunk/src/laspoint.cpp: fix #104, copy the LASColor in copy and - assignment constructors of LASPoint - -2009-03-12 02:34 hobu - - * trunk/configure.ac: attempt to fix #100 by pulling in libtiff's - header location - -2009-03-10 20:17 hobu - - * trunk/apps/lascommon.c, trunk/include/liblas/lassrs.hpp, - trunk/src/las_c_api.cpp, trunk/src/lassrs.cpp: there is no such thing - as a TIFF*, clean up cases for when we don't have libgeotiff - -2009-03-09 18:07 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/include/liblas/lassrs.hpp, - trunk/src/las_c_api.cpp, trunk/src/lassrs.cpp: fix #102, add - LASSRS::SetGTIFF - -2009-03-08 20:11 hobu - - * trunk/src/las_c_api.cpp: make sure to only free things that exist - -2009-03-08 20:10 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: fix - #101, LASString_Free - -2009-03-08 20:05 hobu - - * trunk/include/liblas/capi/liblas.h: oops, missing LASSRS_Destroy - -2009-03-08 14:37 hobu - - * trunk/apps/lascommon.c: silence const warning - -2009-03-08 13:34 hobu - - * trunk/apps/lascommon.c: const qualifier for GTIF* - -2009-03-07 19:24 hobu - - * trunk/src/lassrs.cpp, trunk/test/data/1.0_0.las, - trunk/test/data/1.0_1.las, trunk/test/data/1.1_0.las, - trunk/test/data/1.1_1.las, trunk/test/data/1.2_0.las, - trunk/test/data/1.2_1.las, trunk/test/data/1.2_2.las, - trunk/test/data/1.2_3.las: oops we were dumb with ASCII records - -2009-03-07 18:43 hobu - - * trunk/apps/lascommon.c: use GTIFPrint if we can to print geotiff - info - -2009-03-07 18:39 hobu - - * trunk/src/lassrs.cpp: return an empty string if we have nothing - -2009-03-04 19:36 hobu - - * trunk/test/data/make_data.py: add number_of_points parameter - -2009-02-26 02:13 hobu - - * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, - trunk/nmake.opt, trunk/python/setup.py: increment versions in - preparation for 1.2.0b1 - -2009-02-26 02:10 hobu - - * trunk/include/Makefile.am: add 1.2-related headers to dist target - -2009-02-26 00:53 mloskot - - * trunk/include/liblas/detail/reader12.hpp, - trunk/include/liblas/detail/writer12.hpp, - trunk/include/liblas/lascolor.hpp, trunk/src/detail/reader12.cpp, - trunk/src/detail/writer12.cpp: Little refactoring and cleanup, no - fixes applied. - -2009-02-26 00:36 mloskot - - * trunk/include/liblas/lascolor.hpp, trunk/src/lascolor.cpp: Fixed LAS - version and copyright notice and updated doxygen doc in - lascolor.{hpp|cpp} - -2009-02-26 00:24 mloskot - - * trunk/include/liblas/detail/reader12.hpp, - trunk/include/liblas/detail/writer12.hpp, - trunk/src/detail/reader12.cpp, trunk/src/detail/writer12.cpp: Fixed - LAS version and copyright notice in {reader12|writer12}.{hpp|cpp} - -2009-02-25 23:57 mloskot - - * trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp, - trunk/src/lassrs.cpp: Use Zero as nullptr value instead of - 'almost-deprecated' NULL macro. - -2009-02-25 23:51 mloskot - - * trunk/include/liblas/lassrs.hpp, trunk/src/lassrs.cpp: Little - refactoring of LASRSR class. - -2009-02-25 13:02 mloskot - - * trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, - trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp, - trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: * Updated project - files for Visual C++ 2008. - * Cleaned up some warnings. - -2009-02-25 05:41 hobu - - * trunk/src/lassrs.cpp: Fix #98, LASSRS not compiling without geotiff - or GDAL - -2009-02-25 05:34 hobu - - * trunk/nmake.opt: support building against a GDAL source tree - -2009-02-25 05:33 hobu - - * trunk/src/detail/writer.cpp, trunk/src/lassrs.cpp: clean up some - warnings, add a FIXME for projecting while writing PointRecord, - which needs to be descaled - -2009-02-24 04:33 hobu - - * trunk/makefile.vc, trunk/src/makefile.vc: w00t! windows building. - -2009-02-23 23:52 hobu - - * trunk/configure.ac: support building against a GDAL source tree - -2009-02-23 20:04 hobu - - * trunk/configure.ac: add configure logic to use gdal source tree -- - not quite done yet - -2009-02-21 03:11 hobu - - * trunk/include/liblas/lassrs.hpp, trunk/python/tests/Header.txt, - trunk/python/tests/SRS.txt, trunk/src/las_c_api.cpp, - trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: make ResetVLRs - private, clean up SetGeoreference - -2009-02-21 03:11 hobu - - * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, - trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, - trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, - trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, - trunk/test/data/make_data.py: latest version of test data with srs - and guids - -2009-02-21 03:06 hobu - - * trunk/test/data/make_data.py: use a srs object now that - header.proj4 is gone - -2009-02-21 02:52 hobu - - * trunk/python/liblas/header.py, trunk/python/tests/File.txt, - trunk/python/tests/Header.txt, trunk/python/tests/VLR.txt: fix up - tests - -2009-02-20 22:54 hobu - - * trunk/src/lassrs.cpp: oops, we're broken right now - -2009-02-20 22:44 hobu - - * trunk/apps/lascommon.c, trunk/include/liblas/capi/liblas.h, - trunk/include/liblas/lasheader.hpp, trunk/python/liblas/core.py, - trunk/python/liblas/header.py, trunk/python/tests/Header.txt, - trunk/src/detail/reader.cpp, trunk/src/las_c_api.cpp, - trunk/src/lasheader.cpp: remove LASHeader::[G|S]etProj4 #97 - -2009-02-20 22:36 hobu - - * trunk/python/tests/Header.txt, trunk/python/tests/VLR.txt: update - python tests to reflect current oprations - -2009-02-20 21:49 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/include/liblas/liblas.hpp, - trunk/python/liblas/__init__.py, trunk/python/liblas/core.py, - trunk/python/tests/VLR.txt, trunk/src/las_c_api.cpp: add the ability - to check for HAVE_GDAL and HAVE_LIBGEOTIFF at runtime - -2009-02-20 19:42 hobu - - * trunk/src/lassrs.cpp: we should fetch the m_gtiff on Set* methods - to create it - -2009-02-20 19:14 hobu - - * trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/detail/writer.hpp, - trunk/include/liblas/lasreader.hpp, - trunk/include/liblas/laswriter.hpp, trunk/src/detail/reader.cpp, - trunk/src/detail/writer.cpp, trunk/src/lasreader.cpp, - trunk/src/laswriter.cpp: add the ability to have Reader/Writer - project on the way out #93 - -2009-02-20 05:43 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/python/liblas/__init__.py, - trunk/python/liblas/core.py, trunk/python/liblas/header.py, - trunk/python/liblas/srs.py, trunk/python/tests/Header.txt, - trunk/python/tests/SRS.txt, trunk/src/las_c_api.cpp: start on Python - API for SRS - -2009-02-20 04:19 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/include/liblas/lassrs.hpp, - trunk/src/las_c_api.cpp, trunk/src/lassrs.cpp: C API for LASSRS - -2009-02-19 19:34 hobu - - * trunk/include/liblas/lassrs.hpp, trunk/src/Makefile.am, - trunk/src/gt_wkt_srs.cpp, trunk/src/lassrs.cpp: move the GDAL code - into its own file so it can easily be swapped in and out - -2009-02-19 19:20 hobu - - * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, - trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, - trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, - trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, - trunk/test/data/make_data.py: use correct SRS description and - points for the test data - -2009-02-19 19:08 hobu - - * trunk/apps/lascommon.c: don't leak a LASColorH - -2009-02-19 19:04 hobu - - * trunk/apps/lascommon.c: don't leak a LASColorH - -2009-02-19 19:02 hobu - - * trunk/src/lassrs.cpp: don't leak, better error checking - -2009-02-19 05:27 hobu - - * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, - trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, - trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, - trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, - trunk/test/data/make_data.py: make files more rigorous - -2009-02-19 04:17 hobu - - * trunk/src/lasheader.cpp, trunk/src/lassrs.cpp, - trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, - trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, - trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, - trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las: fix up SRS - handling of ASCII keys. libgeotiff's simple keys stuff was at - fault - -2009-02-18 15:29 hobu - - * trunk/src/detail/reader.cpp, trunk/src/lasheader.cpp, - trunk/src/lassrs.cpp, trunk/test/data/1.0_0.las, - trunk/test/data/1.0_1.las, trunk/test/data/1.1_0.las, - trunk/test/data/1.1_1.las, trunk/test/data/1.2_0.las, - trunk/test/data/1.2_1.las, trunk/test/data/1.2_2.las, - trunk/test/data/1.2_3.las, trunk/test/data/make_data.py: a bunch of - debugging lint to fix not supporting geotiff ASCII records - -2009-02-17 22:35 hobu - - * trunk/test/data/1.0_0.las, trunk/test/data/1.0_1.las, - trunk/test/data/1.1_0.las, trunk/test/data/1.1_1.las, - trunk/test/data/1.2_0.las, trunk/test/data/1.2_1.las, - trunk/test/data/1.2_2.las, trunk/test/data/1.2_3.las, - trunk/test/data/make_data.py: add test data array - -2009-02-17 21:00 hobu - - * trunk/python/tests/Header.txt: update test for 1.2 being default - -2009-02-17 21:00 hobu - - * trunk/src/lassrs.cpp: support libgeotiff-only setting of proj4 - -2009-02-17 20:26 hobu - - * trunk/configure.ac: apply Doug's patch for #66 - -2009-02-17 19:19 hobu - - * trunk/include/liblas/lassrs.hpp, trunk/src/lassrs.cpp: allow building - without libgeotiff or GDAL - -2009-02-17 18:55 hobu - - * trunk/test/unit/common.cpp, trunk/test/unit/laswriter_test.cpp: - update tests to reflect that 1.2 is now the default version - -2009-02-17 18:48 hobu - - * trunk/test/data/make_data.py: add make_data script - -2009-02-17 17:57 hobu - - * trunk/include/liblas/lassrs.hpp: docs for LASSRS - -2009-02-17 17:56 hobu - - * trunk/src/lassrs.cpp: remember to clear the vlrs when doing a Reset - -2009-02-17 07:02 hobu - - * trunk/python/liblas/color.py, trunk/python/liblas/header.py, - trunk/src/lasheader.cpp: default to using 1.2 for LASHeader and fix - SetVersionMinor interaction with the data offset that likely - prevented us from ever correctly writing 1.0 data - -2009-02-17 05:21 hobu - - * trunk/include/liblas/lassrs.hpp: don't include private geotiff - stuff - -2009-02-17 04:49 hobu - - * trunk/CMakeLists.txt, trunk/src/CMakeLists.txt: update cmake a bit. - We need to be able to set GDAL though - -2009-02-17 04:13 hobu - - * trunk/python/tests/VLR.txt, trunk/src/detail/reader.cpp, - trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: fix up so tests can - pass - -2009-02-17 02:51 hobu - - * trunk/test/unit/Makefile.am: add geotiff and gdal info to test - automake stuff - -2009-02-17 02:40 hobu - - * trunk/configure.ac: fix #96, check for ST_Create in libgeotiff - instead of XTIFFClientOpen - -2009-02-17 02:33 hobu - - * trunk/include/Makefile.am: fix #95, nobase option for include files - -2009-02-17 02:32 hobu - - * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, - trunk/nmake.opt, trunk/python/setup.py: increment versions to 1.2 - which is where we will be at the next release - -2009-02-16 20:34 hobu - - * trunk/include/liblas/lassrs.hpp, trunk/src/lasheader.cpp, - trunk/src/lassrs.cpp: oh, it seems to work now :) - -2009-02-16 18:50 hobu - - * trunk/include/liblas/lasheader.hpp, trunk/include/liblas/lassrs.hpp, - trunk/src/lasheader.cpp, trunk/src/lassrs.cpp: more updates to - LASSRS. Still broken, but improving :) - -2009-02-16 05:40 hobu - - * trunk/include/liblas/detail/utility.hpp, - trunk/include/liblas/lassrs.hpp, trunk/src/detail/reader.cpp, - trunk/src/lassrs.cpp: some improvement on srs stuff - -2009-02-16 04:19 hobu - - * trunk/include/liblas/detail/utility.hpp, - trunk/include/liblas/lasheader.hpp, trunk/include/liblas/lassrs.hpp, - trunk/src/detail/reader.cpp, trunk/src/lasheader.cpp, - trunk/src/lassrs.cpp: more SRS stuff, quite broken right now unless - you link GDAL in - -2009-02-14 03:07 hobu - - * trunk/Makefile.am, trunk/apps/Makefile.am, trunk/include/Makefile.am, - trunk/include/liblas/lassrs.hpp: more LASSRS stuff - -2009-02-14 02:47 hobu - - * trunk/src/lassrs.cpp: more LASSRS stuff, pull in GDAL's code - -2009-02-13 03:12 hobu - - * trunk/include/liblas/detail/fwd.hpp, - trunk/include/liblas/lasheader.hpp, trunk/include/liblas/lassrs.hpp, - trunk/src/Makefile.am, trunk/src/lassrs.cpp: LASSRS skeleton - -2009-02-12 04:23 hobu - - * trunk/src/Makefile.am: GDAL define support for src/ - -2009-02-11 19:31 hobu - - * trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/detail/reader10.hpp, - trunk/include/liblas/detail/reader11.hpp, - trunk/include/liblas/detail/reader12.hpp, - trunk/include/liblas/detail/writer.hpp, - trunk/include/liblas/detail/writer10.hpp, - trunk/include/liblas/detail/writer11.hpp, - trunk/include/liblas/detail/writer12.hpp, - trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp, - trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, - trunk/src/detail/writer.cpp, trunk/src/detail/writer10.cpp, - trunk/src/detail/writer11.cpp, trunk/src/detail/writer12.cpp: - reorganize reader and writer Impl to put redundant VLR-related - operations in the Reader:: and Writer:: abstract classes instead - of each Impl - -2009-02-11 19:18 hobu - - * trunk/apps/lascommon.c, trunk/include/liblas/capi/liblas.h: report - min/max colors as part of a summary - -2009-02-11 15:55 hobu - - * trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/detail/reader10.hpp, - trunk/include/liblas/detail/reader11.hpp, - trunk/include/liblas/detail/reader12.hpp, - trunk/include/liblas/detail/writer.hpp, trunk/src/detail/reader.cpp, - trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp, - trunk/src/detail/reader12.cpp: remove redundant GetStream and move - istream into abstract Reader:: class - -2009-02-11 15:49 hobu - - * trunk/include/liblas/detail/writer.hpp, - trunk/include/liblas/detail/writer10.hpp, - trunk/include/liblas/detail/writer11.hpp, - trunk/include/liblas/detail/writer12.hpp, - trunk/src/detail/writer.cpp, trunk/src/detail/writer10.cpp, - trunk/src/detail/writer11.cpp, trunk/src/detail/writer12.cpp: remove - redundant GetStream and move ostream into abstract Writer:: class - -2009-02-11 04:34 hobu - - * trunk/apps/las2las.c: allow las2las to write 1.2 format - -2009-02-11 04:33 hobu - - * trunk/src/detail/writer.cpp, trunk/src/detail/writer12.cpp, - trunk/src/laswriter.cpp: actually support writing 1.2 now that - coding is done - -2009-02-11 04:24 hobu - - * trunk/include/liblas/detail/writer.hpp, trunk/src/detail/writer.cpp, - trunk/src/detail/writer10.cpp, trunk/src/detail/writer11.cpp, - trunk/src/detail/writer12.cpp: we have to descale the points as we - write them - -2009-02-11 03:56 hobu - - * trunk/include/liblas/detail/writer.hpp, - trunk/include/liblas/detail/writer10.hpp, - trunk/include/liblas/detail/writer11.hpp, - trunk/include/liblas/detail/writer12.hpp, - trunk/src/detail/reader12.cpp, trunk/src/detail/writer.cpp, - trunk/src/detail/writer10.cpp, trunk/src/detail/writer11.cpp, - trunk/src/detail/writer12.cpp, trunk/src/laswriter.cpp: 1.2 LASWriter - support - -2009-02-10 20:46 hobu - - * trunk/include/liblas/capi/liblas.h, trunk/python/liblas/color.py, - trunk/python/liblas/core.py, trunk/python/liblas/point.py, - trunk/python/tests/Point.txt, trunk/src/las_c_api.cpp: color - implementation for C API and Python API - -2009-02-10 20:15 hobu - - * trunk/include/liblas/detail/fwd.hpp, - trunk/include/liblas/detail/utility.hpp, - trunk/include/liblas/lascolor.hpp, trunk/include/liblas/laspoint.hpp, - trunk/include/liblas/lasreader.hpp, trunk/src/Makefile.am, - trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp, - trunk/src/detail/reader12.cpp, trunk/src/lascolor.cpp, - trunk/src/laspoint.cpp: rework to use public LASColor class, 1.2 - reading now works - -2009-02-10 16:26 hobu - - * trunk/src/detail/reader10.cpp, trunk/src/detail/reader12.cpp, - trunk/src/lasreader.cpp: clean up commented out code - -2009-02-10 15:54 hobu - - * trunk/include/liblas/detail/reader.hpp: make FillPoint protected - instead of public - -2009-02-10 03:34 hobu - - * trunk/include/liblas/detail/fwd.hpp, - trunk/include/liblas/detail/reader.hpp, - trunk/include/liblas/detail/reader10.hpp, - trunk/include/liblas/detail/reader11.hpp, - trunk/include/liblas/detail/reader12.hpp, - trunk/include/liblas/detail/utility.hpp, - trunk/include/liblas/laspoint.hpp, - trunk/include/liblas/lasreader.hpp, trunk/python/tests/File.txt, - trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp, - trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, - trunk/src/laspoint.cpp, trunk/src/lasreader.cpp: reorganize - LASReader. Tests (cppUnit and Python) all still pass - -2009-02-09 01:47 hobu - - * trunk/include/liblas/detail/reader12.hpp, - trunk/include/liblas/detail/writer12.hpp, - trunk/include/liblas/lasheader.hpp, trunk/include/liblas/liblas.hpp, - trunk/src/Makefile.am, trunk/src/detail/reader.cpp, - trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp, - trunk/src/detail/writer12.cpp, trunk/src/lasheader.cpp, - trunk/src/laspoint.cpp, trunk/src/lasreader.cpp: start in on 1.2 read - support. Tests pass, but 1.2 reading is not working yet - -2009-02-06 03:01 hobu - - * trunk/python/liblas/__init__.py, trunk/python/liblas/core.py: re-fix - #89 liblas.version - -2009-02-05 02:59 hobu - - * trunk/include/liblas/laspoint.hpp: add Red, Green, and Blue to - LASPoint for 1.2 support #91 - -2009-02-05 02:48 hobu - - * trunk/include/liblas/lasheader.hpp, - trunk/test/unit/lasheader_test.cpp: increment max VersionMinor to 2 - for 1.2 support #91 - -2009-02-05 02:43 hobu - - * trunk/include/liblas/lasheader.hpp: increment the point formats and - point sizes for LAS 1.2 #91 - -2009-02-04 03:31 hobu - - * trunk/README: add a link to the 1.2 specification - -2009-02-04 03:26 hobu - - * trunk/build/xcode, trunk/build/xcode/xcode.xcodeproj/hobu.mode1v3, - trunk/build/xcode/xcode.xcodeproj/hobu.pbxuser, - trunk/build/xcode/xcode.xcodeproj/project.pbxproj: xcode projects - -2009-02-03 16:08 mloskot - - * trunk/include/liblas/laspoint.hpp, - trunk/include/liblas/lasreader.hpp: * Documented libLAS-specific - elements of LASPoint class (no need to repeat LAS specification). - -2009-02-03 15:40 mloskot - - * trunk/build/msvc90/liblas.sln, trunk/include/liblas/laspoint.hpp, - trunk/src/detail/reader11.cpp, trunk/test/unit/laswriter_test.cpp: * - Updated LASWriter test with checks of get/set methods for Point - Source ID attribute. - * Removed unused from laspoint.hpp. - * Include missing in reader11.cpp, std::cerr object is - used. - * build/msvc90 project updated. - -2009-02-03 15:21 hobu - - * trunk/include/liblas/lasreader.hpp, trunk/src/lasreader.cpp: fix up - creation of a local m_pimpl that was masking the LASReader's - -2009-02-03 14:59 mloskot - - * trunk/include/liblas/detail/utility.hpp, - trunk/include/liblas/laspoint.hpp, trunk/src/laspoint.cpp, - trunk/src/lasreader.cpp, trunk/src/laswriter.cpp, - trunk/test/unit/common.cpp: Fixed #87 - implemented support for - reading/writing "Point Source ID" - attribute of point record - defined in LAS 1.0. - The new LASPoint accessors operating on Point Source ID play dual - role, for LAS 1.0 they get/set User Bit Field but for LAS 1.1 - - Point Source ID. - -2009-02-03 14:50 mloskot - - * trunk/test/sample/utility.hpp: Added print_point() function to - sample/utility.hpp header. - -2009-02-03 14:48 mloskot - - * trunk/build/msvc90: Updated svn:ignore property for build/msvc90. - -2009-02-03 05:32 hobu - - * trunk/include/liblas/lasreader.hpp, trunk/src/lasreader.cpp: an - attempt at a Reset() and IsEOF() functions #85 - -2009-01-01 02:56 hobu - - * trunk/build/xcode, trunk/build/xcode/xcode.xcodeproj, - trunk/build/xcode/xcode.xcodeproj/hobu.mode1v3, - trunk/build/xcode/xcode.xcodeproj/hobu.pbxuser, - trunk/build/xcode/xcode.xcodeproj/project.pbxproj: add xcode - project - -2008-12-31 04:50 hobu - - * trunk/apps: ignore liblas-config - -2008-12-26 05:39 hobu - - * trunk/apps/las2txt.c: add index parse option to las2txt #86 - -2008-12-26 05:31 hobu - - * trunk/test/unit/lasreader_iterator_test.cpp: fix test to use - qualified type names - -2008-12-26 05:21 hobu - - * trunk/configure.ac, trunk/include/liblas/capi/las_version.h, - trunk/python/setup.py: bump minor version so we're now 1.1 in trtrunk - -2008-12-26 05:21 hobu - - * trunk/nmake.opt: change to *nix line ending mode - -2008-12-26 05:16 hobu - - * trunk/apps/Makefile.am, trunk/apps/liblas-config.in, - trunk/configure.ac: add a liblas-config script #88 - -2008-12-26 04:00 hobu - - * trunk/python/liblas/core.py: no lint - -2008-12-26 03:59 hobu - - * trunk/python/liblas/core.py: make sure to free heap allocated - strings that were given to us by the C API - -2008-12-25 05:38 hobu - - * trunk/python/liblas/core.py: fix #89, broken liblas.version - -2008-12-15 15:12 mloskot - - * trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp: Unified - type of count value passed to ST_SetKey/ST_GetKey of libgeotiff - API - -2008-12-10 16:05 mloskot - - * trunk/build/msvc90, trunk/build/msvc90/clean.bat, - trunk/build/msvc90/las2las, - trunk/build/msvc90/las2las/las2las.vcproj, - trunk/build/msvc90/las2ogr, - trunk/build/msvc90/las2ogr/las2ogr.vcproj, - trunk/build/msvc90/las2ogr/las2ogr.vsprops, - trunk/build/msvc90/las2txt, - trunk/build/msvc90/las2txt/las2txt.vcproj, - trunk/build/msvc90/lasdiff, - trunk/build/msvc90/lasdiff/lasdiff.vcproj, - trunk/build/msvc90/lasinfo, - trunk/build/msvc90/lasinfo/lasinfo.vcproj, - trunk/build/msvc90/lasmerge, - trunk/build/msvc90/lasmerge/lasmerge.vcproj, - trunk/build/msvc90/liblas.sln, trunk/build/msvc90/liblas.vsprops, - trunk/build/msvc90/liblas_c_dll, - trunk/build/msvc90/liblas_c_dll/liblas_c_dll.vcproj, - trunk/build/msvc90/liblas_dll, - trunk/build/msvc90/liblas_dll/liblas_dll.vcproj, - trunk/build/msvc90/liblas_lib, - trunk/build/msvc90/liblas_lib/liblas_lib.vcproj, - trunk/build/msvc90/liblas_test, - trunk/build/msvc90/liblas_test/liblas_test.vcproj, - trunk/build/msvc90/txt2las, - trunk/build/msvc90/txt2las/txt2las.vcproj: Added solution & - projects for Visual Studio 9.0 - -2008-11-13 22:02 hobu - - * trunk/README: dummy - -2008-11-13 21:59 hobu - - * trunk/README: dummy - -2008-11-13 21:58 hobu - - * trunk/README: dummy - -2008-11-13 21:50 hobu - - * trunk/README: point to new maillist - -2008-11-09 12:41 mloskot - - * trunk/test/unit/lasreader_iterator_test.cpp: - lasreader_iterator_test.cpp: refactored to remove redundant code - and reuse common test group data. - -2008-11-06 16:18 mloskot - - * trunk/test/unit/common.hpp, - trunk/test/unit/lasreader_iterator_test.cpp: - lasreader_iterator_test.cpp: added test cases for number of - standard algorithms: copy, count, equal, find, find_if, for_each. - -2008-11-06 15:51 mloskot - - * trunk/test/unit/common.hpp: test/unit/common.hpp: Added is_xy - predicated and bbox_calculator functor, both used in unit tests. - -2008-11-06 15:48 mloskot - - * trunk/src/laspoint.cpp: liblas::LASPoint: fixed incorrect - logical-or where logical-and is expected (Ticket #84). - -2008-11-06 15:42 mloskot - - * trunk/include/liblas/detail/utility.hpp: liblas::detail::Point: - improved equal-to operation for Point class. - -2008-11-05 20:41 mloskot - - * trunk/build/msvc80/liblas_test/liblas_test.vcproj: Updated Visual - C++ project file liblas_test.vcproj. - -2008-11-05 20:38 mloskot - - * trunk/test/unit/CMakeLists.txt, trunk/test/unit/Makefile.am, - trunk/test/unit/lasreader_iterator_test.cpp: Added unit test of - liblas::lasreader_iterator class. - -2008-11-05 20:33 mloskot - - * trunk/test/unit/common.cpp, trunk/test/unit/common.hpp, - trunk/test/unit/lasreader_test.cpp: Move common test routines from - lasreader_test.cpp to common.hpp|.cpp - -2008-11-05 19:17 mloskot - - * trunk/README: REAME: reordered utilities - -2008-10-30 08:35 mloskot - - * trunk/include/liblas/capi/liblas.h, - trunk/include/liblas/lasheader.hpp, - trunk/include/liblas/laspoint.hpp, - trunk/include/liblas/lasreader.hpp, - trunk/include/liblas/laswriter.hpp, trunk/src/lasreader.cpp, - trunk/src/laswriter.cpp: Expose TODO entries in .c and .cpp files - from doxygen comments in headers, to not to forget about them. - -2008-10-29 11:15 mloskot - - * trunk/doc/las2ogr.txt: doc/las2ogr.txt: Updated svn:mine-type, - svn:eol-style and svn:keywords. - -2008-10-29 11:12 mloskot - - * trunk/doc/las2ogr.txt: Set svn:keywords on las2ogr.txt - -2008-10-29 11:09 mloskot - - * trunk/README, trunk/doc/las2ogr.txt: Added doc/las2ogr.txt file. - Linked las2ogr.txt from main README. - -2008-10-29 10:54 mloskot - - * trunk/apps/makefile.vc: apps/makefile.vc: remove .ilk and .pdb - files from clean target. - -2008-10-14 02:18 hobu - - * trunk/python/liblas/point.py, trunk/python/tests/File.txt, - trunk/python/tests/Header.txt, trunk/python/tests/Point.txt: more - fixups related to #83.. ensure we use GMT and fix microseconds - overflow - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/config.guess work/liblas-src-1.2.1/config.guess --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/config.guess 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/config.guess 1970-01-01 08:00:00.000000000 +0800 @@ -1,1500 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. - -timestamp='2006-07-02' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/config.sub work/liblas-src-1.2.1/config.sub --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/config.sub 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/config.sub 1970-01-01 08:00:00.000000000 +0800 @@ -1,1616 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. - -timestamp='2006-09-20' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/configure work/liblas-src-1.2.1/configure --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/configure 2009-10-03 01:02:37.000000000 +0800 +++ work/liblas-src-1.2.1/configure 1970-01-01 08:00:00.000000000 +0800 @@ -1,18831 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for las 1.2.1. -# -# Report bugs to . -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME='las' -PACKAGE_TARNAME='liblas-src' -PACKAGE_VERSION='1.2.1' -PACKAGE_STRING='las 1.2.1' -PACKAGE_BUGREPORT='hobu.inc@gmail.com' - -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -build -build_cpu -build_vendor -build_os -RELEASE_VERSION -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -CXX -CXXFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CXX -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -CXXCPP -LN_S -LIBTOOL -host -host_cpu -host_vendor -host_os -CC -CFLAGS -ac_ct_CC -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -SED -GREP -EGREP -FGREP -LD -DUMPBIN -ac_ct_DUMPBIN -NM -AR -RANLIB -lt_ECHO -DSYMUTIL -NMEDIT -LIPO -OTOOL -OTOOL64 -CPP -GDAL_INC -GDAL_PREFIX -GDAL_IS_CONFIG_TRUE -GDAL_IS_CONFIG_FALSE -GEOTIFF_INC -GEOTIFF_PREFIX -GEOTIFF_IS_CONFIG_TRUE -GEOTIFF_IS_CONFIG_FALSE -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CXX -CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS -CCC -CXXCPP -CC -CFLAGS -CPP' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures las 1.2.1 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/liblas-src] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of las 1.2.1:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-debug=ARG Enable debug compilation mode [yes|no], - default=no - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-gdal=ARG Path to gdal-config - --with-geotiff=ARG libgeotiff library to use (no or path) - -Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CXXCPP C++ preprocessor - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -las configure 1.2.1 -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by las $as_me 1.2.1, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - - -RELEASE_VERSION=1.2.1 - - - - - -CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS" -CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS" - - -am__api_version='1.10' - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - SET_MAKE= -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='liblas-src' - VERSION='1.2.1' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -depcc="$CXX" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } -fi - -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - SET_MAKE= -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -case `pwd` in - *\ * | *\ *) - { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.2.4' -macro_revision='1.2976' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" | sed 99q >conftest.sed - $as_unset ac_script || ac_script= - # Extract the first word of "sed gsed" to use in msg output -if test -z "$SED"; then -set dummy sed gsed; ac_prog_name=$2 -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_SED_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue - # Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_SED_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -SED="$ac_cv_path_SED" -if test -z "$SED"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_SED=$SED -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -echo "${ECHO_T}$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_GREP=$GREP -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_EGREP=$EGREP -fi - - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ echo "$as_me:$LINENO: checking for fgrep" >&5 -echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - # Extract the first word of "fgrep" to use in msg output -if test -z "$FGREP"; then -set dummy fgrep; ac_prog_name=$2 -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_FGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue - # Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_FGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -FGREP="$ac_cv_path_FGREP" -if test -z "$FGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_FGREP=$FGREP -fi - - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -echo "${ECHO_T}$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -echo "${ECHO_T}$DUMPBIN" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; } -if test "${lt_cv_nm_interface+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5105: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:5108: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:5111: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -r -f conftest* -fi -{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -echo "${ECHO_T}$lt_cv_nm_interface" >&6; } - -# find the maximum length of command line arguments -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } -else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ echo "$as_me:$LINENO: result: $xsi_shell" >&5 -echo "${ECHO_T}$xsi_shell" >&6; } - - -{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -echo "${ECHO_T}$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac - - - - - - - - - -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - - -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -else - AR="$ac_cv_prog_AR" -fi - -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -r -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6; } -else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } -fi - - - - - - - - - - - - - - - - - - - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 6211 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -echo "${ECHO_T}$DSYMUTIL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -echo "${ECHO_T}$NMEDIT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { echo "$as_me:$LINENO: result: $LIPO" >&5 -echo "${ECHO_T}$LIPO" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_LIPO="lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -echo "${ECHO_T}$ac_ct_LIPO" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { echo "$as_me:$LINENO: result: $OTOOL" >&5 -echo "${ECHO_T}$OTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL="otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -echo "${ECHO_T}$ac_ct_OTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { echo "$as_me:$LINENO: result: $OTOOL64" >&5 -echo "${ECHO_T}$OTOOL64" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -echo "${ECHO_T}$ac_ct_OTOOL64" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_ld_exported_symbols_list=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f -r conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f -r conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - _lt_caught_CXX_error=yes -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - - - - - -# Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - - - - - - - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - - - - - - - - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - - - - - - - - - - - - -test -z "$LN_S" && LN_S="ln -s" - - - - - - - - - - - - - - -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF - - - - - - - - - - - - - - - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM -r conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - - { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8763: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:8767: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - - - - - - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - - - - - - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9087: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:9091: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9192: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:9196: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM -r conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9247: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:9251: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM -r conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $RM -r conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then - output_verbose_link_cmd=echo - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $RM -r conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM -r conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line 11995 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -} -_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line 12095 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -} -_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } - - { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } - - { echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM -r conftest* - - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then - output_verbose_link_cmd=echo - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - - else - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - gnu*) - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - ld_shlibs_CXX=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - icpc* | ecpc* ) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } - - - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14098: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:14102: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - - - - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14197: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:14201: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM -r conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14249: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:14253: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM -r conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM -r conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $RM -r conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $RM -r conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM -r conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - - fi # test -n "$compiler" - - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - - - -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) - bogus endian macros -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_bigendian=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -int -main () -{ - _ascii (); _ebcdic (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_bigendian=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -case $ac_cv_c_bigendian in - yes) - -cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac - - - - -for ac_header in string.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to hobu.inc@gmail.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: cannot find string.h, bailing out" >&5 -echo "$as_me: error: cannot find string.h, bailing out" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - -for ac_header in stdio.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to hobu.inc@gmail.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: cannot find stdio.h, bailing out" >&5 -echo "$as_me: error: cannot find stdio.h, bailing out" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - -for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to hobu.inc@gmail.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: cannot find stdlib.h, bailing out" >&5 -echo "$as_me: error: cannot find stdlib.h, bailing out" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - - -LIBS="${LIBS}" - - - -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; -fi - - -{ echo "$as_me:$LINENO: checking for debug enabled" >&5 -echo $ECHO_N "checking for debug enabled... $ECHO_C" >&6; } - -if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -DDEBUG" - CXXFLAGS="$CXXFLAGS -g -DDEBUG" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - CFLAGS="$CFLAGS -O3 -DNDEBUG" - CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - - - - - - -HAVE_GDAL="no" -GDAL_CONFIG="no" -HAVE_GEOTIFF="no" -GEOTIFF_CONFIG="no" - -USE_GDAL_SOURCE_TREE="no" - - - -# Check whether --with-gdal was given. -if test "${with_gdal+set}" = set; then - withval=$with_gdal; -fi - -{ echo "$as_me:$LINENO: checking for GDAL" >&5 -echo $ECHO_N "checking for GDAL... $ECHO_C" >&6; } - -if test "$with_gdal" = "no" -o "$with_gdal" = "" ; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -else - - if test "`basename xx/$with_gdal`" = "gdal-config" ; then - { echo "$as_me:$LINENO: result: GDAL enabled with provided gdal-config" >&5 -echo "${ECHO_T}GDAL enabled with provided gdal-config" >&6; } - GDAL_CONFIG="$with_gdal" - elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geotiff.h; then - GDAL_INC="-I$with_gdal/port -I$with_gdal/ogr -I$with_gdal/alg -I$with_gdal/frmts" - GDAL_PREFIX="$with_gdal" - HAVE_GDAL="yes" - HAVE_GEOTIFF="yes" - GEOTIFF_CONFIG="yes" - GDAL_CONFIG="yes" - USE_GDAL_SOURCE_TREE="yes" - LIBS="-L${with_gdal}/.libs -lgdal -L${with_gdal}/ -lgdal $LIBS" - { echo "$as_me:$LINENO: result: GDAL and GeoTIFF enabled with provided GDAL source tree" >&5 -echo "${ECHO_T}GDAL and GeoTIFF enabled with provided GDAL source tree" >&6; } - else - GDAL_CONFIG_TMP=`which gdal-config` - if test "`basename xx/${GDAL_CONFIG_TMP}`" = "gdal-config" ; then - { echo "$as_me:$LINENO: result: GDAL enabled with gdal-config found in PATH" >&5 -echo "${ECHO_T}GDAL enabled with gdal-config found in PATH" >&6; } - GDAL_CONFIG=${GDAL_CONFIG_TMP} - else - { { echo "$as_me:$LINENO: error: --with-gdal should be yes, a path to gdal-config, or a path to GDAL's source tree" >&5 -echo "$as_me: error: --with-gdal should be yes, a path to gdal-config, or a path to GDAL's source tree" >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi - -if test "$GDAL_CONFIG" != "no" ; then - - if test "$GDAL_CONFIG" != "yes" ; then - - GDAL_VERSION=`$GDAL_CONFIG --version` - { echo "$as_me:$LINENO: result: $GDAL_CONFIG reports version $GDAL_VERSION" >&5 -echo "${ECHO_T}$GDAL_CONFIG reports version $GDAL_VERSION" >&6; } - LIBS="`$GDAL_CONFIG --libs` $LIBS" - GDAL_INC=`$GDAL_CONFIG --cflags` - GDAL_PREFIX=`$GDAL_CONFIG --prefix` - OGR=`$GDAL_CONFIG --ogr-enabled` - if test "$OGR" != "yes" ; then - { { echo "$as_me:$LINENO: error: $GDAL_CONFIG says OGR is not enabled" >&5 -echo "$as_me: error: $GDAL_CONFIG says OGR is not enabled" >&2;} - { (exit 1); exit 1; }; } - fi - HAVE_GDAL="yes" - fi -fi - - - - if test ! x$GDAL_CONFIG = xno; then - GDAL_IS_CONFIG_TRUE= - GDAL_IS_CONFIG_FALSE='#' -else - GDAL_IS_CONFIG_TRUE='#' - GDAL_IS_CONFIG_FALSE= -fi - - - - -# Check whether --with-geotiff was given. -if test "${with_geotiff+set}" = set; then - withval=$with_geotiff; -fi - - -if test "$with_geotiff" != "no" -a "$with_geotiff" != "" -a "${GEOTIFF_CONFIG}" != "yes" ; then - { echo "$as_me:$LINENO: checking for ST_Create in -lgeotiff" >&5 -echo $ECHO_N "checking for ST_Create in -lgeotiff... $ECHO_C" >&6; } -if test "${ac_cv_lib_geotiff_ST_Create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgeotiff -L$with_geotiff/lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ST_Create (); -int -main () -{ -return ST_Create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_geotiff_ST_Create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_geotiff_ST_Create=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_geotiff_ST_Create" >&5 -echo "${ECHO_T}$ac_cv_lib_geotiff_ST_Create" >&6; } -if test $ac_cv_lib_geotiff_ST_Create = yes; then - GEOTIFF_CONFIG=external -else - GEOTIFF_CONFIG=no -fi - -fi - -if test "${GEOTIFF_CONFIG}" != "no" ; then - { echo "$as_me:$LINENO: checking for geo_simpletags.h of libgeotiff >= 1.2.5" >&5 -echo $ECHO_N "checking for geo_simpletags.h of libgeotiff >= 1.2.5... $ECHO_C" >&6; } - if test -f ${with_geotiff}/include/geo_simpletags.h ; then - GEOTIFF_INC="-I$with_geotiff/include" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - elif test -f ${with_geotiff}/include/geotiff/geo_simpletags.h ; then - GEOTIFF_INC="-I$with_geotiff/include/geotiff" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geo_simpletags.h ; then - GEOTIFF_INC="-I$with_gdal/frmts/gtiff/libgeotiff/ -I$with_gdal/frmts/gtiff/libtiff" - { echo "$as_me:$LINENO: result: yes, from GDAL" >&5 -echo "${ECHO_T}yes, from GDAL" >&6; } - else - GEOTIFF_CONFIG="no" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi -fi - -{ echo "$as_me:$LINENO: checking for libgeotiff" >&5 -echo $ECHO_N "checking for libgeotiff... $ECHO_C" >&6; } -if test "${GEOTIFF_CONFIG}" = "no" ; then - HAVE_GEOTIFF="no" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -else - if test "${USE_GDAL_SOURCE_TREE}" != "yes" ; then - LIBS="-L$with_geotiff/lib -lgeotiff $LIBS" - HAVE_GEOTIFF="yes" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: use GDAL source" >&5 -echo "${ECHO_T}use GDAL source" >&6; } - fi -fi - - - - if test ! x$GEOTIFF_CONFIG = xno; then - GEOTIFF_IS_CONFIG_TRUE= - GEOTIFF_IS_CONFIG_FALSE='#' -else - GEOTIFF_IS_CONFIG_TRUE='#' - GEOTIFF_IS_CONFIG_FALSE= -fi - - - -if test "${HAVE_GDAL}" != "no" ; then - if test "${GEOTIFF_CONFIG}" = "no" -a "${USE_GDAL_SOURCE_TREE}" != "yes"; then - { { echo "$as_me:$LINENO: error: You must configure a libgeotiff if you are using GDAL binaries. You can configure using a GDAL source tree without libgeotiff, but not from binaries." >&5 -echo "$as_me: error: You must configure a libgeotiff if you are using GDAL binaries. You can configure using a GDAL source tree without libgeotiff, but not from binaries." >&2;} - { (exit 1); exit 1; }; } - fi -fi - - - - { echo "$as_me:$LINENO: checking for 64bit integer type" >&5 -echo $ECHO_N "checking for 64bit integer type... $ECHO_C" >&6; } - - echo 'int main() { long long off=0; }' >> conftest.c - if test -z "`${CC} -o conftest conftest.c 2>&1`" ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_LONG 1 -_ACEOF - - { echo "$as_me:$LINENO: result: long long" >&5 -echo "${ECHO_T}long long" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - rm -f conftest* - - - - - - - - -for ac_func in gettimeofday bzero memset memcpy bcopy -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - -ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile apps/Makefile apps/liblas-config test/Makefile test/unit/Makefile" - - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${GDAL_IS_CONFIG_TRUE}" && test -z "${GDAL_IS_CONFIG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GDAL_IS_CONFIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GDAL_IS_CONFIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${GEOTIFF_IS_CONFIG_TRUE}" && test -z "${GEOTIFF_IS_CONFIG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GEOTIFF_IS_CONFIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GEOTIFF_IS_CONFIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by las $as_me 1.2.1, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Configuration commands: -$config_commands - -Report bugs to ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -las config.status 1.2.1 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' - -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# Quote evaled strings. -for var in SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -deplibs_check_method \ -file_magic_cmd \ -AR \ -AR_FLAGS \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ -lt_prog_compiler_pic \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ -hardcode_libdir_separator \ -fix_srcfile_path \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -finish_eval \ -old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ -hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - - - - - - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; - "apps/liblas-config") CONFIG_FILES="$CONFIG_FILES apps/liblas-config" ;; - "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "test/unit/Makefile") CONFIG_FILES="$CONFIG_FILES test/unit/Makefile" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -RELEASE_VERSION!$RELEASE_VERSION$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -CXXCPP!$CXXCPP$ac_delim -LN_S!$LN_S$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -FGREP!$FGREP$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -LD!$LD$ac_delim -DUMPBIN!$DUMPBIN$ac_delim -ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim -NM!$NM$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -lt_ECHO!$lt_ECHO$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -LIPO!$LIPO$ac_delim -OTOOL!$OTOOL$ac_delim -OTOOL64!$OTOOL64$ac_delim -CPP!$CPP$ac_delim -GDAL_INC!$GDAL_INC$ac_delim -GDAL_PREFIX!$GDAL_PREFIX$ac_delim -GDAL_IS_CONFIG_TRUE!$GDAL_IS_CONFIG_TRUE$ac_delim -GDAL_IS_CONFIG_FALSE!$GDAL_IS_CONFIG_FALSE$ac_delim -GEOTIFF_INC!$GEOTIFF_INC$ac_delim -GEOTIFF_PREFIX!$GEOTIFF_PREFIX$ac_delim -GEOTIFF_IS_CONFIG_TRUE!$GEOTIFF_IS_CONFIG_TRUE$ac_delim -GEOTIFF_IS_CONFIG_FALSE!$GEOTIFF_IS_CONFIG_FALSE$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - - - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - "libtool":C) - - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM -f \"$cfgfile\"; exit 1" 1 2 15 - $RM -f "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# The names of the tagged configurations supported by this script. -available_tags="CXX " - -# ### BEGIN LIBTOOL CONFIG - -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# What type of objects to build. -pic_mode=$pic_mode - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" - -# A grep program that handles long lines. -GREP=$lt_GREP - -# An ERE matcher. -EGREP=$lt_EGREP - -# A literal string matcher. -FGREP=$lt_FGREP - -# A BSD- or MS-compatible name lister. -NM=$lt_NM - -# Whether we need soft or hard links. -LN_S=$lt_LN_S - -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len - -# Object file suffix (normally "o"). -objext=$ac_objext - -# Executable file suffix (normally ""). -exeext=$exeext - -# whether the shell understands "unset". -lt_unset=$lt_unset - -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL - -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == "file_magic". -file_magic_cmd=$lt_file_magic_cmd - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A symbol stripping program. -STRIP=$lt_STRIP - -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# A C compiler. -LTCC=$lt_CC - -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO - -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL - -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT - -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO - -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL - -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 - -# Old archive suffix (normally "a"). -libext=$libext - -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Library versioning type. -version_type=$version_type - -# Shared library runtime path variable. -runpath_var=$runpath_var - -# Shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds - -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - - -# The linker used to build libraries. -LD=$lt_LD - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds - -# A language specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU compiler? -with_gcc=$GCC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - -ltmain="$ac_aux_dir/ltmain.sh" - - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac - - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - - ;; - - esac -done # for ac_tag - - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - - - - -echo "" - - -echo "libLAS configuration summary:" - - -echo "" - - -echo " Version..................: ${RELEASE_VERSION}" - - -echo " Installation directory...: ${prefix}" - - -echo " C compiler...............: ${CC} ${CFLAGS}" - - -echo " C++ compiler.............: ${CXX} ${CXXFLAGS}" - - -echo " Debugging support........: ${enable_debug}" - - -echo " GDAL support.............: ${HAVE_GDAL}" - -if test "${HAVE_GDAL}" != "no" ; then - -echo " - gdal-config...........: ${GDAL_CONFIG}" - - if test -n "${GDAL_INC}" ; then - -echo " - INCLUDE directories...: ${GDAL_INC}" - - fi -fi - -echo " GeoTIFF SRS support......: ${HAVE_GEOTIFF}" - -if test "${HAVE_GEOTIFF}" != "no" ; then - -echo " - libgeotiff............: ${GEOTIFF_CONFIG}" - - if test -n "${GEOTIFF_INC}" ; then - -echo " - INCLUDE directories...: ${GEOTIFF_INC}" - - fi -fi - -echo "" - - -echo " LIBS.....................: ${LIBS}" - - -echo "" - - -echo " libLAS - http://liblas.org" - - -echo "" - - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/configure.ac work/liblas-src-1.2.1/configure.ac --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/configure.ac 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/configure.ac 1970-01-01 08:00:00.000000000 +0800 @@ -1,288 +0,0 @@ -dnl $Id$ -dnl -dnl This is main autoconf bootstrap script of libLAS project. -dnl -m4_define([liblas_version_major], [1]) -m4_define([liblas_version_minor], [2]) -m4_define([liblas_version_micro], [1]) -m4_define([liblas_version], - [liblas_version_major.liblas_version_minor.liblas_version_micro]) - -AC_PREREQ([2.59]) -AC_INIT([las], [liblas_version], [hobu.inc@gmail.com],[liblas-src]) -AC_CANONICAL_BUILD - -RELEASE_VERSION=liblas_version -AC_SUBST([RELEASE_VERSION]) - -dnl ######################################################################### -dnl Default compilation flags -dnl ######################################################################### - -m4_define([debug_default],[no]) - -CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS" -CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS" - -dnl ######################################################################### -dnl Checks for programs. -dnl ######################################################################### - -AM_INIT_AUTOMAKE([dist-bzip2]) -AC_PROG_CXX -AC_PROG_CXXCPP -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL - -dnl ######################################################################### -dnl Check platform endianness -dnl ######################################################################### - -AC_C_BIGENDIAN - -dnl ######################################################################### -dnl Checks for header files. -dnl ######################################################################### - -AC_CHECK_HEADERS([string.h],, [AC_MSG_ERROR([cannot find string.h, bailing out])]) -AC_CHECK_HEADERS([stdio.h],, [AC_MSG_ERROR([cannot find stdio.h, bailing out])]) -AC_CHECK_HEADERS([stdlib.h],, [AC_MSG_ERROR([cannot find stdlib.h, bailing out])]) - - -LIBS="${LIBS}" - - -dnl ######################################################################### -dnl Build mode configuration (debug/optimized) -dnl ######################################################################### - -AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug=ARG], [Enable debug compilation mode @<:@yes|no@:>@, default=debug_default]),,) - -AC_MSG_CHECKING([for debug enabled]) - -if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -DDEBUG" - CXXFLAGS="$CXXFLAGS -g -DDEBUG" - AC_MSG_RESULT(yes) -else - CFLAGS="$CFLAGS -O3 -DNDEBUG" - CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" - AC_MSG_RESULT(no) -fi - -dnl ######################################################################### -dnl Definition of custom Autoconf macros -dnl ######################################################################### - -AC_DEFUN([LOC_MSG],[ -echo "$1" -]) - -AC_DEFUN([AC_HAVE_LONG_LONG], -[ - AC_MSG_CHECKING([for 64bit integer type]) - - echo 'int main() { long long off=0; }' >> conftest.c - if test -z "`${CC} -o conftest conftest.c 2>&1`" ; then - AC_DEFINE(HAVE_LONG_LONG, 1, [Define to 1, if your compiler supports long long data type]) - AC_MSG_RESULT([long long]) - else - AC_MSG_RESULT([no]) - fi - rm -f conftest* -]) - - - -HAVE_GDAL="no" -GDAL_CONFIG="no" -HAVE_GEOTIFF="no" -GEOTIFF_CONFIG="no" - -USE_GDAL_SOURCE_TREE="no" - -dnl ######################################################################### -dnl Determine GDAL Support -dnl ######################################################################### - -AC_ARG_WITH([gdal], - AC_HELP_STRING([--with-gdal=ARG], [Path to gdal-config]),,) -AC_MSG_CHECKING([for GDAL]) - -if test "$with_gdal" = "no" -o "$with_gdal" = "" ; then - AC_MSG_RESULT([no]) -else - - dnl Check if full path to gdal-config provided - if test "`basename xx/$with_gdal`" = "gdal-config" ; then - AC_MSG_RESULT([GDAL enabled with provided gdal-config]) - GDAL_CONFIG="$with_gdal" - elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geotiff.h; then - GDAL_INC="-I$with_gdal/port -I$with_gdal/ogr -I$with_gdal/alg -I$with_gdal/frmts" - GDAL_PREFIX="$with_gdal" - HAVE_GDAL="yes" - HAVE_GEOTIFF="yes" - GEOTIFF_CONFIG="yes" - GDAL_CONFIG="yes" - USE_GDAL_SOURCE_TREE="yes" - LIBS="-L${with_gdal}/.libs -lgdal -L${with_gdal}/ -lgdal $LIBS" - AC_MSG_RESULT([GDAL and GeoTIFF enabled with provided GDAL source tree]) - else - dnl --with-gdal=yes given, so try to find gdal-config in PATH - GDAL_CONFIG_TMP=`which gdal-config` - if test "`basename xx/${GDAL_CONFIG_TMP}`" = "gdal-config" ; then - AC_MSG_RESULT([GDAL enabled with gdal-config found in PATH]) - GDAL_CONFIG=${GDAL_CONFIG_TMP} - else - AC_MSG_ERROR([--with-gdal should be yes, a path to gdal-config, or a path to GDAL's source tree]) - fi - fi -fi - -if test "$GDAL_CONFIG" != "no" ; then - -dnl if we are already yes, we don't need to run gdal-config - if test "$GDAL_CONFIG" != "yes" ; then - - GDAL_VERSION=`$GDAL_CONFIG --version` - AC_MSG_RESULT([$GDAL_CONFIG reports version $GDAL_VERSION]) - LIBS="`$GDAL_CONFIG --libs` $LIBS" - GDAL_INC=`$GDAL_CONFIG --cflags` - GDAL_PREFIX=`$GDAL_CONFIG --prefix` - OGR=`$GDAL_CONFIG --ogr-enabled` - if test "$OGR" != "yes" ; then - AC_MSG_ERROR([$GDAL_CONFIG says OGR is not enabled]) - fi - HAVE_GDAL="yes" - fi -fi - -AC_SUBST([GDAL_INC]) -AC_SUBST([GDAL_PREFIX]) -AM_CONDITIONAL([GDAL_IS_CONFIG], [test ! x$GDAL_CONFIG = xno]) - -dnl ######################################################################### -dnl Determine GeoTIFF Support -dnl ######################################################################### - -AC_ARG_WITH([geotiff], - AC_HELP_STRING([--with-geotiff=ARG], [libgeotiff library to use (no or path)]),,) - -if test "$with_geotiff" != "no" -a "$with_geotiff" != "" -a "${GEOTIFF_CONFIG}" != "yes" ; then - dnl We now require libgeotiff 1.2.5 (for ST_Create the simpletags stuff). - dnl first check if $with_geotiff/lib has the library: - AC_CHECK_LIB([geotiff], [ST_Create], - [GEOTIFF_CONFIG=external], [GEOTIFF_CONFIG=no], - [-L$with_geotiff/lib]) -fi - -if test "${GEOTIFF_CONFIG}" != "no" ; then - dnl libgeotiff 1.2.5, is first version with geo_simpletags.h - AC_MSG_CHECKING([for geo_simpletags.h of libgeotiff >= 1.2.5]) - if test -f ${with_geotiff}/include/geo_simpletags.h ; then - GEOTIFF_INC="-I$with_geotiff/include" - AC_MSG_RESULT([yes]) - elif test -f ${with_geotiff}/include/geotiff/geo_simpletags.h ; then - GEOTIFF_INC="-I$with_geotiff/include/geotiff" - AC_MSG_RESULT([yes]) - elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geo_simpletags.h ; then - GEOTIFF_INC="-I$with_gdal/frmts/gtiff/libgeotiff/ -I$with_gdal/frmts/gtiff/libtiff" - AC_MSG_RESULT([yes, from GDAL]) - else - GEOTIFF_CONFIG="no" - AC_MSG_RESULT([no]) - fi -fi - -AC_MSG_CHECKING([for libgeotiff]) -if test "${GEOTIFF_CONFIG}" = "no" ; then - HAVE_GEOTIFF="no" - AC_MSG_RESULT([no]) -else - if test "${USE_GDAL_SOURCE_TREE}" != "yes" ; then - LIBS="-L$with_geotiff/lib -lgeotiff $LIBS" - HAVE_GEOTIFF="yes" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([use GDAL source]) - fi -fi - -AC_SUBST([GEOTIFF_INC]) -AC_SUBST([GEOTIFF_PREFIX]) -AM_CONDITIONAL([GEOTIFF_IS_CONFIG], [test ! x$GEOTIFF_CONFIG = xno]) - -dnl ######################################################################### -dnl If GDAL was requested, but geotiff is not configured, complain -dnl ######################################################################### - -if test "${HAVE_GDAL}" != "no" ; then - if test "${GEOTIFF_CONFIG}" = "no" -a "${USE_GDAL_SOURCE_TREE}" != "yes"; then - AC_MSG_ERROR([You must configure a libgeotiff if you are using GDAL binaries. You can configure using a GDAL source tree without libgeotiff, but not from binaries.]) - fi -fi - -dnl ######################################################################### -dnl Determine other features of compiler -dnl ######################################################################### - -AC_HAVE_LONG_LONG - -dnl ######################################################################### -dnl Checks for library functions. -dnl ######################################################################### - -AC_CHECK_FUNCS([gettimeofday bzero memset memcpy bcopy]) - -dnl ######################################################################### -dnl Generate makefiles -dnl ######################################################################### - -AC_CONFIG_FILES([ - Makefile - include/Makefile - src/Makefile - apps/Makefile - apps/liblas-config - test/Makefile - test/unit/Makefile -]) - -AC_OUTPUT - -dnl ######################################################################### -dnl Print configuration summary -dnl ######################################################################### - -LOC_MSG() -LOC_MSG([libLAS configuration summary:]) -LOC_MSG() -LOC_MSG([ Version..................: ${RELEASE_VERSION}]) -LOC_MSG([ Installation directory...: ${prefix}]) -LOC_MSG([ C compiler...............: ${CC} ${CFLAGS}]) -LOC_MSG([ C++ compiler.............: ${CXX} ${CXXFLAGS}]) -LOC_MSG([ Debugging support........: ${enable_debug}]) -LOC_MSG([ GDAL support.............: ${HAVE_GDAL}]) -if test "${HAVE_GDAL}" != "no" ; then - LOC_MSG([ - gdal-config...........: ${GDAL_CONFIG}]) - if test -n "${GDAL_INC}" ; then - LOC_MSG([ - INCLUDE directories...: ${GDAL_INC}]) - fi -fi -LOC_MSG([ GeoTIFF SRS support......: ${HAVE_GEOTIFF}]) -if test "${HAVE_GEOTIFF}" != "no" ; then - LOC_MSG([ - libgeotiff............: ${GEOTIFF_CONFIG}]) - if test -n "${GEOTIFF_INC}" ; then - LOC_MSG([ - INCLUDE directories...: ${GEOTIFF_INC}]) - fi -fi -LOC_MSG() -LOC_MSG([ LIBS.....................: ${LIBS}]) -LOC_MSG() -LOC_MSG([ libLAS - http://liblas.org]) -LOC_MSG() - -dnl EOF diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/depcomp work/liblas-src-1.2.1/depcomp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/depcomp 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/depcomp 1970-01-01 08:00:00.000000000 +0800 @@ -1,584 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2006-10-15.18 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - stat=$? - - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/capi/las_config.h work/liblas-src-1.2.1/include/liblas/capi/las_config.h --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/capi/las_config.h 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/capi/las_config.h 1970-01-01 08:00:00.000000000 +0800 @@ -1,93 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Basic macros for the libLAS C API - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LAS_CONFIG_H_INCLUDED -#define LAS_CONFIG_H_INCLUDED - -#define LIBLAS_C_API 1 - -/* ==================================================================== */ -/* Other standard services. */ -/* ==================================================================== */ -#ifdef __cplusplus -# define LAS_C_START extern "C" { -# define LAS_C_END } -#else -# define LAS_C_START -# define LAS_C_END -#endif - -#ifndef LAS_DLL -#if defined(_MSC_VER) && !defined(LAS_DISABLE_DLL) -# define LAS_DLL __declspec(dllexport) -#else -# if defined(USE_GCC_VISIBILITY_FLAG) -# define LAS_DLL __attribute__ ((visibility("default"))) -# else -# define LAS_DLL -# endif -#endif -#endif - -#ifndef NULL -#define NULL 0 -#endif - -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifndef MAX -# define MIN(a,b) ((ab) ? a : b) -#endif - -#ifdef _MSC_VER -#define strdup _strdup -#endif - - -#endif /* LAS_CONFIG_H_INCLUDED */ - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/capi/las_version.h work/liblas-src-1.2.1/include/liblas/capi/las_version.h --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/capi/las_version.h 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/capi/las_version.h 1970-01-01 08:00:00.000000000 +0800 @@ -1,64 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Basic macros for the libLAS C API - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LAS_VERSION_H_INCLUDED -#define LAS_VERSION_H_INCLUDED - -#ifndef LIBLAS_VERSION_MAJOR -#define LIBLAS_VERSION_MAJOR 1 -#define LIBLAS_VERSION_MINOR 2 -#define LIBLAS_VERSION_REV 1 -#define LIBLAS_VERSION_BUILD 0 -#endif - -#ifndef LIBLAS_VERSION_NUM -#define LIBLAS_VERSION_NUM (LIBLAS_VERSION_MAJOR*1000+LIBLAS_VERSION_MINOR*100+LIBLAS_VERSION_REV*10+LIBLAS_VERSION_BUILD) -#endif - -#ifndef LIBLAS_RELEASE_DATE -#define LIBLAS_RELEASE_DATE 20091002 -#endif - -#ifndef LIBLAS_RELEASE_NAME -#define LIBLAS_RELEASE_NAME "1.2.1" -#endif - -#endif /* LAS_VERSION_H_INCLUDED */ diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/capi/liblas.h work/liblas-src-1.2.1/include/liblas/capi/liblas.h --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/capi/liblas.h 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/capi/liblas.h 1970-01-01 08:00:00.000000000 +0800 @@ -1,1116 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Main prototypes for the libLAS C API - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_H_INCLUDED -#define LIBLAS_H_INCLUDED - - - -#define LIBLAS_C_API 1 - -#include "las_version.h" -#include "las_config.h" - - -#include - - -typedef struct LASWriterHS *LASWriterH; -typedef struct LASReaderHS *LASReaderH; -typedef struct LASPointHS *LASPointH; -typedef struct LASHeaderHS *LASHeaderH; -typedef struct LASGuidHS *LASGuidH; -typedef struct LASVLRHS *LASVLRH; -typedef struct LASColorHS *LASColorH; -typedef struct LASSRSHS *LASSRSH; - - -/* Fake out the compiler if we don't have libgeotiff */ -#ifndef HAVE_LIBGEOTIFF - typedef struct GTIFS * GTIF; - typedef struct TIFFS * TIFF; -#else -#include -#endif - - -LAS_C_START - - -#define LAS_MODE_READ 0 -#define LAS_MODE_WRITE 1 -#define LAS_MODE_APPEND 2 - -/** - * \todo to be documented - */ -typedef enum -{ - LE_None = 0, - LE_Debug = 1, - LE_Warning = 2, - LE_Failure = 3, - LE_Fatal = 4 -} LASError; - -/** - * \todo to be documented - */ -typedef struct { - - double t; - double x, y, z; - uint16_t intensity; - uint8_t cls; - int8_t scan_angle; - uint8_t user_data; - uint16_t retnum; - uint16_t numret; - uint16_t scandir; - uint16_t fedge; - uint16_t red; - uint16_t green; - uint16_t blue; - long rgpsum; - int number_of_point_records; - int number_of_points_by_return[8]; - int number_of_returns_of_given_pulse[8]; - int classification[32]; - int classification_synthetic; - int classification_keypoint; - int classification_withheld; - LASPointH pmax; - LASPointH pmin; -} LASPointSummary; - - -/** Returns the version string for this library. - * @return the version string for this library. -*/ -LAS_DLL char* LAS_GetVersion(void); - -LAS_DLL int LAS_IsLibGeoTIFFEnabled(void); - -LAS_DLL int LAS_IsGDALEnabled(void); - -/****************************************************************************/ -/* Error handling */ -/****************************************************************************/ - -/** Resets the error stack for the libLAS C API. -*/ -LAS_DLL void LASError_Reset(void); - -/** Pops the top error off of the error stack for the libLAS C API. -*/ -LAS_DLL void LASError_Pop(void); - -/** Returns the error number of the last error on the error stack. - * @return the error number of the last error on the error stack. -*/ -LAS_DLL LASError LASError_GetLastErrorNum(void); - -/** Returns the name of the method the last error message happened in. - * @return the name of the method the last error message happened in. -*/ -LAS_DLL char * LASError_GetLastErrorMsg(void); - -/** Returns the name of the method the last error message happened in. - * @return the name of the method the last error message happened in. -*/ -LAS_DLL char * LASError_GetLastErrorMethod(void); - -/** Returns the number of error messages on the error stack. - * @return the number of error messages on the error stack. -*/ -LAS_DLL int LASError_GetErrorCount(void); - -/** Prints the last error message in the error stack to stderr. If - * there is no error on the error stack, only the message is printed. - * The function does not alter the error stack in any way. - * @param message Message to include in the stderr output -*/ -LAS_DLL void LASError_Print(const char* message); - -/****************************************************************************/ -/* Reader operations */ -/****************************************************************************/ - -/** Creates a LASReaderH object that can be used to read LASHeaderH and - * LASPointH objects with. The LASReaderH must not be created with a - * filename that is opened for read or write by any other API functions. - * @return opaque pointer to a LASReaderH instance. - * @param filename Filename to open for read -*/ -LAS_DLL LASReaderH LASReader_Create(const char * filename); - -/** Reads the next available point on the LASReaderH instance. If no point - * is available to read, NULL is returned. If an error happens during - * the reading of the next available point, an error will be added to the - * error stack and can be returned with the LASError_GetLastError* methods. - * @param hReader the opaque handle to the LASReaderH - * @return an opaque handle to a LASPointH object, or NULL if no point is - * available to read or an error occured. Use the - * LASError_GetLastError* methods to confirm the existence of an error - * if NULL is returned. -*/ -LAS_DLL LASPointH LASReader_GetNextPoint(const LASReaderH hReader); - -/** Reads a LASPointH from the given position in the LAS file represented - * by the LASReaderH instance. If no point is available at that location, - * NULL is returned. If an error happens during the reading of the point, - * an error will be added to the error stack and can be returned with the - * LASError_GetLastError* methods. - * @param hReader the opaque handle to the LASReaderH - * @param position the integer position of the point in the file to read. - * @return an opaque handle to a LASPointH object, or NULL if no point is - * available at the given location or an error occured. Use the - * LASError_GetLastError* methods to confirm the existence of an error - * if NULL is returned. -*/ -LAS_DLL LASPointH LASReader_GetPointAt(const LASReaderH hReader, uint32_t position); - -/** Closes the file for reading operations represented by the LASReaderH instance. - * @param hReader the opqaue handle to the LASReaderH -*/ -LAS_DLL void LASReader_Destroy(LASReaderH hReader); - -/** Returns a LASHeaderH representing the header for the file - * @param hReader the LASReaderH instance - * @return a LASHeaderH representing the header for the file. NULL is returned - * in the event of an error. Use the LASError_GetLastError* methods to check - * in the event of a NULL return. -*/ -LAS_DLL LASHeaderH LASReader_GetHeader(const LASReaderH hReader); - - -LAS_DLL LASError LASReader_SetSRS(LASHeaderH hReader, const LASSRSH hSRS); - - -/****************************************************************************/ -/* Point operations */ -/****************************************************************************/ - -/** Returns the X value for the point. This value is not scaled or offset - * by any header values and stands on its own. If you need points to have - * a scale and/or offset applied, this must be done in conjunction with the - * header values after the value is read. - * @param hPoint the opaque pointer to the LASPointH instance - * @return the X value for the LASPointH -*/ -LAS_DLL double LASPoint_GetX(const LASPointH hPoint); - -/** Sets the X value for the point. This value must be scaled or offset - * by any header values before being set. - * @param hPoint the opaque pointer to the LASPointH instance - * @param value the double value to set for the X value of the point - * @return an error number if an error occured during the setting of the point. -*/ -LAS_DLL LASError LASPoint_SetX(LASPointH hPoint, double value); - -/** Returns the Y value for the point. This value is not scaled or offset - * by any header values and stands on its own. If you need points to have - * a scale and/or offset applied, this must be done in conjunction with the - * header values after the value is read. - * @param hPoint the opaque pointer to the LASPointH instance - * @return the Y value for the LASPointH -*/ -LAS_DLL double LASPoint_GetY(const LASPointH hPoint); - -/** Sets the Y value for the point. This value must be scaled or offset - * by any header values before being set. - * @param hPoint the opaque pointer to the LASPointH instance - * @param value the double value to set for the Y value of the point - * @return an error number if an error occured during the setting of the point. -*/ -LAS_DLL LASError LASPoint_SetY(LASPointH hPoint, double value); - -/** Returns the Z value for the point. This value is not scaled or offset - * by any header values and stands on its own. If you need points to have - * a scale and/or offset applied, this must be done in conjunction with the - * header values after the value is read. - * @param hPoint the opaque pointer to the LASPointH instance - * @return the Z value for the LASPointH -*/ -LAS_DLL double LASPoint_GetZ(const LASPointH hPoint); - -/** Sets the Z value for the point. This value must be scaled or offset - * by any header values before being set. - * @param hPoint the opaque pointer to the LASPointH instance - * @param value the double value to set for the Z value of the point - * @return an error number if an error occured during the setting of the point. -*/ -LAS_DLL LASError LASPoint_SetZ(LASPointH hPoint, double value); - -/** Returns the intensity value for the point. This value is the pulse return - * magnitude, it is optional, and it is LiDAR system specific. - * @return the intensity value for the point. -*/ -LAS_DLL uint16_t LASPoint_GetIntensity(const LASPointH hPoint); - -/** Sets the intensity value for the point. - * @param hPoint the opaque pointer to the LASPointH instance - * @param value the value to set the intensity to - * @return an error number if an error occured. -*/ -LAS_DLL LASError LASPoint_SetIntensity(LASPointH hPoint, uint16_t value); - -/** Returns the return number for the point. The return number is "the pulse - * return number for a given output pulse." The first return number starts with - * the value 1. - * @param hPoint LASPointH instance - * @return a return number, valid from 1-6, for the point. Use the LASError - * methods to determine if an error occurred during this operation if 0 - * is returned. -*/ -LAS_DLL uint16_t LASPoint_GetReturnNumber(const LASPointH hPoint); - -/** Sets the return number for the point. Valid values are from 1-6. - * @param hPoint LASPointH instance - * @param value the value to set for the return number - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetReturnNumber(LASPointH hPoint, uint16_t value); - -/** Returns the total number of returns for a given pulse. - * @param hPoint LASPointH instance - * @return total number of returns for this pulse. -*/ -LAS_DLL uint16_t LASPoint_GetNumberOfReturns(const LASPointH hPoint); - -/** Sets the number of returns for the point. Valid values are from 1-5. - * @param hPoint LASPointH instance - * @param value the value to set for the number of returns - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetNumberOfReturns(LASPointH hPoint, uint16_t value); - -/** Returns the scan direction for a given pulse. - * @param hPoint LASPointH instance - * @return the scan direction for a given pulse. -*/ -LAS_DLL uint16_t LASPoint_GetScanDirection(const LASPointH hPoint); - -/** Sets the scan direction for a given pulse. Valid values are 0 or 1, with - * 1 being a positive scan direction and 0 being a negative scan direction. - * @param hPoint LASPointH instance - * @param value the value to set for scan direction - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetScanDirection(LASPointH hPoint, uint16_t value); - -/** Returns whether or not a given pulse is an edge point - * @param hPoint LASPointH instance - * @return whether or not a given pulse is an edge point. -*/ -LAS_DLL uint16_t LASPoint_GetFlightLineEdge(const LASPointH hPoint); - -/** Sets the edge marker for a given pulse. Valid values are 0 or 1, with - * 1 being an edge point and 0 being interior. - * @param hPoint LASPointH instance - * @param value the value to set for flightline edge - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetFlightLineEdge(LASPointH hPoint, uint16_t value); - -/** Returns all of the scan flags for the point -- Return number, number of - * returns, flightline edge, scan direction, and scan angle rank. - * @param hPoint LASPointH instance - * @return all of the scan flags for the point -*/ -LAS_DLL uint8_t LASPoint_GetScanFlags(const LASPointH hPoint); - -/** Sets all of the scan flags for the point. No validation is done. - * @param hPoint LASPointH instance - * @param value the value to set for the flags - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetScanFlags(LASPointH hPoint, uint8_t value); - -/** Returns the classification for the point - * @param hPoint LASPointH instance - * @return the classification for the point -*/ -LAS_DLL uint8_t LASPoint_GetClassification(const LASPointH hPoint); - -/** Sets the classification for the point. No validation is done. - * @param hPoint LASPointH instance - * @param value the value to set for the classification - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetClassification(LASPointH hPoint, uint8_t value); - -/** Returns the time for the point - * @param hPoint LASPointH instance - * @return the time for the point -*/ -LAS_DLL double LASPoint_GetTime(const LASPointH hPoint); - -/** Sets the time for the point. No validation is done. - * @param hPoint LASPointH instance - * @param value the value to set for the time - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetTime(LASPointH hPoint, double value); - -/** Returns the scan angle for the point - * @param hPoint LASPointH instance - * @return the scan angle for the point -*/ -LAS_DLL int8_t LASPoint_GetScanAngleRank(const LASPointH hPoint); - -/** Sets the scan angle for the point. No validation is done. - * @param hPoint LASPointH instance - * @param value the value to set for the scan angle - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetScanAngleRank(LASPointH hPoint, int8_t value); - -/** Sets the point source id for the point. No validation is done. - * @param hPoint LASPointH instance - * @param value the value to set for the point source id - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetPointSourceId(LASPointH hPoint, uint16_t value); - -/** Returns the point source id for the point - * @param hPoint LASPointH instance - * @return the scan angle for the point -*/ -LAS_DLL uint16_t LASPoint_GetPointSourceId(LASPointH hPoint); - -/** Returns the arbitrary user data for the point - * @param hPoint LASPointH instance - * @return the arbitrary user data for the point -*/ -LAS_DLL uint8_t LASPoint_GetUserData(const LASPointH hPoint); - -/** Sets the arbitrary user data for the point. No validation is done. - * @param hPoint LASPointH instance - * @param value the value to set for the arbitrary user data - * @return LASError value determine success or failure. -*/ -LAS_DLL LASError LASPoint_SetUserData(LASPointH hPoint, uint8_t value); - -/** Returns a bitfield representing the validity of various members - * enum DataMemberFlag - { - eReturnNumber = 1, - eNumberOfReturns = 2, - eScanDirection = 4, - eFlightLineEdge = 8, - eClassification = 16, - eScanAngleRank = 32, - eTime = 64 - }; - * @param hPoint LASPointH instance - * @return bitfield representing the validity of various members. -*/ -LAS_DLL int LASPoint_Validate(LASPointH hPoint); - -/** Returns a boolean whether or not the point is valid - * @param hPoint LASPointH instance - * @return a boolean (1 or 0) whether or not the point is valid. -*/ -LAS_DLL int LASPoint_IsValid(LASPointH hPoint); - -/** Creates a new empty LASPointH instance - * @return LASPointH instance. If the value is NULL use the - * LASError_GetLastError* methods to determine the problem -*/ -LAS_DLL LASPointH LASPoint_Create(void); - -/** Creates a copy of a LASPointH instance - * @param hPoint the LASPointH instance to copy - * @return new LASPointH instance. If the value is NULL use the - * LASError_GetLastError* methods to determine the problem -*/ -LAS_DLL LASPointH LASPoint_Copy(const LASPointH); - -/** Destroys/deletes a LASPointH instance -*/ -LAS_DLL void LASPoint_Destroy(LASPointH hPoint); - -/****************************************************************************/ -/* Header operations */ -/****************************************************************************/ - -/** Copies a LASHeaderH instance - * @param hHeader the LASHeaderH to copy - * @return a LASHeaderH instance or NULL on error -*/ -LAS_DLL LASHeaderH LASHeader_Copy(const LASHeaderH hHeader); - -/** Creates an empty LASHeaderH with default values -*/ -LAS_DLL LASHeaderH LASHeader_Create(void); - -/** Destroys/deletes a LASHeader instance -*/ -LAS_DLL void LASHeader_Destroy(LASHeaderH hHeader); - -/** Returns the file signature the the file. This should always be 'LASF' - * @param hHeader LASHeaderH instance - * @return the file signature the the file. This should always be 'LASF' -*/ -LAS_DLL char *LASHeader_GetFileSignature(const LASHeaderH hHeader); - -/** Returns the file source id for the file. It is a number from 1-65535 - * @param hHeader LASHeaderH instance - * @return the file source id for the file. -*/ -LAS_DLL uint16_t LASHeader_GetFileSourceId(const LASHeaderH hHeader); - -/** Sets the FileSource ID value for the header. By default, this value is "0" if it - * is not explicitly set. See the LAS specification for details on what this - * value should logically be set to. - * @param hHeader LASHeaderH instance - * @param value the value to set as the FileSource ID value for the header - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetFileSourceId(LASHeaderH hHeader, uint16_t value); - -/** Returns the project id for the header as a GUID string - * @return the project id for the header as a GUID string -*/ -LAS_DLL char *LASHeader_GetProjectId(const LASHeaderH hHeader); - -/** Sets the project id/GUID for the header - * @param hHeader LASHeaderH instance - * @param value character value GUID to set the header value to - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetProjectId(LASHeaderH hHeader, const char* value); - -/** Sets the project id/GUID for the header - * @param hHeader LASHeaderH instance - * @param hId LASGuidH instance to set the GUID for the header to - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId); - -/** Returns the major version number for the header. This value is expected - * to always be 1. - * @param hHeader LASHeaderH instance - * @return major version number for the header. -*/ -LAS_DLL uint8_t LASHeader_GetVersionMajor(const LASHeaderH hHeader); - -/** Sets the major version number for the header. All values other than 1 - * are invalid. - * @param hHeader LASHeaderH instance - * @param value integer value to set the major version to (only the value 1 is valid) - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetVersionMajor(LASHeaderH hHeader, uint8_t value); - -/** Returns the min version number for the header. This value is expected - * to be 1 or 0 representing LAS 1.1 or LAS 1.0 - * @param hHeader LASHeaderH instance - * @return minor version number for the header. -*/ -LAS_DLL uint8_t LASHeader_GetVersionMinor(const LASHeaderH hHeader); - -/** Sets the minor version number for the header. All values other than 1 or 0 - * are invalid. - * @param hHeader LASHeaderH instance - * @param value integer value to set the minor version to (only the values 1 or 0 are valid) - * @return LASError enum - * - * @todo TODO: Maybe this should return fatal error if version out of range -- hobu -*/ -LAS_DLL LASError LASHeader_SetVersionMinor(LASHeaderH hHeader, uint8_t value); - -/** Returns the System ID for the header. The caller assumes ownership of the returned string - * @return the system id for the header as a character array -*/ -LAS_DLL char *LASHeader_GetSystemId(const LASHeaderH hHeader); - -/** Sets the System ID for the header. By default, this value is "libLAS" if it - * is not explicitly set. See the LAS specification for details on what this - * value should logically be set to. - * @param hHeader LASHeaderH instance - * @param value the value to set as the System ID for the header - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetSystemId(LASHeaderH hHeader, const char* value); - -/** Returns the Software ID for the header. The caller assumes ownership of the returned string - * @return the software id for the header as a character array -*/ -LAS_DLL char *LASHeader_GetSoftwareId(const LASHeaderH hHeader); - -/** Sets the Software ID for the header. By default, this value is "libLAS 1.0" if it - * is not explicitly set. See the LAS specification for details on what this - * value should logically be set to. - * @param hHeader LASHeaderH instance - * @param value the value to set as the Software ID for the header - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetSoftwareId(LASHeaderH hHeader, const char* value); - -/** Returns the reserved value for the header. This should aways be 0. - * @return the reserved value for the header. -*/ -LAS_DLL uint16_t LASHeader_GetReserved(const LASHeaderH hHeader); - -/** Sets the Reserved value for the header. By default, this value is "0" if it - * is not explicitly set. See the LAS specification for details on what this - * value should logically be set to. - * @param hHeader LASHeaderH instance - * @param value the value to set as the reserved value for the header - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetReserved(LASHeaderH hHeader, uint16_t value); - -/** Returns the file creation day of the year. The values start from 1, being January 1st, - * and end at 365 or 366 being December 31st, depending on leap year. - * @return the day of the year as an integer starting from 1 for the file creation. -*/ -LAS_DLL uint16_t LASHeader_GetCreationDOY(const LASHeaderH hHeader); - -/** Sets the file creation day of the year. The values start from 1, being January 1st. No - * date validation is done - * @param hHeader LASHeaderH instance - * @param value the value to set as the creation day - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetCreationDOY(LASHeaderH hHeader, uint16_t value); - -/** Returns the file creation year. This is a four digit number representing the - * year for the file, ie 2003, 2008, etc. - * @return the creation year for the file or 0 if none is set -*/ -LAS_DLL uint16_t LASHeader_GetCreationYear(const LASHeaderH hHeader); - -/** Sets the file creation year. This should be a four digit number representing - * the year for the file, ie 2003, 2008, etc. No validation on the value is done - * @param hHeader LASHeaderH instance - * @param value the value to set for the creation year - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetCreationYear(LASHeaderH hHeader, uint16_t value); - -/** Returns the size of the header for the file in bytes. - * @return the size of the header for the file in bytes. -*/ -LAS_DLL uint16_t LASHeader_GetHeaderSize(const LASHeaderH hHeader); - -/** Returns the byte offset to the start of actual point data for the file - * @param hHeader LASHeaderH instance - * @return the type offset to the start of actual point data for the file -*/ -LAS_DLL uint32_t LASHeader_GetDataOffset(const LASHeaderH hHeader); - -/** Sets the location in number of bytes to start writing point data. Any - * space between the end of the LASVLRHs and this value will be written with 0's. - * @param hHeader LASHeaderH instance - * @param value the long integer to set for byte location determining the end of the header - * @return LASError enum -*/ - LAS_DLL LASError LASHeader_SetDataOffset(const LASHeaderH hHeader, uint32_t value); - -/** Returns the number of variable length records in the header - * @param hHeader LASHeaderH instance - * @return the number of variable length records in the header -*/ -LAS_DLL uint32_t LASHeader_GetRecordsCount(const LASHeaderH hHeader); - -/** Returns the record length for the points based on their data format id in bytes - * @param hHeader LASHeaderH instance - * @return the record length for the points based on their data format id in bytes -*/ -LAS_DLL uint16_t LASHeader_GetDataRecordLength(const LASHeaderH hHeader); - -/** Returns the data format id. If this value is 1, the point data have time values - * associated with them. If it is 0, the point data do not have time values. - * @param hHeader LASHeaderH instance - * @return the data format id for the file. -*/ -LAS_DLL uint8_t LASHeader_GetDataFormatId(const LASHeaderH hHeader); - -/** Sets the data format id for the file. The value should be 1 or 0, with 1 being - * points that contain time values and 0 being points that do not. - * @param hHeader LASHeaderH instance - * @param value the value for the data format id, 1 or 0 are valid values. - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetDataFormatId(const LASHeaderH hHeader, uint8_t value); - -/** Returns the number of point records in the file. This value may not reflect the actual - * number of point records in the file. - * @param hHeader LASHeaderH instance - * @return the number of point records in the file -*/ -LAS_DLL uint32_t LASHeader_GetPointRecordsCount(const LASHeaderH hHeader); - -/** Sets the number of point records for the file. - * @param hHeader LASHeaderH instance - * @param value the long integer to set for the number of point records in the file - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetPointRecordsCount(const LASHeaderH hHeader, uint32_t value); - -/** Returns the number of point records by return. - * @param hHeader LASHeaderH instance - * @param index the return number to fetch the count for - * @return the number of point records for a given return -*/ -LAS_DLL uint32_t LASHeader_GetPointRecordsByReturnCount(const LASHeaderH hHeader, int index); - -/** Sets the number of point records for a given return - * @param hHeader LASHeaderH instance - * @param index the return number to set the count for - * @param value the number of point records for the return - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetPointRecordsByReturnCount(const LASHeaderH hHeader, int index, uint32_t value); - -/** Return the X scale factor - * @param hHeader LASHeaderH instance - * @return the X scale factor -*/ -LAS_DLL double LASHeader_GetScaleX(const LASHeaderH hHeader); - -/** Return the Y scale factor - * @param hHeader LASHeaderH instance - * @return the Y scale factor -*/ -LAS_DLL double LASHeader_GetScaleY(const LASHeaderH hHeader); - -/** Return the Z scale factor - * @param hHeader LASHeaderH instance - * @return the Z scale factor -*/ -LAS_DLL double LASHeader_GetScaleZ(const LASHeaderH hHeader); - -/** Sets the scale factors - * @param hHeader LASHeaderH instance - * @param x the x scale factor - * @param y the y scale factor - * @param z the z scale factor - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetScale(LASHeaderH hHeader, double x, double y, double z); - -/** Return the X offset - * @param hHeader LASHeaderH instance - * @return the X offset -*/ -LAS_DLL double LASHeader_GetOffsetX(const LASHeaderH hHeader); - -/** Return the Y offset - * @param hHeader LASHeaderH instance - * @return the Y offset -*/ -LAS_DLL double LASHeader_GetOffsetY(const LASHeaderH hHeader); - -/** Return the Z offset - * @param hHeader LASHeaderH instance - * @return the Z offset -*/ -LAS_DLL double LASHeader_GetOffsetZ(const LASHeaderH hHeader); - -/** Sets the offset values - * @param hHeader LASHeaderH instance - * @param x the x offset - * @param y the y offset - * @param z the z offset - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetOffset(LASHeaderH hHeader, double x, double y, double z); - -/** Return the minimum x value - * @param hHeader LASHeaderH instance - * @return the minimum x value -*/ -LAS_DLL double LASHeader_GetMinX(const LASHeaderH hHeader); - -/** Return the minimum y value - * @param hHeader LASHeaderH instance - * @return the minimum y value -*/ -LAS_DLL double LASHeader_GetMinY(const LASHeaderH hHeader); - -/** Return the minimum z value - * @param hHeader LASHeaderH instance - * @return the minimum z value -*/ -LAS_DLL double LASHeader_GetMinZ(const LASHeaderH hHeader); - -/** Sets the minimum values - * @param hHeader LASHeaderH instance - * @param x the x minimum - * @param y the y minimum - * @param z the z minimum - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetMin(LASHeaderH hHeader, double x, double y, double z); - -/** Return the maximum x value - * @param hHeader LASHeaderH instance - * @return the maximum x value -*/ -LAS_DLL double LASHeader_GetMaxX(const LASHeaderH hHeader); - -/** Return the maximum y value - * @param hHeader LASHeaderH instance - * @return the maximum y value -*/ -LAS_DLL double LASHeader_GetMaxY(const LASHeaderH hHeader); - -/** Return the maximum z value - * @param hHeader LASHeaderH instance - * @return the maximum z value -*/ -LAS_DLL double LASHeader_GetMaxZ(const LASHeaderH hHeader); - -/** Sets the maximum values - * @param hHeader LASHeaderH instance - * @param x the x maximum - * @param y the y maximum - * @param z the z maximum - * @return LASError enum -*/ -LAS_DLL LASError LASHeader_SetMax(LASHeaderH hHeader, double x, double y, double z); - -/** Returns the VLR record for the given index. Use LASHeader_GetRecordsCount to - * determine the number of VLR records available on the header. - * @param hHeader the LASHeaderH instance - * @param i the index starting from 0 of the VLR to fetch - * @return LASVLRH instance that models the Variable Length Record -*/ -LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, uint32_t i); - -/** Deletes a VLR record from the header for the given index. - * @param hHeader the LASHeaderH instance - * @param index the index starting from 0 of the VLR to delete - * @return LASErrorEnum -*/ -LAS_DLL LASError LASHeader_DeleteVLR(LASHeaderH hHeader, uint32_t index); - -/** Adds a VLR record to the header. - * @param hHeader the LASHeaderH instance - * @param hVLR the VLR to add to the header - * @return LASErrorEnum -*/ -LAS_DLL LASError LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR); - -/****************************************************************************/ -/* Writer Operations */ -/****************************************************************************/ - -/** Creates a new LASWriterH for write operations on LAS files. The file may - * be opened in either LAS_MODE_APPEND or LAS_MODE_WRITE, but the file cannot - * be open by another other operations (another LASReaderH or LASWriterH). - * @param filename The filename to open to write - * @param hHeader an opaque pointer to a LASHeaderH that will be written to - * the file as part of the opening for write operation. - * @param mode a mode value to denote whether to open for write or append - * operations. Valid values are LAS_MODE_APPEND and LAS_MODE_WRITE. -*/ -LAS_DLL LASWriterH LASWriter_Create(const char* filename, const LASHeaderH hHeader, int mode); - -/** Writes a point to the file. The location of where the point is writen is - * determined by the mode the file is opened in, and what the last operation was. - * For example, if the file was opened for append, the next point would be written - * at the end of the file. Likewise, if the file is opened in write mode, even - * if the file already existed, the next WritePoint operation will happen at the - * end of the header and all of the existing points in the file will be overwritten. - * @param hWriter opaque pointer to the LASWriterH instance - * @param hPoint the opaque LASPointH pointer to write - * @return LE_None if no error occurred during the write operation. -*/ -LAS_DLL LASError LASWriter_WritePoint(const LASWriterH hWriter, const LASPointH hPoint); - -/** Overwrites the header for the file represented by the LASWriterH. It does - * not matter if the file is opened for append or for write. - * @param hWriter opaque pointer to the LASWriterH instance - * @param hHeader LASHeaderH instance to write into the file - * @return LE_None if no error occurred during the operation. -*/ - -LAS_DLL LASError LASWriter_WriteHeader(const LASWriterH hWriter, const LASHeaderH hHeader); - -/** Destroys the LASWriterH instance, effectively closing the file and performing - * housekeeping operations. - * @param hWriter LASWriterH instance to close -*/ -LAS_DLL void LASWriter_Destroy(LASWriterH hWriter); - - -LAS_DLL LASError LASWriter_SetSRS(LASWriterH hWriter, const LASSRSH hSRS); - -/****************************************************************************/ -/* GUID Operations */ -/****************************************************************************/ - -/** Returns the GUID value for the header as an opaque LASGuidH pointer. - * @param hHeader the opaque pointer to the LASHeaderH - * @return the GUID value for the header as an opaque LASGuidH pointer. -*/ -LAS_DLL LASGuidH LASHeader_GetGUID(const LASHeaderH hHeader); - -/** Returns a new random GUID. - * @return a new random GUID -*/ -LAS_DLL LASGuidH LASGuid_Create(); - -/** Creates a new GUID opaque pointer using the given string. - * @param string A GUID string in the form "00000000-0000-0000-0000-000000000000" - * An example GUID might be something like '8388F1B8-AA1B-4108-BCA3-6BC68E7B062E' - * @return the GUID value as an opaque LASGuidH pointer. -*/ -LAS_DLL LASGuidH LASGuid_CreateFromString(const char* string); - -/** Destroys a GUID opaque pointer and removes it from the heap - * @param hId the GUID value to destroy as an opaque LASGuidH pointer. -*/ -LAS_DLL void LASGuid_Destroy(LASGuidH hId); - -/** Determines if two GUIDs are equal. - * @param hId1 the first GUID - * @param hId2 the second GUID - * @return 0 if false, 1 if true. Use the LASError_GetLastError* methods to - * determine if an error occured during the operation of this function. -*/ -LAS_DLL int LASGuid_Equals(LASGuidH hId1, LASGuidH hId2); - -/** Returns a string representation of the GUID opqaue pointer. The caller - * owns the string. - * @param hId the LASGuidH pointer - * @return a string representation of the GUID opaque pointer. -*/ -LAS_DLL char* LASGuid_AsString(LASGuidH hId); - -/****************************************************************************/ -/* VLR Operations */ -/****************************************************************************/ - -/** Creates a new VLR record - * @return a new VLR record -*/ -LAS_DLL LASVLRH LASVLR_Create(void); - -/** Destroys a VLR record and removes it from the heap -*/ -LAS_DLL void LASVLR_Destroy(LASVLRH hVLR); - -/** Returns the User Id for the VLR - * @param hVLR the LASVLRH instance - * @return the User Id for the VLR -*/ -LAS_DLL char* LASVLR_GetUserId(const LASVLRH hVLR); - -/** Sets the User Id for the VLR - * @param hVLR the LASVLRH instance - * @param value the value to set for the User Id. It will be clipped to fit - * within 16 characters - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_SetUserId(LASVLRH hVLR, const char* value); - -/** Gets the description for the VLR - * @param hVLR the LASVLRH instance - * @return the description for the VLR -*/ -LAS_DLL char* LASVLR_GetDescription(const LASVLRH hVLR); - -/** Sets the description for the VLR - * @param hVLR the LASVLRH instance - * @param value the value to set for the description. It will be clipped to fit - * within 32 characters - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_SetDescription(LASVLRH hVLR, const char* value); - -/** Returns the record length of the data stored in the VLR - * @param hVLR the LASVLRH instance - * @return the record length of the data stored in the VLR -*/ -LAS_DLL uint16_t LASVLR_GetRecordLength(const LASVLRH hVLR); - -/** Sets the record length of the data stored in the VLR - * @param hVLR the LASVLRH instance - * @param value the length to set for the VLR data length - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_SetRecordLength(LASVLRH hVLR, uint16_t value); - -/** Gets the record id for the VLR - * @param hVLR the LASVLRH instance - * @return the record id for the VLR -*/ -LAS_DLL uint16_t LASVLR_GetRecordId(const LASVLRH hVLR); - -/** Sets the record id for the VLR - * @param hVLR the LASVLRH instance - * @param value the record id to set - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_SetRecordId(LASVLRH hVLR, uint16_t value); - -/** Gets the reserved value of the VLR. This should be 0 and should aways be 0. - * @param hVLR the LASVLRH instance - * @return the reserved value of the VLR. -*/ -LAS_DLL uint16_t LASVLR_GetReserved(const LASVLRH hVLR); - -/** Sets the reserved value of the VLR. This should be 0 and you should not - * have to ever monkey with this value according to the spec. - * @param hVLR the LASVLRH instance - * @param value the value to set for the reserved value - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_SetReserved(LASVLRH hVLR, uint16_t value); - -/** Gets the data stream for the VLR as an array of bytes. The length of this - * array should be the same as LASVLR_GetRecordLength. You must allocate it on - * the heap and you are responsible for its destruction. - * @param hVLR the LASVLRH instance - * @param data a pointer to your array where you want the data copied - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t* data); - -/** Sets the data stream for the VLR as an array of bytes. The length of this - * array should be the same as LASVLR_GetRecordLength. The data are copied into - * the VLR structure. - * @param hVLR the LASVLRH instance - * @param data a pointer to your array. It must be LASVLR_GetRecordLength in size - * @return LASErrorEnum -*/ -LAS_DLL LASError LASVLR_SetData(const LASVLRH hVLR, uint8_t* data, uint16_t length); - - -/****************************************************************************/ -/* Color Operations */ -/****************************************************************************/ - -/** Creates a new Color - * @return a new Color -*/ -LAS_DLL LASColorH LASColor_Create(void); - -/** Destroys a Color and removes it from the heap -*/ -LAS_DLL void LASColor_Destroy(LASColorH hColor); - -/** Returns the red value for the color. - * @return the red value for the color. -*/ -LAS_DLL uint16_t LASColor_GetRed(const LASColorH hColor); - -/** Sets the red value for the color - * @param hColor the opaque pointer to the LASColorH instance - * @param value the value to set the red value to - * @return an error number if an error occured. -*/ -LAS_DLL LASError LASColor_SetRed(LASColorH hColor, uint16_t value); - -/** Returns the green value for the color. - * @return the green value for the color. -*/ -LAS_DLL uint16_t LASColor_GetGreen(const LASColorH hColor); - -/** Sets the green value for the color - * @param hColor the opaque pointer to the LASColorH instance - * @param value the value to set the green value to - * @return an error number if an error occured. -*/ -LAS_DLL LASError LASColor_SetGreen(LASColorH hColor, uint16_t value); - -/** Returns the blue value for the color. - * @return the blue value for the color. -*/ -LAS_DLL uint16_t LASColor_GetBlue(const LASColorH hColor); - -/** Sets the blue value for the color - * @param hColor the opaque pointer to the LASColorH instance - * @param value the value to set the blue value to - * @return an error number if an error occured. -*/ -LAS_DLL LASError LASColor_SetBlue(LASColorH hColor, uint16_t value); - - -/** Returns the color for the LASPointH - * @return the color for the LASPointH. -*/ -LAS_DLL LASColorH LASPoint_GetColor(const LASPointH hPoint); - -/** Sets the color for the point - * @param hPoint the opaque pointer to the LASPointH instance - * @param hColor the opaque pointer to the LASColorH instance - * @return an error number if an error occured. -*/ -LAS_DLL LASError LASPoint_SetColor(LASPointH hPoint, const LASColorH hColor); - - -/****************************************************************************/ -/* SRS Operations */ -/****************************************************************************/ - -/** Creates a new SRS - * @return a new SRS -*/ -LAS_DLL LASSRSH LASSRS_Create(void); - - -LAS_DLL const GTIF* LASSRS_GetGTIF(LASSRSH hSRS); -LAS_DLL char* LASSRS_GetWKT(LASSRSH hSRS); -LAS_DLL LASError LASSRS_SetWKT(LASSRSH hSRS, const char* value); -LAS_DLL char* LASSRS_GetProj4(LASSRSH hSRS); -LAS_DLL LASError LASSRS_SetProj4(LASSRSH hSRS, const char* value); -LAS_DLL LASSRSH LASHeader_GetSRS(const LASHeaderH hHeader); -LAS_DLL LASError LASHeader_SetSRS(LASHeaderH hHeader, const LASSRSH hSRS); -LAS_DLL void LASSRS_Destroy(LASSRSH hSRS); -LAS_DLL LASVLRH LASSRS_GetVLR(const LASSRSH hSRS, uint32_t i); -LAS_DLL uint32_t LASSRS_GetVLRCount(const LASSRSH hSRS); - -/** Method to ensure that you are freeing char*'s from the - * correct heap. - * @param string the string to free -*/ -LAS_DLL void LASString_Free(char* string); - -LAS_C_END -#endif - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/cstdint.hpp work/liblas-src-1.2.1/include/liblas/cstdint.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/cstdint.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/cstdint.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,173 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Integer types definitions - * Author: Mateusz Loskot, mateusz@loskot.net - * - * This file has been stolen from and - * modified for libLAS purposes. - * - * (C) Copyright Mateusz Loskot 2007, mateusz@loskot.net - * (C) Copyright Phil Vachon 2007, philippe@cowpig.ca - * (C) Copyright John Maddock 2001 - * (C) Copyright Jens Mauer 2001 - * (C) Copyright Beman Dawes 1999 - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) - * - ****************************************************************************** - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_CSTDINT_HPP_INCLUDED -#define LIBLAS_CSTDINT_HPP_INCLUDED - -#ifdef LIBLAS_C_API -# include -# ifndef _MSC_VER -# include -# endif /* _MSC_VER */ -#else /* LIBLAS_C_API */ -# include -namespace liblas -{ -#endif /* LIBLAS_C_API */ - -/* -// These are fairly safe guesses for some 16-bit, and most 32-bit and 64-bit -// platforms. For other systems, they will have to be hand tailored. -// -// Because the fast types are assumed to be the same as the undecorated types, -// it may be possible to hand tailor a more efficient implementation. Such -// an optimization may be illusionary; on the Intel x86-family 386 on, for -// example, byte arithmetic and load/stores are as fast as "int" sized ones. - -// 8-bit types ------------------------------------------------------------// -*/ - -#ifndef UINT8_C -# if UCHAR_MAX == 0xff - typedef unsigned char uint8_t; - typedef signed char int8_t; -# else -# error defaults not correct; you must hand modify liblas/cstdint.hpp -# endif -#else -# ifndef LIBLAS_C_API - typedef ::uint8_t uint8_t; - typedef ::int8_t int8_t; -# endif - -#endif /* UINT8_C */ - -/* -// 16-bit types -----------------------------------------------------------// -*/ - -#ifndef UINT16_C -# if USHRT_MAX == 0xffff - typedef unsigned short uint16_t; - typedef short int16_t; -# else -# error defaults not correct; you must hand modify liblas/cstdint.hpp -# endif -#else -# ifndef LIBLAS_C_API - typedef ::uint16_t uint16_t; - typedef ::int16_t int16_t; -# endif -#endif /* UINT16_C */ - -/* -// 32-bit types -----------------------------------------------------------// -*/ - -#ifndef UINT32_C -# if ULONG_MAX == 0xffffffff - typedef unsigned long uint32_t; -# elif UINT_MAX == 0xffffffff - typedef unsigned int uint32_t; -# else -# error defaults not correct; you must hand modify liblas/cstdint.hpp -# endif -#else -# ifndef LIBLAS_C_API - typedef ::uint32_t uint32_t; -# endif -#endif /* UINT32_C */ - -#ifndef INT32_C -# if ULONG_MAX == 0xffffffff - typedef long int32_t; -# elif UINT_MAX == 0xffffffff - typedef int int32_t; -# else -# error defaults not correct; you must hand modify liblas/cstdint.hpp -# endif -#else -# ifndef LIBLAS_C_API - typedef ::int32_t int32_t; -# endif -#endif /* INT32_C */ - -/* -// 64-bit types + intmax_t and uintmax_t ----------------------------------// -*/ - -#ifndef UINT64_C -# if ULONG_MAX != 0xffffffffu -# if ULONG_MAX == 18446744073709551615u /* 2**64 - 1 */ - typedef long int64_t; - typedef unsigned long uint64_t; -# else -# error defaults not correct; you must hand modify boost/cstdint.hpp -# endif -# elif defined(__GNUC__) || defined(HAVE_LONG_LONG) - __extension__ typedef long long int64_t; - __extension__ typedef unsigned long long uint64_t; -# elif defined(_MSC_VER) -/* // we have Borland/Intel/Microsoft __int64: */ - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; -# else /* // assume no 64-bit integers */ -# define LIBLAS_NO_INT64_T -# endif -#endif /* UINT64_C */ - -#ifndef LIBLAS_C_API -} /* namespace liblas */ -#endif /* LIBLAS_C_API */ - -#endif /* LIBLAS_CSTDINT_HPP_INCLUDED */ - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/endian.hpp work/liblas-src-1.2.1/include/liblas/detail/endian.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/endian.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/endian.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,127 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Endian macros - * Author: Mateusz Loskot, mateusz@loskot.net - * - * This file has been stolen from and - * modified for libLAS purposes. - * - * (C) Copyright Mateusz Loskot 2007, mateusz@loskot.net - * (C) Copyright Caleb Epstein 2005 - * (C) Copyright John Maddock 2006 - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) - * - * Revision History - * 06 Feb 2006 - Initial Revision - * 09 Nov 2006 - fixed variant and version bits for v4 guids - * 13 Nov 2006 - added serialization - * 17 Nov 2006 - added name-based guid creation - * 20 Nov 2006 - add fixes for gcc (from Tim Blechmann) - * 07 Mar 2007 - converted to header only - * 20 Jan 2008 - removed dependency of Boost and modified for libLAS (by Mateusz Loskot) - ****************************************************************************** - * - * Copyright (c) 1997 - * Silicon Graphics Computer Systems, Inc. - * - * Permission to use, copy, modify, distribute and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. Silicon Graphics makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * - * - * Copyright notice reproduced from , from - * which this code was originally taken. - * - * Modified by Caleb Epstein to use with GNU libc and to - * defined the BOOST_ENDIAN macro. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_ENDIAN_HPP_INCLUDED -#define LIBLAS_DETAIL_ENDIAN_HPP_INCLUDED - -// GNU libc offers the helpful header which defines -// __BYTE_ORDER - -#if defined (__GLIBC__) -# include -# if (__BYTE_ORDER == __LITTLE_ENDIAN) -# define LIBLAS_LITTLE_ENDIAN -# elif (__BYTE_ORDER == __BIG_ENDIAN) -# define LIBLAS_BIG_ENDIAN -# elif (__BYTE_ORDER == __PDP_ENDIAN) -# define LIBLAS_PDP_ENDIAN -# else -# error Unknown machine endianness detected. -# endif -# define LIBLAS_BYTE_ORDER __BYTE_ORDER -#elif defined(_BIG_ENDIAN) -# define LIBLAS_BIG_ENDIAN -# define LIBLAS_BYTE_ORDER 4321 -#elif defined(_LITTLE_ENDIAN) -# define LIBLAS_LITTLE_ENDIAN -# define LIBLAS_BYTE_ORDER 1234 - -// If they're both defined, we're assuming little for now. See http://liblas.org/ticket/133 -#elif defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) -# define LIBLAS_LITTLE_ENDIAN -# define LIBLAS_BYTE_ORDER 1234 - -#elif defined(__sparc) || defined(__sparc__) \ - || defined(_POWER) || defined(__powerpc__) \ - || defined(__ppc__) || defined(__hpux) \ - || defined(_MIPSEB) || defined(_POWER) \ - || defined(__s390__) -# define LIBLAS_BIG_ENDIAN -# define LIBLAS_BYTE_ORDER 4321 -#elif defined(__i386__) || defined(__alpha__) \ - || defined(__ia64) || defined(__ia64__) \ - || defined(_M_IX86) || defined(_M_IA64) \ - || defined(_M_ALPHA) || defined(__amd64) \ - || defined(__amd64__) || defined(_M_AMD64) \ - || defined(__x86_64) || defined(__x86_64__) \ - || defined(_M_X64) - -# define LIBLAS_LITTLE_ENDIAN -# define LIBLAS_BYTE_ORDER 1234 -#else -# error The file liblas/detail/endian.hpp needs to be set up for your CPU type. -#endif - - -#if defined(LIBLAS_BIG_ENDIAN) -# define LIBLAS_SWAP_BYTES(p) \ - do { \ - char* first = static_cast(static_cast(&p)); \ - char* last = first + sizeof(p) - 1; \ - for(; first < last; ++first, --last) { \ - char const x = *last; \ - *last = *first; \ - *first = x; \ - }} while(false) - -# define LIBLAS_SWAP_BYTES_N(p, n) \ - do { \ - char* first = static_cast(static_cast(&p)); \ - char* last = first + n - 1; \ - for(; first < last; ++first, --last) { \ - char const x = *last; \ - *last = *first; \ - *first = x; \ - }} while(false) - -#else -# define LIBLAS_SWAP_BYTES(p) do {} while(false) -# define LIBLAS_SWAP_BYTES_N(p, n) do {} while(false) -#endif // LIBLAS_BIG_ENDIAN - -#endif // LIBLAS_DETAIL_ENDIAN_HPP_INCLUDED - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/file.hpp work/liblas-src-1.2.1/include/liblas/detail/file.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/file.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/file.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,90 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: A composite class to handle read/write operations - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_FILE_HPP_INCLUDED -#define LIBLAS_DETAIL_FILE_HPP_INCLUDED - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace liblas { namespace detail { - -class FileImpl -{ -public: - - FileImpl(std::string const& filename); - FileImpl(std::string const& filename, LASHeader const& header, int mode); - ~FileImpl(); - - std::string GetName() const; - int GetMode() const; - LASHeader const& GetHeader() const; - LASReader& GetReader(); - LASWriter& GetWriter(); - -private: - - // Blocked copying operations, declared but not defined. - FileImpl(FileImpl const& other); - FileImpl& operator=(FileImpl const& rhs); - - int m_mode; - std::string m_filename; - std::istream* m_istrm; - std::ostream* m_ostrm; - LASReader* m_reader; - LASWriter* m_writer; - LASHeader m_header; - - void throw_no_file_error() const; -}; - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_FILE_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/fwd.hpp work/liblas-src-1.2.1/include/liblas/detail/fwd.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/fwd.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/fwd.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,64 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Forward declarations for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_FWD_HPP_INCLUDED -#define LIBLAS_DETAIL_FWD_HPP_INCLUDED - -// Forward declarations -namespace liblas { - -class LASHeader; -class LASPoint; -class LASReader; -class LASWriter; -class LASColor; -class LASSpatialReference; - -namespace detail { - -class Reader; -class Writer; -struct PointRecord; -struct Color; - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_FWD_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader.hpp work/liblas-src-1.2.1/include/liblas/detail/reader.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/reader.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,110 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Reader implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_READER_HPP_INCLUDED -#define LIBLAS_DETAIL_READER_HPP_INCLUDED - -#include -#include -#include - -#ifndef HAVE_GDAL - typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH; - typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH; -#endif - -// std -#include - -namespace liblas { namespace detail { - -struct PointRecord; - -class Reader -{ -public: - - Reader(std::istream& ifs); - virtual ~Reader(); - virtual std::size_t GetVersion() const = 0; - virtual bool ReadHeader(LASHeader& header) = 0; - virtual bool ReadNextPoint(LASPoint& point, const LASHeader& header) = 0; - virtual bool ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) = 0; - - std::istream& GetStream() const; - bool ReadVLR(LASHeader& header); - bool ReadGeoreference(LASHeader& header); - void Reset(LASHeader const& header); - void SetSRS(const LASSpatialReference& srs); - -protected: - - std::istream& m_ifs; - uint32_t m_size; - uint32_t m_current; - LASSpatialReference m_out_srs; - LASSpatialReference m_in_srs; - OGRCoordinateTransformationH m_transform; - OGRSpatialReferenceH m_in_ref; - OGRSpatialReferenceH m_out_ref; - - void FillPoint(PointRecord& record, LASPoint& point); - void Project(LASPoint& point); - -private: - - // Blocked copying operations, declared but not defined. - Reader(Reader const& other); - Reader& operator=(Reader const& rhs); -}; - -class ReaderFactory -{ -public: - - // TODO: prototypes - static Reader* Create(std::istream& ifs); - static void Destroy(Reader* p); -}; - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_READER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader10.hpp work/liblas-src-1.2.1/include/liblas/detail/reader10.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader10.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/reader10.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,68 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.0 reader implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_READER10_HPP_INCLUDED -#define LIBLAS_DETAIL_READER10_HPP_INCLUDED - -#include -#include -// std -#include - -namespace liblas { namespace detail { namespace v10 { - -class ReaderImpl : public Reader -{ -public: - - typedef Reader Base; - - ReaderImpl(std::istream& ifs); - std::size_t GetVersion() const; - bool ReadHeader(LASHeader& header); - bool ReadNextPoint(LASPoint& point, const LASHeader& header); - bool ReadPointAt(std::size_t n, LASPoint& record, const LASHeader& header); - -}; - -}}} // namespace liblas::detail::v10 - -#endif // LIBLAS_DETAIL_READER10_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader11.hpp work/liblas-src-1.2.1/include/liblas/detail/reader11.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader11.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/reader11.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,68 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.1 reader implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_READER11_HPP_INCLUDED -#define LIBLAS_DETAIL_READER11_HPP_INCLUDED - -#include -#include -// std -#include - -namespace liblas { namespace detail { namespace v11 { - -class ReaderImpl : public Reader -{ -public: - - typedef Reader Base; - - ReaderImpl(std::istream& ifs); - std::size_t GetVersion() const; - bool ReadHeader(LASHeader& header); - bool ReadNextPoint(LASPoint& point, const LASHeader& header); - bool ReadPointAt(std::size_t n, LASPoint& record, const LASHeader& header); - -}; - -}}} // namespace liblas::detail::v11 - -#endif // LIBLAS_DETAIL_READER11_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader12.hpp work/liblas-src-1.2.1/include/liblas/detail/reader12.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/reader12.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/reader12.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,68 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.2 reader implementation for C++ libLAS - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_READER12_HPP_INCLUDED -#define LIBLAS_DETAIL_READER12_HPP_INCLUDED - -#include -#include -// std -#include - -namespace liblas { namespace detail { namespace v12 { - -class ReaderImpl : public Reader -{ -public: - - typedef Reader Base; - - ReaderImpl(std::istream& ifs); - std::size_t GetVersion() const; - bool ReadHeader(LASHeader& header); - bool ReadNextPoint(LASPoint& point, LASHeader const& header); - bool ReadPointAt(std::size_t n, LASPoint& record, LASHeader const& header); - -}; - -}}} // namespace liblas::detail::v12 - -#endif // LIBLAS_DETAIL_READER12_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/sha1.hpp work/liblas-src-1.2.1/include/liblas/detail/sha1.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/sha1.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/sha1.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,625 +0,0 @@ -// $Id$ -// -// sha1.h -// -// Copyright (C) 1998 -// Paul E. Jones -// All Rights Reserved. -// -// This software is licensed as "freeware." Permission to distribute -// this software in source and binary forms is hereby granted without -// a fee. THIS SOFTWARE IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED -// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// THE AUTHOR SHALL NOT BE HELD LIABLE FOR ANY DAMAGES RESULTING -// FROM THE USE OF THIS SOFTWARE, EITHER DIRECTLY OR INDIRECTLY, INCLUDING, -// BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE. -// -////////////////////////////////////////////////////////////////////////////// -// ###Id: sha1.h,v 1.6 2004/03/27 18:02:26 paulej Exp ### -// Modified March 7, 2007 - Andy Tompkins - change to a header only library -////////////////////////////////////////////////////////////////////////////// -// -// Description: -// This class implements the Secure Hashing Standard as defined -// in FIPS PUB 180-1 published April 17, 1995. -// -// Many of the variable names in this class, especially the single -// character names, were used because those were the names used -// in the publication. -// -// The Secure Hashing Standard, which uses the Secure Hashing -// Algorithm (SHA), produces a 160-bit message digest for a -// given data stream. In theory, it is highly improbable that -// two messages will produce the same message digest. Therefore, -// this algorithm can serve as a means of providing a "fingerprint" -// for a message. -// -// Portability Issues: -// SHA-1 is defined in terms of 32-bit "words". This code was -// written with the expectation that the processor has at least -// a 32-bit machine word size. If the machine word size is larger, -// the code should still function properly. One caveat to that -// is that the input functions taking characters and character arrays -// assume that only 8 bits of information are stored in each character. -// -// Caveats: -// SHA-1 is designed to work with messages less than 2^64 bits long. -// Although SHA-1 allows a message digest to be generated for -// messages of any number of bits less than 2^64, this implementation -// only works with messages with a length that is a multiple of 8 -// bits. -// -#ifndef LIBLAS_SHA1_HPP_INCLUDED -#define LIBLAS_SHA1_HPP_INCLUDED - -namespace liblas { namespace detail { - -class SHA1 -{ -public: - /* - * SHA1 - * - * Description: - * This is the constructor for the sha1 class. - * - * Parameters: - * None. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - SHA1() - { - Reset(); - } - - /* - * ~SHA1 - * - * Description: - * This is the destructor for the sha1 class - * - * Parameters: - * None. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - ~SHA1() - { - // The destructor does nothing - } - - /* - * Reset - * - * Description: - * This function will initialize the sha1 class member variables - * in preparation for computing a new message digest. - * - * Parameters: - * None. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - void Reset() - { - Length_Low = 0; - Length_High = 0; - Message_Block_Index = 0; - - H[0] = 0x67452301; - H[1] = 0xEFCDAB89; - H[2] = 0x98BADCFE; - H[3] = 0x10325476; - H[4] = 0xC3D2E1F0; - - Computed = false; - Corrupted = false; - } - - /* - * Result - * - * Description: - * This function will return the 160-bit message digest into the - * array provided. - * - * Parameters: - * message_digest_array: [out] - * This is an array of five unsigned integers which will be filled - * with the message digest that has been computed. - * - * Returns: - * True if successful, false if it failed. - * - * Comments: - * - */ - bool Result(unsigned *message_digest_array) - { - int i; // Counter - - if (Corrupted) - { - return false; - } - - if (!Computed) - { - PadMessage(); - Computed = true; - } - - for(i = 0; i < 5; i++) - { - message_digest_array[i] = H[i]; - } - - return true; - } - - /* - * Input - * - * Description: - * This function accepts an array of octets as the next portion of - * the message. - * - * Parameters: - * message_array: [in] - * An array of characters representing the next portion of the - * message. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - void Input( const unsigned char *message_array, - unsigned length) - { - if (!length) - { - return; - } - - if (Computed || Corrupted) - { - Corrupted = true; - return; - } - - while(length-- && !Corrupted) - { - Message_Block[Message_Block_Index++] = (*message_array & 0xFF); - - Length_Low += 8; - Length_Low &= 0xFFFFFFFF; // Force it to 32 bits - if (Length_Low == 0) - { - Length_High++; - Length_High &= 0xFFFFFFFF; // Force it to 32 bits - if (Length_High == 0) - { - Corrupted = true; // Message is too long - } - } - - if (Message_Block_Index == 64) - { - ProcessMessageBlock(); - } - - message_array++; - } - } - - /* - * Input - * - * Description: - * This function accepts an array of octets as the next portion of - * the message. - * - * Parameters: - * message_array: [in] - * An array of characters representing the next portion of the - * message. - * length: [in] - * The length of the message_array - * - * Returns: - * Nothing. - * - * Comments: - * - */ - void Input( const char *message_array, - unsigned length) - { - Input((unsigned char *) message_array, length); - } - - /* - * Input - * - * Description: - * This function accepts a single octets as the next message element. - * - * Parameters: - * message_element: [in] - * The next octet in the message. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - void Input(unsigned char message_element) - { - Input(&message_element, 1); - } - - /* - * Input - * - * Description: - * This function accepts a single octet as the next message element. - * - * Parameters: - * message_element: [in] - * The next octet in the message. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - void Input(char message_element) - { - Input((unsigned char *) &message_element, 1); - } - - /* - * operator<< - * - * Description: - * This operator makes it convenient to provide character strings to - * the SHA1 object for processing. - * - * Parameters: - * message_array: [in] - * The character array to take as input. - * - * Returns: - * A reference to the SHA1 object. - * - * Comments: - * Each character is assumed to hold 8 bits of information. - * - */ - SHA1& operator<<(const char *message_array) - { - const char *p = message_array; - - while(*p) - { - Input(*p); - p++; - } - - return *this; - } - - /* - * operator<< - * - * Description: - * This operator makes it convenient to provide character strings to - * the SHA1 object for processing. - * - * Parameters: - * message_array: [in] - * The character array to take as input. - * - * Returns: - * A reference to the SHA1 object. - * - * Comments: - * Each character is assumed to hold 8 bits of information. - * - */ - SHA1& operator<<(const unsigned char *message_array) - { - const unsigned char *p = message_array; - - while(*p) - { - Input(*p); - p++; - } - - return *this; - } - - /* - * operator<< - * - * Description: - * This function provides the next octet in the message. - * - * Parameters: - * message_element: [in] - * The next octet in the message - * - * Returns: - * A reference to the SHA1 object. - * - * Comments: - * The character is assumed to hold 8 bits of information. - * - */ - SHA1& operator<<(const char message_element) - { - Input((unsigned char *) &message_element, 1); - - return *this; - } - - /* - * operator<< - * - * Description: - * This function provides the next octet in the message. - * - * Parameters: - * message_element: [in] - * The next octet in the message - * - * Returns: - * A reference to the SHA1 object. - * - * Comments: - * The character is assumed to hold 8 bits of information. - * - */ - SHA1& operator<<(const unsigned char message_element) - { - Input(&message_element, 1); - - return *this; - } - -private: - /* - * ProcessMessageBlock - * - * Description: - * This function will process the next 512 bits of the message - * stored in the Message_Block array. - * - * Parameters: - * None. - * - * Returns: - * Nothing. - * - * Comments: - * Many of the variable names in this function, especially the single - * character names, were used because those were the names used - * in the publication. - * - */ - void ProcessMessageBlock() - { - const unsigned K[] = { // Constants defined for SHA-1 - 0x5A827999, - 0x6ED9EBA1, - 0x8F1BBCDC, - 0xCA62C1D6 - }; - int t; // Loop counter - unsigned temp; // Temporary word value - unsigned W[80]; // Word sequence - unsigned A, B, C, D, E; // Word buffers - - /* - * Initialize the first 16 words in the array W - */ - for(t = 0; t < 16; t++) - { - W[t] = ((unsigned) Message_Block[t * 4]) << 24; - W[t] |= ((unsigned) Message_Block[t * 4 + 1]) << 16; - W[t] |= ((unsigned) Message_Block[t * 4 + 2]) << 8; - W[t] |= ((unsigned) Message_Block[t * 4 + 3]); - } - - for(t = 16; t < 80; t++) - { - W[t] = CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]); - } - - A = H[0]; - B = H[1]; - C = H[2]; - D = H[3]; - E = H[4]; - - for(t = 0; t < 20; t++) - { - temp = CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = CircularShift(30,B); - B = A; - A = temp; - } - - for(t = 20; t < 40; t++) - { - temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = CircularShift(30,B); - B = A; - A = temp; - } - - for(t = 40; t < 60; t++) - { - temp = CircularShift(5,A) + - ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = CircularShift(30,B); - B = A; - A = temp; - } - - for(t = 60; t < 80; t++) - { - temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = CircularShift(30,B); - B = A; - A = temp; - } - - H[0] = (H[0] + A) & 0xFFFFFFFF; - H[1] = (H[1] + B) & 0xFFFFFFFF; - H[2] = (H[2] + C) & 0xFFFFFFFF; - H[3] = (H[3] + D) & 0xFFFFFFFF; - H[4] = (H[4] + E) & 0xFFFFFFFF; - - Message_Block_Index = 0; - } - - /* - * PadMessage - * - * Description: - * According to the standard, the message must be padded to an even - * 512 bits. The first padding bit must be a '1'. The last 64 bits - * represent the length of the original message. All bits in between - * should be 0. This function will pad the message according to those - * rules by filling the message_block array accordingly. It will also - * call ProcessMessageBlock() appropriately. When it returns, it - * can be assumed that the message digest has been computed. - * - * Parameters: - * None. - * - * Returns: - * Nothing. - * - * Comments: - * - */ - void PadMessage() - { - /* - * Check to see if the current message block is too small to hold - * the initial padding bits and length. If so, we will pad the - * block, process it, and then continue padding into a second block. - */ - if (Message_Block_Index > 55) - { - Message_Block[Message_Block_Index++] = 0x80; - while(Message_Block_Index < 64) - { - Message_Block[Message_Block_Index++] = 0; - } - - ProcessMessageBlock(); - - while(Message_Block_Index < 56) - { - Message_Block[Message_Block_Index++] = 0; - } - } - else - { - Message_Block[Message_Block_Index++] = 0x80; - while(Message_Block_Index < 56) - { - Message_Block[Message_Block_Index++] = 0; - } - - } - - /* - * Store the message length as the last 8 octets - */ - Message_Block[56] = static_cast((Length_High >> 24) & 0xFF); - Message_Block[57] = static_cast((Length_High >> 16) & 0xFF); - Message_Block[58] = static_cast((Length_High >> 8) & 0xFF); - Message_Block[59] = static_cast((Length_High) & 0xFF); - Message_Block[60] = static_cast((Length_Low >> 24) & 0xFF); - Message_Block[61] = static_cast((Length_Low >> 16) & 0xFF); - Message_Block[62] = static_cast((Length_Low >> 8) & 0xFF); - Message_Block[63] = static_cast((Length_Low) & 0xFF); - - ProcessMessageBlock(); - } - - - /* - * CircularShift - * - * Description: - * This member function will perform a circular shifting operation. - * - * Parameters: - * bits: [in] - * The number of bits to shift (1-31) - * word: [in] - * The value to shift (assumes a 32-bit integer) - * - * Returns: - * The shifted value. - * - * Comments: - * - */ - unsigned CircularShift(int bits, unsigned word) - { - return ((word << bits) & 0xFFFFFFFF) | ((word & 0xFFFFFFFF) >> (32-bits)); - } - -private: - unsigned H[5]; // Message digest buffers - - unsigned Length_Low; // Message length in bits - unsigned Length_High; // Message length in bits - - unsigned char Message_Block[64]; // 512-bit message blocks - int Message_Block_Index; // Index into message block array - - bool Computed; // Is the digest computed? - bool Corrupted; // Is the message digest corruped? -}; - -}} //namespace liblas::detail - -#endif // LIBLAS_SHA1_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/sharedptr.hpp work/liblas-src-1.2.1/include/liblas/detail/sharedptr.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/sharedptr.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/sharedptr.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,132 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Shared pointer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * The SharedPtr class is based on implementation of CountedPtr - * from the book "The C++ Standard Library - A Tutorial and Reference" - * - * (C) Copyright Nicolai M. Josuttis 1999 - * (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net (modifications) - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_SHAREDPTR_HPP_INCLUDED -#define LIBLAS_DETAIL_SHAREDPTR_HPP_INCLUDED -#include - -namespace liblas { namespace detail { - -template -class SharedPtr -{ -public: - - // Initialize pointer with existing pointer, where pointer p - // is required to be a return value of new operator - // TODO: Relax the "0 != p requirement" - // m_count(new long(p ? 1 : 0)) - explicit SharedPtr(T* p = 0) - : m_ptr(p), m_count(new long(1)) - {} - - // Copy pointer (one more owner) - SharedPtr(SharedPtr const& other) throw() - : m_ptr(other.m_ptr), m_count(other.m_count) - { - ++*m_count; - } - - // Destructor (delete value if this was the last owner) - ~SharedPtr() throw() - { - dispose(); - } - - // Assignment operator (unshare old and share new value) - SharedPtr& operator=(SharedPtr const& rhs) throw() - { - if (&rhs != this) - { - dispose(); - m_ptr = rhs.m_ptr; - m_count = rhs.m_count; - ++*m_count; - } - return *this; - } - - T& operator*() const throw() - { - assert(0 != m_ptr); - return *m_ptr; - } - - T* operator->() const throw() - { - assert(0 != m_ptr); - return m_ptr; - } - - T* get() const - { - return m_ptr; - } - - long use_count() const - { - return (*m_count); - } - -private: - - T* m_ptr; - long* m_count; // shared number of owners - - void dispose() - { - - if (--*m_count == 0) - { - delete m_count; - delete m_ptr; - } - } - -}; - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_SHAREDPTR_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/timer.hpp work/liblas-src-1.2.1/include/liblas/detail/timer.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/timer.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/timer.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,102 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: A simple timing class for performance tuning - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_TIMER_HPP_INCLUDED -#define LIBLAS_DETAIL_TIMER_HPP_INCLUDED - -#ifdef WIN32 -#include -#else -#include // gettimeofday -#endif - -namespace liblas { namespace detail { - -class Timer -{ -public: - - Timer() - { -#ifdef WIN32 - LARGE_INTEGER rfreq = { 0 }; - QueryPerformanceFrequency(&rfreq); - m_freq = rfreq.LowPart / double(1000); -#endif - } - - void start() - { -#ifdef WIN32 - QueryPerformanceCounter(&m_start); -#else - gettimeofday(&m_start, 0); -#endif - } - - double stop() - { -#ifdef WIN32 - QueryPerformanceCounter(&m_stop); - return (m_stop.LowPart - m_start.LowPart) / m_freq; -#else - gettimeofday(&m_stop, 0); - return (m_stop.tv_sec - m_start.tv_sec) * double(1000) - + (m_stop.tv_usec - m_start.tv_usec) / double(1000); -#endif - } - -private: - -#ifdef WIN32 - double m_freq; - LARGE_INTEGER m_start; - LARGE_INTEGER m_stop; -#else - timeval m_start; - timeval m_stop; -#endif - -}; - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_TIMER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/utility.hpp work/liblas-src-1.2.1/include/liblas/detail/utility.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/utility.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/utility.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,490 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: A grab bucket 'o fun for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_UTILITY_HPP_INCLUDED -#define LIBLAS_DETAIL_UTILITY_HPP_INCLUDED - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// -// Private macros definition -// - -#ifndef UNREFERENCED_PARAMETER -#define UNREFERENCED_PARAMETER(param) ((void)param) -#endif - -// -// Private utilities for internal use in libLAS -// - -namespace liblas { namespace detail { - -/// Simple RAII wrapper. -/// It's dedicated to use with types associated with custom deleter, -/// opaque pointers and C API objects. -template -class raii_wrapper -{ - typedef void(*deleter_type)(T* p); - -public: - - raii_wrapper(T* p, deleter_type d) - : p_(p), del_(d) - { - assert(0 != p_); - assert(0 != del_); - } - - // FIXME: ooh, this is really, really bad. - hobu - raii_wrapper& operator=(raii_wrapper const& rhs) - { - if (&rhs != this) - { - p_ = rhs.p_; - del_ = rhs.del_; - } - return *this; - } - - - ~raii_wrapper() - { - do_delete(p_); - } - - void reset(T* p) - { - do_delete(p_); - p_= p; - } - - T* get() const - { - return p_; - } - - void swap(raii_wrapper& other) - { - std::swap(p_, other.p_); - } - - -private: - - raii_wrapper(raii_wrapper const& other); - // raii_wrapper& operator=(raii_wrapper const& rhs); - - void do_delete(T* p) - { - assert(del_); - if (0 != p) - del_(p); - } - - T* p_; - deleter_type del_; -}; - - -/// Definition of variable-length record header. -struct VLRHeader -{ - uint16_t reserved; - char userId[16]; - uint16_t recordId; - uint16_t recordLengthAfterHeader; - char description[32]; -}; - -struct GeoKeysHeader -{ - uint16_t keyDirectoryVersion; - uint16_t keyRevision; - uint16_t minorRevision; - uint16_t numberOfKeys; -}; - -struct GeoKeyEntry -{ - uint16_t keyId; - uint16_t tiffTagLocation; - uint16_t count; - uint16_t valueOffset; -}; - -class VariableLengthRecord -{ - VariableLengthRecord() - : reserved(0), record_id(0), record_length_after_header(0) - { - std::memset(user_id, 0, eUserIdSize); - std::memset(description, 0, eDescriptionSize); - } - - enum - { - eUserIdSize = 16, - eDescriptionSize = 32 - }; - - uint16_t reserved; - int8_t user_id[eUserIdSize]; - uint16_t record_id; - uint16_t record_length_after_header; - int8_t description[eDescriptionSize]; - uint8_t data; -}; - -struct PointRecord -{ - PointRecord() : - x(0), y(0), z(0), - intensity(0), - flags(0), - classification(0), - scan_angle_rank(0), - user_data(0), - point_source_id(0) - {} - - int32_t x; - int32_t y; - int32_t z; - uint16_t intensity; - uint8_t flags; // TODO: Replace with portable std::bitset<8> - uint8_t classification; - int8_t scan_angle_rank; - uint8_t user_data; // 1.0: File Marker / 1.1: User Data - uint16_t point_source_id; // 1.0: User Bit field / 1.1: Point Source ID -}; - -template -bool compare_distance(const T& actual, const T& expected); - -template -struct Point -{ - Point() - : x(T()), y(T()), z(T()) - {} - - Point(T const& x, T const& y, T const& z) - : x(x), y(y), z(z) - {} - - bool equal(Point const& other) const - { - return (compare_distance(x, other.x) - && compare_distance(y, other.y) - && compare_distance(z, other.z)); - } - - T x; - T y; - T z; -}; - -template -bool operator==(Point const& lhs, Point const& rhs) -{ - return lhs.equal(rhs); -} - -template -bool operator!=(Point const& lhs, Point const& rhs) -{ - return (!lhs.equal(rhs)); -} - -template -struct Extents -{ - Extents() {} - Extents(detail::Point const& min, detail::Point const& max) - : min(min), max(max) - {} - - bool equal(Extents const& other) const - { - return (min == other.min && max == other.max); - } - - typename detail::Point min; - typename detail::Point max; -}; - -template -bool operator==(Extents const& lhs, Extents const& rhs) -{ - return lhs.equal(rhs); -} - -template -bool operator!=(Extents const& lhs, Extents const& rhs) -{ - return (!lhs.equal(rhs)); -} - -template -inline T generate_random_byte() -{ - // Requires pseudo-random numbers generator to be initialized - // in create_random_based() function - a poor man solution. - T const rmin = std::numeric_limits::min(); - T const rmax = std::numeric_limits::max(); - unsigned int const rnd = std::rand() % rmax + rmin; - - assert(rnd <= 255); - return static_cast(rnd); -} - -template -bool compare_distance(const T& actual, const T& expected) -{ - const T epsilon = std::numeric_limits::epsilon(); - const T diff = actual - expected; - - if ( !((diff <= epsilon) && (diff >= -epsilon )) ) - { - return false; - } - - return true; -} - -template -inline char* as_buffer(T& data) -{ - return static_cast(static_cast(&data)); -} - -template -inline char* as_buffer(T* data) -{ - return static_cast(static_cast(data)); -} - -template -inline char const* as_bytes(T const& data) -{ - return static_cast(static_cast(&data)); -} - -template -inline char const* as_bytes(T const* data) -{ - return static_cast(static_cast(data)); -} - -template -inline void check_stream_state(std::basic_ios& srtm) -{ - // NOTE: Detailed stream check disabled in optimized - // builds to increase performance. -#if defined(DEBUG) || defined(_DEBUG) - // Test stream state bits - if (srtm.eof()) - throw std::out_of_range("end of file encountered"); - else if (srtm.fail()) - throw std::runtime_error("non-fatal I/O error occured"); - else if (srtm.bad()) - throw std::runtime_error("fatal I/O error occured"); -#else - UNREFERENCED_PARAMETER(srtm); -#endif -} - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4127) // conditional expression is constant. -#endif - -template -inline void read_n(T& dest, std::istream& src, std::streamsize const& num) -{ - // TODO: Review and redesign errors handling logic if necessary - if (!src) - throw std::runtime_error("detail::liblas::read_n input stream is not readable"); - - src.read(detail::as_buffer(dest), num); - - // Fix little-endian - LIBLAS_SWAP_BYTES_N(dest, num); - - check_stream_state(src); -} - -template <> -inline void read_n(PointRecord& dest, std::istream& src, std::streamsize const& num) -{ - // TODO: Review and redesign errors handling logic if necessary - if (!src) - throw std::runtime_error("detail::liblas::read_n input stream is not readable"); - - src.read(detail::as_buffer(dest), num); - check_stream_state(src); - - // Fix little-endian - LIBLAS_SWAP_BYTES(dest.x); - LIBLAS_SWAP_BYTES(dest.y); - LIBLAS_SWAP_BYTES(dest.z); - LIBLAS_SWAP_BYTES(dest.intensity); - LIBLAS_SWAP_BYTES(dest.flags); - LIBLAS_SWAP_BYTES(dest.classification); - LIBLAS_SWAP_BYTES(dest.scan_angle_rank); - LIBLAS_SWAP_BYTES(dest.user_data); - LIBLAS_SWAP_BYTES(dest.point_source_id); -} - -template <> -inline void read_n(VLRHeader& dest, std::istream& src, std::streamsize const& num) -{ - // TODO: Review and redesign errors handling logic if necessary - if (!src) - throw std::runtime_error("detail::liblas::read_n input stream is not readable"); - - src.read(detail::as_buffer(dest), num); - check_stream_state(src); - - // Fix little-endian - LIBLAS_SWAP_BYTES(dest.reserved); - LIBLAS_SWAP_BYTES(dest.recordId); - LIBLAS_SWAP_BYTES(dest.recordLengthAfterHeader); -} - -template <> -inline void read_n(std::string& dest, std::istream& src, std::streamsize const& num) -{ - assert(dest.max_size() >= static_cast(num)); - - // TODO: Review and redesign errors handling logic if necessary - if (!src) - throw std::runtime_error("detail::liblas::read_n input stream is not readable"); - - // Read bytes into temporary buffer then assign as string - char* buf = new char[num]; - src.read(buf, num); - dest.assign(buf, num); - delete [] buf; - - assert(dest.size() == static_cast(num)); - check_stream_state(src); -} - -template -inline void write_n(std::ostream& dest, T const& src, std::streamsize const& num) -{ - if (!dest) - throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); - - // Fix little-endian - T& tmp = const_cast(src); - LIBLAS_SWAP_BYTES_N(tmp, num); - - dest.write(detail::as_bytes(tmp), num); - check_stream_state(dest); -} - -template <> -inline void write_n(std::ostream& dest, PointRecord const& src, std::streamsize const& num) -{ - if (!dest) - throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); - - // Fix little-endian - PointRecord& tmp = const_cast(src); - LIBLAS_SWAP_BYTES(tmp.x); - LIBLAS_SWAP_BYTES(tmp.y); - LIBLAS_SWAP_BYTES(tmp.z); - LIBLAS_SWAP_BYTES(tmp.intensity); - LIBLAS_SWAP_BYTES(tmp.flags); - LIBLAS_SWAP_BYTES(tmp.classification); - LIBLAS_SWAP_BYTES(tmp.scan_angle_rank); - LIBLAS_SWAP_BYTES(tmp.user_data); - LIBLAS_SWAP_BYTES(tmp.point_source_id); - - dest.write(detail::as_bytes(tmp), num); - check_stream_state(dest); -} - -template <> -inline void write_n(std::ostream& dest, VLRHeader const& src, std::streamsize const& num) -{ - if (!dest) - throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); - - // Fix little-endian - VLRHeader& tmp = const_cast(src); - LIBLAS_SWAP_BYTES(tmp.reserved); - LIBLAS_SWAP_BYTES(tmp.recordId); - LIBLAS_SWAP_BYTES(tmp.recordLengthAfterHeader); - - dest.write(detail::as_bytes(tmp), num); - check_stream_state(dest); -} - -template <> -inline void write_n(std::ostream& dest, std::string const& src, std::streamsize const& num) -{ - if (!dest) - throw std::runtime_error("detail::liblas::write_n: output stream is not writable"); - - dest.write(src.c_str(), num); - check_stream_state(dest); -} - -#ifdef _MSC_VER -# pragma warning(push) -#endif - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_UTILITY_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer.hpp work/liblas-src-1.2.1/include/liblas/detail/writer.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/writer.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,106 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS writer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_WRITER_HPP_INCLUDED -#define LIBLAS_DETAIL_WRITER_HPP_INCLUDED - -#include -#include -#include - -#ifndef HAVE_GDAL - typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH; - typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH; -#endif - -// std -#include - -namespace liblas { namespace detail { - -class Writer -{ -public: - - Writer(std::ostream& ofs); - virtual ~Writer(); - virtual std::size_t GetVersion() const = 0; - virtual void WriteHeader(LASHeader& header) = 0; - virtual void UpdateHeader(LASHeader const& header) = 0; - virtual void WritePointRecord(LASPoint const& point, const LASHeader& header) = 0; - std::ostream& GetStream() const; - uint32_t WriteVLR(LASHeader const& header); - - void SetSRS(const LASSpatialReference& srs); - -protected: - PointRecord m_record; - std::ostream& m_ofs; - - void FillPointRecord(PointRecord& record, const LASPoint& point, const LASHeader& header); - - void Project(LASPoint& point); - LASSpatialReference m_out_srs; - LASSpatialReference m_in_srs; - - OGRCoordinateTransformationH m_transform; - OGRSpatialReferenceH m_in_ref; - OGRSpatialReferenceH m_out_ref; - -private: - - // Blocked copying operations, declared but not defined. - Writer(Writer const& other); - Writer& operator=(Writer const& rhs); - -}; - -class WriterFactory -{ -public: - - static Writer* Create(std::ostream& ofs, LASHeader const& header); - static void Destroy(Writer* p); -}; - -}} // namespace liblas::detail - -#endif // LIBLAS_DETAIL_WRITER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer10.hpp work/liblas-src-1.2.1/include/liblas/detail/writer10.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer10.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/writer10.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,72 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.0 writer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_WRITER10_HPP_INCLUDED -#define LIBLAS_DETAIL_WRITER10_HPP_INCLUDED - -#include -#include -#include -// std -#include - -namespace liblas { namespace detail { namespace v10 { - -class WriterImpl : public Writer -{ -public: - - typedef Writer Base; - - WriterImpl(std::ostream& ofs); - std::size_t GetVersion() const; - void WriteHeader(LASHeader& header); - void UpdateHeader(LASHeader const& header); - void WritePointRecord(LASPoint const& record, const LASHeader& header); - -private: - - liblas::uint32_t m_pointCount; -}; - -}}} // namespace liblas::detail::v10 - -#endif // LIBLAS_DETAIL_WRITER10_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer11.hpp work/liblas-src-1.2.1/include/liblas/detail/writer11.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer11.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/writer11.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,72 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.1 writer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_WRITER11_HPP_INCLUDED -#define LIBLAS_DETAIL_WRITER11_HPP_INCLUDED - -#include -#include -#include -// std -#include - -namespace liblas { namespace detail { namespace v11 { - -class WriterImpl : public Writer -{ -public: - - typedef Writer Base; - - WriterImpl(std::ostream& ofs); - std::size_t GetVersion() const; - void WriteHeader(LASHeader& header); - void UpdateHeader(LASHeader const& header); - void WritePointRecord(LASPoint const& record, const LASHeader& header); - -private: - - liblas::uint32_t m_pointCount; -}; - -}}} // namespace liblas::detail::v11 - -#endif // LIBLAS_DETAIL_WRITER11_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer12.hpp work/liblas-src-1.2.1/include/liblas/detail/writer12.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/detail/writer12.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/detail/writer12.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,72 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.2 writer implementation for C++ libLAS - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_DETAIL_WRITER12_HPP_INCLUDED -#define LIBLAS_DETAIL_WRITER12_HPP_INCLUDED - -#include -#include -#include -// std -#include - -namespace liblas { namespace detail { namespace v12 { - -class WriterImpl : public Writer -{ -public: - - typedef Writer Base; - - WriterImpl(std::ostream& ofs); - std::size_t GetVersion() const; - void WriteHeader(LASHeader& header); - void UpdateHeader(LASHeader const& header); - void WritePointRecord(LASPoint const& record, LASHeader const& header); - -private: - - liblas::uint32_t m_pointCount; -}; - -}}} // namespace liblas::detail::v12 - -#endif // LIBLAS_DETAIL_WRITER12_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/exception.hpp work/liblas-src-1.2.1/include/liblas/exception.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/exception.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/exception.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,77 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Exception subclasses for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_EXCEPTION_HPP_INCLUDED -#define LIBLAS_EXCEPTION_HPP_INCLUDED - -#include -#include - -namespace liblas { - -/// Exception reporting invalid point data. -/// It's usually thrown by LASPoint::Validate function. -class invalid_point_data : public std::runtime_error -{ -public: - - invalid_point_data(std::string const& msg, unsigned int who) - : std::runtime_error(msg), m_who(who) - {} - - /// Return flags identifying invalid point data members. - /// Flags are composed with composed with LASPoint::DataMemberFlag. - /// Testing flags example: bool timeValid = e.who() & LASPoint::eTime; - unsigned int who() const - { - return m_who; - } - -private: - - unsigned int m_who; -}; - -} // namespace liblas - -#endif // LIBLAS_EXCEPTION_HPP_INCLUDED - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/guid.hpp work/liblas-src-1.2.1/include/liblas/guid.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/guid.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/guid.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,593 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: GUID implementation - * Author: Andy Tompkins (modified by Mateusz Loskot) - * - * This file has been stolen from the Boost Vault and - * modified for libLAS purposes. Here is the original code posted: - * http://lists.boost.org/boost-users/2007/04/27397.php - * - * (C) Copyright 2006 Andy Tompkins. - * (C) Copyright 2008 Mateusz Loskot, mateusz@loskot.net. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) - * - * Revision History - * 06 Feb 2006 - Initial Revision - * 09 Nov 2006 - fixed variant and version bits for v4 guids - * 13 Nov 2006 - added serialization - * 17 Nov 2006 - added name-based guid creation - * 20 Nov 2006 - add fixes for gcc (from Tim Blechmann) - * 07 Mar 2007 - converted to header only - * 20 Jan 2008 - removed dependency of Boost and modified for libLAS (by Mateusz Loskot) - ****************************************************************************** - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_GUID_HPP_INCLUDED -#define LIBLAS_GUID_HPP_INCLUDED - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace liblas { - -/// Definition of Globally Unique Identifier type. -/// The GUID is a 16-byte (128-bit) number. -/// This class is used to represent value stored as Project Identifier -/// in public header block (see LASHeader) of a LAS file. -/// All files in a unique project should have the same value of -/// the Project Identifier. It is used together with File Source ID to -/// uniquely identify every LAS, globally. -/// -/// \see About GUID in Wikipedia http://en.wikipedia.org/wiki/Globally_Unique_Identifier -class guid -{ -public: - - /// Default constructor initializes GUID as null. - /// \exception nothrow - /// \post guid::is_null() == true. - guid() /* throw() */ - { - std::fill(data_, data_ + static_size, 0); - } - - /// Initializes from textual representation of valid GUID. - /// \param str - non-null pointer to string with GUID text. - /// \exception std::invalid_argument if construction failed. - /// \post guid::is_null() == false. - explicit guid(char const* const str) - { - if (0 == str) - throw_invalid_argument(); - construct(std::string(str)); - } - - /// Initializes from textual representation of valid GUID. - /// \param str - string with GUID text. - /// \exception std::invalid_argument if construction failed. - /// \post guid::is_null() == false. - template - explicit guid(std::basic_string const& str) - { - construct(str); - } - - /// Initializes from 4-fields structure. - /// \param d1 - field of first 32 bits of GUID number. - /// \param d2 - field of subsequent 16 bits of GUID number. - /// \param d3 - third field of 16 bits of GUID number. - /// \param d4 - last 64 bits of GUID number. - /// \exception std::invalid_argument if construction failed. - /// \post guid::is_null() == false. - guid(liblas::uint32_t const& d1, liblas::uint16_t const& d2, liblas::uint16_t const& d3, liblas::uint8_t const (&d4)[8]) - { - construct(d1, d2, d3, d4); - } - - /// Copy constructor. - /// \exception nothrow - guid(guid const& rhs) /* throw() */ - { - std::copy(rhs.data_, rhs.data_ + static_size, data_); - } - - /// Destructor. - /// \exception nothrow - ~guid() /* throw() */ - {} - - /// Assignment operator. - /// \exception nothrow - guid& operator=(guid const& rhs) /* throw() */ - { - if (&rhs != this) - { - std::copy(rhs.data_, rhs.data_ + static_size, data_); - } - return *this; - } - - /// Equality operator. - /// \exception nothrow - bool operator==(guid const& rhs) const /* throw() */ - { - return std::equal(data_, data_ + static_size, rhs.data_); - } - - /// Inequality operator. - /// \exception nothrow - bool operator!=(guid const& rhs) const /* throw() */ - { - return (!(*this == rhs)); - } - - /// Less-than operator. - /// \param rhs - GUID object on the right-hand side of the comparison. - /// \return true if the GUID on the left-hand side is lexicographically less - /// than GUID on the right side; false otherwise. - /// \exception nothrow - bool operator<(guid const& rhs) const /* throw() */ - { - return std::lexicographical_compare(data_, data_ + static_size, rhs.data_, rhs.data_ + static_size); - } - - /// More-than operator. - /// \param rhs - GUID object on the right-hand side of the comparison. - /// \return true if the GUID on the left-hand side is not lexicographically less - /// than GUID on the right side; false otherwise. - /// \exception nothrow - bool operator>(guid const& rhs) const /* throw() */ - { - return std::lexicographical_compare(rhs.data_, rhs.data_ + static_size, data_, data_ + static_size); - } - - /// Less-than-or-equal-to operator. - /// \param rhs - GUID object on the right-hand side of the comparison. - /// \exception nothrow - bool operator<=(guid const& rhs) const /* throw() */ - { - return (*this == rhs) || (*this < rhs); - } - - /// More-than-or-equal-to operator. - /// \param rhs - GUID object on the right-hand side of the comparison. - /// \exception nothrow - bool operator>=(guid const& rhs) const /* throw() */ - { - return (*this == rhs) || (*this > rhs); - } - - /// Test if the GUID object is null GUID or not. - /// Null means GUID number value is Zero. - /// \return true if the GUID is null; false otherwise - /// \exception nothrow - bool is_null() const /* throw() */ - { - return ((*this) == null()); - } - - /// Generate textual representation of the GUID number. - /// Specialization for std::string type. - /// \return string with textual representation of GUID - /// \exception std::runtime_error - thrown on GUID to string conversion failure - /// \post guid::to_string().empty() == false. - std::string to_string() const - { - return to_basic_string(); - } - - /// Generic generator of textual representation of the GUID number. - /// \exception std::runtime_error - thrown on GUID to string conversion failure - /// \post guid::to_basic_string().empty() == false. - template - std::basic_string to_basic_string() const - { - std::basic_string s; - std::basic_stringstream ss; - liblas::guid const& g = *this; - ss << g; - if (!ss || !(ss >> s)) - { - throw std::runtime_error("failed to convert guid to string"); - } - - assert(!s.empty()); - return s; - } - - /// Size of the GUID number in bytes. - /// \return The number of bytes is constant for all GUID objects - /// and equal to 16 bytes (128-bit number). - size_t byte_count() const /* throw() */ - { - return static_size; - } - - - /// Send bytes of GUID data to sequenec of bytes using given output iterator. - /// \exception nothrow - template - void output_bytes(ByteOutputIterator out) const - { - std::copy(data_, data_ + static_size, out); - } - - /// Separate bytes of GUID data to distinct buffers. - /// \param d1 - buffer for first 32 bits of GUID number. - /// \param d2 - buffer for 16 bits of second chunk of GUID number. - /// \param d3 - buffer for 16 bits of third chunk of GUID number. - /// \param d4 - buffer for last 64 bits of GUID number. - /// \exception nothrow - void output_data(liblas::uint32_t& d1, liblas::uint16_t& d2, liblas::uint16_t& d3, liblas::uint8_t (&d4)[8]) const - { - d1 = d2 = d3 = 0; - std::size_t pos = 0; - int const charbit = std::numeric_limits::digits; - - for (; pos < 4; ++pos) - { - - d1 <<= charbit; - d1 |= static_cast(data_[pos]); - } - - for (; pos < 6; ++pos) - { - d2 <<= charbit; - d2 |= static_cast(data_[pos]); - } - - for (; pos < 8; ++pos) - { - d3 <<= charbit; - d3 |= static_cast(data_[pos]); - } - - for (std::size_t j = 0; j < sizeof(d4); ++j) - { - d4[j] = data_[j + 8]; - } - } - - /// Null GUID number generator. - /// \return null-initialized instance of GUID number. - /// \exception nothrow - static guid const& null() /* throw() */ - { - static const guid n; - return n; - } - - /// Random GUID number generator. - /// \return random-initialized instance of GUID number. - /// \exception nothrow - static guid create() - { - return create_random_based(); - } - - /// Create GUID number based on calculation of SHA1 has for given name. - /// \exception std::runtime_error on GUID creation failure. - static guid create(guid const& namespace_guid, char const* name, int name_length) - { - return create_name_based(namespace_guid, name, name_length); - } - - /// Return flag indicating if bracket text form of GUID on output is set. - /// \exception nothrow - static inline bool get_showbraces(std::ios_base & iosbase) - { - return (iosbase.iword(get_showbraces_index()) != 0); - } - - /// Request to bracket text form of GUID on output. - /// \exception nothrow - static inline void set_showbraces(std::ios_base & iosbase, bool showbraces) - { - iosbase.iword(get_showbraces_index()) = showbraces; - } - - /// Request to bracket text form of GUID on output. - /// \exception nothrow - static inline std::ios_base& showbraces(std::ios_base& iosbase) - { - set_showbraces(iosbase, true); - return iosbase; - } - static inline std::ios_base& noshowbraces(std::ios_base& iosbase) - { - set_showbraces(iosbase, false); - return iosbase; - } - - /// Overloaded output stream operator for guid type. - friend std::ostream& operator<<(std::ostream& os, guid const& g); - - /// Overloaded input stream operator for guid type. - friend std::istream& operator>>(std::istream& is, guid &g); - -private: - - void throw_invalid_argument() const - { - throw std::invalid_argument("invalid guid string"); - } - - template - void construct(std::basic_string const& str) - { - std::basic_stringstream ss; - if (!(ss << str) || !(ss >> *this)) - { - throw_invalid_argument(); - } - } - - void construct(liblas::uint32_t const& d1, liblas::uint16_t const& d2, liblas::uint16_t const& d3, liblas::uint8_t const (&d4)[8]) - { - std::ostringstream ss; - ss.flags(std::ios::hex); - ss.fill('0'); - - ss.width(8); - ss << d1; - ss << '-'; - - ss.width(4); - ss << d2; - ss << '-'; - - ss.width(4); - ss << d3; - ss << '-'; - - for (std::size_t i = 0; i < sizeof(d4); ++i) - { - ss.width(2); - ss << static_cast(d4[i]); - if (1 == i) - ss << '-'; - } - - construct(ss.str()); - } - - //random number based - static guid create_random_based() // throw() - { - guid result; - static bool init_rand = true; - if (init_rand) - { - std::srand(static_cast(std::time(0))); - init_rand = false; - } - - for (size_t i = 0; i < static_size; i++) - { - result.data_[i] = detail::generate_random_byte(); - } - - // set variant - // should be 0b10xxxxxx - result.data_[8] &= 0xBF; - result.data_[8] |= 0x80; - - // set version - // should be 0b0100xxxx - result.data_[6] &= 0x4F; //0b01001111 - result.data_[6] |= 0x40; //0b01000000 - - return result; - } - - // name based - static guid create_name_based(guid const& namespace_guid, char const* name, int name_length) - { - using liblas::uint8_t; - - detail::SHA1 sha1; - sha1.Input(namespace_guid.data_, namespace_guid.static_size); - sha1.Input(name, name_length); - unsigned int digest[5]; - - if (sha1.Result(digest) == false) - { - throw std::runtime_error("create error"); - } - - guid result; - for (int i = 0; i < 4; ++i) - { - - result.data_[i*4+0] = static_cast((digest[i] >> 24) & 0xFF); - result.data_[i*4+1] = static_cast((digest[i] >> 16) & 0xFF); - result.data_[i*4+2] = static_cast((digest[i] >> 8) & 0xFF); - result.data_[i*4+3] = static_cast((digest[i] >> 0) & 0xFF); - } - - // set variant - // should be 0b10xxxxxx - result.data_[8] &= 0xBF; - result.data_[8] |= 0x80; - - // set version - // should be 0b0101xxxx - result.data_[6] &= 0x5F; //0b01011111 - result.data_[6] |= 0x50; //0b01010000 - - return result; - } - - static int get_showbraces_index() - { - static int index = std::ios_base::xalloc(); - return index; - } - -private: - - static const std::size_t static_size = 16; - liblas::uint8_t data_[static_size]; -}; - -inline std::ostream& operator<<(std::ostream& os, guid const& g) -{ - using namespace std; - - // TODO: If optional support of Boost is added, - // use Boost I/O State Savers for safe RAII. - std::ios_base::fmtflags flags_saver(os.flags()); - std::streamsize width_saver(os.width()); - std::ostream::char_type fill_saver(os.fill()); - - const std::ostream::sentry ok(os); - if (ok) - { - bool showbraces = guid::get_showbraces(os); - if (showbraces) - { - os << '{'; - } - os << hex; - os.fill('0'); - for (size_t i = 0; i < g.static_size; ++i) - { - os.width(2); - os << static_cast(g.data_[i]); - if (i == 3 || i == 5 || i == 7 || i == 9) - { - os << '-'; - } - } - if (showbraces) - { - os << '}'; - } - } - - os.flags(flags_saver); - os.width(width_saver); - os.fill(fill_saver); - - return os; -} - -inline std::istream& operator>>(std::istream& is, guid &g) -{ - using namespace std; - - typedef std::istream::char_type char_type; - guid temp_guid; - const std::istream::sentry ok(is); - if (ok) - { - char_type c; - c = static_cast(is.peek()); - bool bHaveBraces = false; - if (c == '{') - { - bHaveBraces = true; - is >> c; // read brace - } - - for (size_t i = 0; i < temp_guid.static_size && is; ++i) - { - std::stringstream ss; - - // read 2 characters into stringstream - is >> c; ss << c; - is >> c; ss << c; - - // extract 2 characters from stringstream as a hex number - unsigned int val = 0; - ss >> hex >> val; - if (!ss) - { - is.setstate(ios_base::failbit); - } - - // check that val is within valid range - if (val > 255) - { - is.setstate(ios_base::badbit); - } - - temp_guid.data_[i] = static_cast(val); - - if (is) - { - if (i == 3 || i == 5 || i == 7 || i == 9) - { - is >> c; - if (c != '-') - is.setstate(ios_base::failbit); - } - } - } - - if (bHaveBraces && is) - { - is >> c; - if (c != '}') - is.setstate(ios_base::failbit); - } - - if (is) - { - g = temp_guid; - } - } - - return is; -} - -} //namespace liblas - -#endif // LIBLAS_GUID_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/iterator.hpp work/liblas-src-1.2.1/include/liblas/iterator.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/iterator.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/iterator.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,221 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Reader and writer iterator implementation - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_ITERATOR_HPP_INCLUDED -#define LIBLAS_ITERATOR_HPP_INCLUDED - -#include -#include -#include -#include - -namespace liblas { - -/// Input iterator associated with liblas::LASReader. -/// It allows to read LAS file records in similar way to elements of STL container, -/// as well as apply STL algorithms that accept pair of input iterators. -/// \sa About Input Iterator at http://www.sgi.com/tech/stl/InputIterator.html -/// -template -class reader_iterator -{ -public: - - typedef std::input_iterator_tag iterator_category; - typedef T value_type; - typedef T const* pointer; - typedef T const& reference; - typedef ptrdiff_t difference_type; - - /// Initializes iterator pointing to pass-the-end. - reader_iterator() - : m_reader(0) - {} - - /// Initializes iterator pointing to beginning of LAS file sequence. - /// No ownership transfer of reader object occurs. - reader_iterator(liblas::LASReader& reader) - : m_reader(&reader) - { - assert(0 != m_reader); - getval(); - } - - /// Dereference operator. - /// It is implemented in terms of LASReader::GetPoint function. - reference operator*() const - { - assert(0 != m_reader); - return m_reader->GetPoint(); - } - - /// Pointer-to-member operator. - /// It is implemented in terms of LASReader::GetPoint function. - pointer operator->() const - { - return &(operator*()); - } - - /// Pre-increment opertor. - /// Moves iterator to next record by calling LASReader::ReadNextPoint. - reader_iterator& operator++() - { - assert(0 != m_reader); - getval(); - return (*this); - } - - /// Post-increment opertor. - /// Moves iterator to next record by calling LASReader::ReadNextPoint. - reader_iterator operator++(int) - { - reader_iterator tmp(*this); - ++(*this); - return tmp; - } - - /// Compare passed iterator to this. - /// Determine if both iterators apply to the same instance of LASReader class. - bool equal(reader_iterator const& rhs) const - { - return m_reader == rhs.m_reader; - } - -private: - - void getval() - { - if (0 != m_reader && !(m_reader->ReadNextPoint())) - { - m_reader = 0; - } - } - - liblas::LASReader* m_reader; -}; - -/// Equality operator implemented in terms of reader_iterator::equal -template -bool operator==(reader_iterator const& lhs, reader_iterator const& rhs) -{ - return lhs.equal(rhs); -} - -/// Inequality operator implemented in terms of reader_iterator::equal -template -bool operator!=(reader_iterator const& lhs, reader_iterator const& rhs) -{ - return (!(lhs == rhs)); -} - -/// Output iterator associated with liblas::LASWriter. -/// It allows to store a sequence of records into LAS file. -/// \sa About Output Iterator at http://www.sgi.com/tech/stl/OutputIterator.html -/// -template -class writer_iterator -{ -public: - - typedef std::output_iterator_tag iterator_category; - typedef void value_type; - typedef void pointer; - typedef T const& reference; - typedef void difference_type; - - /// Initialize iterator with given writer. - /// The writer position is not changed. - /// No ownership transfer of writer object occurs. - writer_iterator(liblas::LASWriter& writer) - : m_writer(&writer) - { - assert(0 != m_writer); - } - - /// Dereference assignment operator. - /// Implemented in terms of LASWriter::WritePoint function. - writer_iterator& operator=(reference value) - { - assert(0 != m_writer); - - bool const ret = m_writer->WritePoint(value); - assert(ret); // TODO: Low-level debugging - - return (*this); - } - - /// Dereference operator. - writer_iterator& operator*() - { - // pretend to return designated value - return (*this); - } - - /// Pre-increment operator. - writer_iterator& operator++() - { - // pretend to preincrement - return (*this); - } - - /// Post-increment operator. - writer_iterator operator++(int) - { - // pretend to postincrement - return (*this); - } - -private: - - liblas::LASWriter* m_writer; -}; - -// Declare specializations for user's convenience - -/// Public specialization of LASReader input iterator for liblas::LASPoint type. -typedef reader_iterator lasreader_iterator; - -/// Public specialization of LASWriter output iterator for liblas::LASPoint type. -typedef writer_iterator laswriter_iterator; - -} // namespace liblas - -#endif // LIBLAS_ITERATOR_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lascolor.hpp work/liblas-src-1.2.1/include/liblas/lascolor.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lascolor.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/lascolor.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,165 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS color class - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASCOLOR_HPP_INCLUDED -#define LIBLAS_LASCOLOR_HPP_INCLUDED - -#include -#include -#include -// std -#include // std::out_of_range -#include // std::size_t - -namespace liblas { - -/// RGB color container -class LASColor -{ -public: - - /// Default constructor. - /// Initializes with black color using RGB {0, 0, 0}. - LASColor(); - - /// Copy constructor. - LASColor(LASColor const& other); - - /// Assignment opreator. - LASColor& operator=(LASColor const& rhs); - - /// Comparison operator. - bool operator==(const LASColor& other) const; - - /// Fetch value of the red image channel - uint16_t GetRed() const; - - /// Set value of the red image channel - void SetRed(uint16_t const& value); - - /// Fetch value of the blue image channel - uint16_t GetBlue() const; - - /// Set value of the blue image channel - void SetBlue(uint16_t const& value); - - /// Fetch value of the green image channel - uint16_t GetGreen() const; - - /// Set value of the red image channel - void SetGreen(uint16_t const& value); - - /// Index operator providing access to RGB values. - /// Valid index values are 0, 1 or 2. - /// \exception std::out_of_range if requested index is out of range (> 2). - uint16_t& operator[](std::size_t const& n); - - /// Const version of index operator providing access to RGB values. - /// Valid index values are 0, 1 or 2. - /// \exception std::out_of_range if requested index is out of range (> 2). - uint16_t const& operator[](std::size_t const& n) const; - -private: - - - uint16_t m_red; - uint16_t m_green; - uint16_t m_blue; - - void throw_out_of_range() const - { - throw std::out_of_range("subscript out of range"); - } -}; - - -inline uint16_t LASColor::GetRed() const -{ - return m_red; -} - -inline void LASColor::SetRed(uint16_t const& value) -{ - m_red = value; -} - -inline uint16_t LASColor::GetBlue() const -{ - return m_blue; -} - -inline void LASColor::SetBlue(uint16_t const& value) -{ - m_blue = value; -} - -inline uint16_t LASColor::GetGreen() const -{ - return m_green; -} - -inline void LASColor::SetGreen(uint16_t const& value) -{ - m_green = value; -} - -inline uint16_t& LASColor::operator[](std::size_t const& n) -{ - if (n == 0) { return m_red; } - if (n == 1) { return m_green; } - if (n == 2) { return m_blue; } - - throw_out_of_range(); - -} - -inline uint16_t const& LASColor::operator[](std::size_t const& n) const -{ - if (n == 0) { return m_red; } - if (n == 1) { return m_green; } - if (n == 2) { return m_blue; } - - throw_out_of_range(); -} - -} // namespace liblas - -#endif // LIBLAS_LASCOLOR_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/laserror.hpp work/liblas-src-1.2.1/include/liblas/laserror.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/laserror.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/laserror.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,89 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: An error encapsulation class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * Copyright (c) 2008, Phil Vachon - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASERROR_HPP_INCLUDED -#define LIBLAS_LASERROR_HPP_INCLUDED - -//std -#include -#include - -namespace liblas { - -/// Definition of error notification used on the level of C API. -/// This class describes details of error condition occured in -/// libLAS core. All errors are stacked by C API layer, so it's -/// possible to track problem down to its source. -class LASError -{ -public: - - /// Custom constructor. - /// This is the main and the only tool to initialize error instance. - LASError(int code, std::string const& message, std::string const& method); - - /// Copy constructor. - /// Error objects are copyable. - LASError(LASError const& other); - - /// Assignment operator. - /// Error objects are assignable. - LASError& operator=(LASError const& rhs); - - // TODO - mloskot: What about replacing string return by copy with const char* ? - // char const* GetMethod() const { return m_method.c_str(); }, etc. - - int GetCode() const { return m_code; }; - std::string GetMessage() const { return m_message; }; - std::string GetMethod() const { return m_method; }; - -private: - - int m_code; - std::string m_message; - std::string m_method; -}; - -} // namespace liblas - -#endif diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasfile.hpp work/liblas-src-1.2.1/include/liblas/lasfile.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasfile.hpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/lasfile.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,85 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: A composite class to handle read/write operations - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASFILE_HPP_INCLUDED -#define LIBLAS_LASFILE_HPP_INCLUDED - -#include // complete type required -#include -#include -#include - -namespace liblas { - -/// \todo to be documented -class LASFile -{ -public: - - enum Mode - { - eRead = 0, - eWrite = 1, - eAppend = 2 - }; - - LASFile(); - LASFile(std::string const& filename); - LASFile(std::string const& filename, LASHeader const& header, Mode mode); - LASFile(LASFile const& other); - LASFile& operator=(LASFile const& rhs); - - bool IsNull() const; - std::string GetName() const; - Mode GetMode() const; - LASHeader const& GetHeader() const; - LASReader& GetReader(); - LASWriter& GetWriter(); - -private: - - detail::SharedPtr m_pimpl; -}; - -} // namespace liblas - -#endif // LIBLAS_LASFILE_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasheader.hpp work/liblas-src-1.2.1/include/liblas/lasheader.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasheader.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/lasheader.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,393 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS header class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Phil Vachon - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASHEADER_HPP_INCLUDED -#define LIBLAS_LASHEADER_HPP_INCLUDED - -#include -#include -#include -#include -#include -#include - -//std -#include -#include - -namespace liblas { - -/// Definition of public header block. -/// The header contains set of generic data and metadata -/// describing a family of ASPRS LAS files. The header is stored -/// at the beginning of every valid ASPRS LAS file. -/// -/// \todo TODO (low-priority): replace static-size char arrays as data members -/// with std::string and return const-reference to string object. -/// -class LASHeader -{ -public: - - /// Range of allowed ASPRS LAS file format versions. - enum FormatVersion - { - eVersionMajorMin = 1, ///< Minimum of major component - eVersionMajorMax = 1, ///< Maximum of major component - eVersionMinorMin = 0, ///< Minimum of minor component - eVersionMinorMax = 2 ///< Maximum of minor component - }; - - /// Versions of point record format. - enum PointFormat - { - ePointFormat0 = 0, ///< Point Data Format \e 0 - ePointFormat1 = 1, ///< Point Data Format \e 1 - ePointFormat2 = 2, ///< Point Data Format \e 2 - ePointFormat3 = 3 ///< Point Data Format \e 3 - - }; - - /// Number of bytes of point record storage in particular format. - enum PointSize - { - ePointSize0 = 20, ///< Size of point record in data format \e 0 - ePointSize1 = 28, ///< Size of point record in data format \e 1 - ePointSize2 = 26, ///< Size of point record in data format \e 2 - ePointSize3 = 34 ///< Size of point record in data format \e 3 - - }; - - /// Official signature of ASPRS LAS file format, always \b "LASF". - static char const* const FileSignature; - - /// Default system identifier used by libLAS, always \b "libLAS". - static char const* const SystemIdentifier; - - /// Default software identifier used by libLAS, always \b "libLAS X.Y". - static char const* const SoftwareIdentifier; - - /// Default constructor. - /// The default constructed header is configured according to the ASPRS - /// LAS 1.1 Specification, point data format set to 0. - /// Other fields filled with 0. - LASHeader(); - - /// Copy constructor. - LASHeader(LASHeader const& other); - - /// Assignment operator. - LASHeader& operator=(LASHeader const& rhs); - - /// Comparison operator. - bool operator==(const LASHeader& other) const; - - /// Get ASPRS LAS file signature. - /// \return 4-characters long string - \b "LASF". - std::string GetFileSignature() const; - - /// Set ASPRS LAS file signature. - /// The only value allowed as file signature is \b "LASF", - /// defined as FileSignature constant. - /// \exception std::invalid_argument - if invalid signature given. - /// \param v - string contains file signature, at least 4-bytes long - /// with "LASF" as first four bytes. - void SetFileSignature(std::string const& v); - - /// Get file source identifier. - /// \exception No throw - uint16_t GetFileSourceId() const; - - /// Set file source identifier. - /// \param v - should be set to a value between 1 and 65535. - /// \exception No throw - /// - /// \todo TODO: Should we warn or throw about type overflow when user passes 65535 + 1 = 0 - void SetFileSourceId(uint16_t v); - - /// Get value field reserved by the ASPRS LAS Specification. - /// \note This field is always filled with 0. - /// - /// \todo TODO: Should we warn or throw about type overflow when user passes 65535 + 1 = 0 - uint16_t GetReserved() const; - - /// Set reserved value for the header identifier. - /// \param v - should be set to a value between 1 and 65535. - /// \exception No throw - void SetReserved(uint16_t v); - - /// Get project identifier. - /// \return Global Unique Identifier as an instance of liblas::guid class. - guid GetProjectId() const; - - /// Set project identifier. - void SetProjectId(guid const& v); - - /// Get major component of version of LAS format. - /// \return Always 1 is returned as the only valid value. - uint8_t GetVersionMajor() const; - - /// Set major component of version of LAS format. - /// \exception std::out_of_range - invalid value given. - /// \param v - value between eVersionMajorMin and eVersionMajorMax. - void SetVersionMajor(uint8_t v); - - /// Get minor component of version of LAS format. - /// \return Valid values are 1 or 0. - uint8_t GetVersionMinor() const; - - /// Set minor component of version of LAS format. - /// \exception std::out_of_range - invalid value given. - /// \param v - value between eVersionMinorMin and eVersionMinorMax. - void SetVersionMinor(uint8_t v); - - /// Get system identifier. - /// Default value is \b "libLAS" specified as the SystemIdentifier constant. - /// \param pad - if true the returned string is padded right with spaces and - /// its length is 32 bytes, if false (default) no padding occurs and - /// length of the returned string is <= 32 bytes. - /// \return value of system identifier field. - std::string GetSystemId(bool pad = false) const; - - /// Set system identifier. - /// \exception std::invalid_argument - if identifier longer than 32 bytes. - /// \param v - system identifiers string. - void SetSystemId(std::string const& v); - - /// Get software identifier. - /// Default value is \b "libLAS 1.0", specified as the SoftwareIdentifier constant. - /// \param pad - if true the returned string is padded right with spaces and its length is 32 bytes, - /// if false (default) no padding occurs and length of the returned string is <= 32 bytes. - /// \return value of generating software identifier field. - std::string GetSoftwareId(bool pad = false) const; - - /// Set software identifier. - /// \exception std::invalid_argument - if identifier is longer than 32 bytes. - /// \param v - software identifiers string. - void SetSoftwareId(std::string const& v); - - /// Get day of year of file creation date. - /// \todo TODO: Use full date structure instead of Julian date number. - uint16_t GetCreationDOY() const; - - /// Set day of year of file creation date. - /// \exception std::out_of_range - given value is higher than number 366. - /// \todo TODO: Use full date structure instead of Julian date number. - void SetCreationDOY(uint16_t v); - - /// Set year of file creation date. - /// \todo TODO: Remove if full date structure is used. - uint16_t GetCreationYear() const; - - /// Get year of file creation date. - /// \exception std::out_of_range - given value is higher than number 9999. - /// \todo TODO: Remove if full date structure is used. - void SetCreationYear(uint16_t v); - - /// Get number of bytes of generic verion of public header block storage. - /// Standard version of the public header block is 227 bytes long. - uint16_t GetHeaderSize() const; - - /// Get number of bytes from the beginning to the first point record. - uint32_t GetDataOffset() const; - - /// Set number of bytes from the beginning to the first point record. - /// \exception std::out_of_range - if given offset is bigger than 227+2 bytes - /// for the LAS 1.0 format and 227 bytes for the LAS 1.1 format. - void SetDataOffset(uint32_t v); - - /// Get number of variable-length records. - uint32_t GetRecordsCount() const; - - /// Set number of variable-length records. - void SetRecordsCount(uint32_t v); - - /// Get identifier of point data (record) format. - PointFormat GetDataFormatId() const; - - /// Set identifier of point data (record) format. - void SetDataFormatId(PointFormat v); - - /// \todo To be documented - uint16_t GetDataRecordLength() const; - - /// Get total number of point records stored in the LAS file. - uint32_t GetPointRecordsCount() const; - - /// Set number of point records that will be stored in a new LAS file. - void SetPointRecordsCount(uint32_t v); - - /// Get array of the total point records per return. - std::vector const& GetPointRecordsByReturnCount() const; - - /// Set values of 5-elements array of total point records per return. - /// \exception std::out_of_range - if index is bigger than 4. - /// \param index - subscript (0-4) of array element being updated. - /// \param v - new value to assign to array element identified by index. - void SetPointRecordsByReturnCount(std::size_t index, uint32_t v); - - /// Get scale factor for X coordinate. - double GetScaleX() const; - - /// Get scale factor for Y coordinate. - double GetScaleY() const; - - /// Get scale factor for Z coordinate. - double GetScaleZ() const; - - /// Set values of scale factor for X, Y and Z coordinates. - void SetScale(double x, double y, double z); - - /// Get X coordinate offset. - double GetOffsetX() const; - - /// Get Y coordinate offset. - double GetOffsetY() const; - - /// Get Z coordinate offset. - double GetOffsetZ() const; - - /// Set values of X, Y and Z coordinates offset. - void SetOffset(double x, double y, double z); - - /// Get minimum value of extent of X coordinate. - double GetMaxX() const; - - /// Get maximum value of extent of X coordinate. - double GetMinX() const; - - /// Get minimum value of extent of Y coordinate. - double GetMaxY() const; - - /// Get maximum value of extent of Y coordinate. - double GetMinY() const; - - /// Get minimum value of extent of Z coordinate. - double GetMaxZ() const; - - /// Get maximum value of extent of Z coordinate. - double GetMinZ() const; - - /// Set maximum values of extent of X, Y and Z coordinates. - void SetMax(double x, double y, double z); - - /// Set minimum values of extent of X, Y and Z coordinates. - void SetMin(double x, double y, double z); - - /// Adds a variable length record to the header - void AddVLR(LASVariableRecord const& v); - - /// Returns a VLR - LASVariableRecord const& GetVLR(uint32_t index) const; - - /// Removes a VLR from the the header. - void DeleteVLR(uint32_t index); - - /// Rewrite variable-length record with georeference infomation, if available. - void SetGeoreference(); - - /// Fetch the georeference - LASSpatialReference GetSRS() const; - - /// Set the georeference - void SetSRS(LASSpatialReference& srs); - -private: - - typedef detail::Point PointScales; - typedef detail::Point PointOffsets; - typedef detail::Extents PointExtents; - - enum - { - eDataSignatureSize = 2, - eFileSignatureSize = 4, - ePointsByReturnSize = 5, - eProjectId4Size = 8, - eSystemIdSize = 32, - eSoftwareIdSize = 32, - eHeaderSize = 227, - eFileSourceIdMax = 65535 - }; - - // TODO (low-priority): replace static-size char arrays - // with std::string and return const-reference to string object. - - // - // Private function members - // - void Init(); - void ClearGeoKeyVLRs(); - - // - // Private data members - // - char m_signature[eFileSignatureSize]; - uint16_t m_sourceId; - uint16_t m_reserved; - uint32_t m_projectId1; - uint16_t m_projectId2; - uint16_t m_projectId3; - uint8_t m_projectId4[eProjectId4Size]; - uint8_t m_versionMajor; - uint8_t m_versionMinor; - char m_systemId[eSystemIdSize]; - char m_softwareId[eSoftwareIdSize]; - uint16_t m_createDOY; - uint16_t m_createYear; - uint16_t m_headerSize; - uint32_t m_dataOffset; - uint32_t m_recordsCount; - uint8_t m_dataFormatId; - uint16_t m_dataRecordLen; - uint32_t m_pointRecordsCount; - std::vector m_pointRecordsByReturn; - PointScales m_scales; - PointOffsets m_offsets; - PointExtents m_extents; - std::vector m_vlrs; - LASSpatialReference m_srs; -}; - -} // namespace liblas - -#endif // LIBLAS_LASHEADER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/laspoint.hpp work/liblas-src-1.2.1/include/liblas/laspoint.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/laspoint.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/laspoint.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,365 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS point class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASPOINT_HPP_INCLUDED -#define LIBLAS_LASPOINT_HPP_INCLUDED - -#include -#include -#include -#include -// std -#include // std::out_of_range -#include // std::size_t - -namespace liblas { - -/// Point data record composed with X, Y, Z coordinates and attributes. -class LASPoint -{ -public: - - enum DataMemberFlag - { - eReturnNumber = 1, - eNumberOfReturns = 2, - eScanDirection = 4, - eFlightLineEdge = 8, - eClassification = 16, - eScanAngleRank = 32, - eTime = 64 - }; - - - enum ClassificationType - { - eCreated = 0, - eUnclassified, - eGround, - eLowVegetation, - eMediumVegetation, - eHighVegetation, - eBuilding, - eLowPoint, - eModelKeyPoint, - eWater = 9, - // = 10 // reserved for ASPRS Definition - // = 11 // reserved for ASPRS Definition - eOverlapPoints = 12 - // = 13-31 // reserved for ASPRS Definition - }; - - enum ScanAngleRankRange - { - eScanAngleRankMin = -90, - eScanAngleRankMax = 90 - }; - - LASPoint(); - LASPoint(LASPoint const& other); - LASPoint& operator=(LASPoint const& rhs); - - double GetX() const; - double GetY() const; - double GetZ() const; - void SetCoordinates(double const& x, double const& y, double const& z); - void SetCoordinates(LASHeader const& header, double x, double y, double z); - - void SetX(double const& value); - void SetY(double const& value); - void SetZ(double const& value); - - uint16_t GetIntensity() const; - void SetIntensity(uint16_t const& intensity); - - /// Gets all scanning flags encoded as single byte. - /// The flags are (mandatory): - /// - Return Number (bits 0, 1, 2); - /// - Number of Returns - given pulse (bits 3, 4, 5); - /// - Scan Direction Flag (bit 6); - /// - Edge of Flight Line (bit 7). - uint8_t GetScanFlags() const; - - /// Sets all scanning flags passed as a single byte. - /// \sa Documentation of GetScanFlags method for flags details. - void SetScanFlags(uint8_t const& flags); - - uint16_t GetReturnNumber() const; - void SetReturnNumber(uint16_t const& num); - - uint16_t GetNumberOfReturns() const; - void SetNumberOfReturns(uint16_t const& num); - - uint16_t GetScanDirection() const; - void SetScanDirection(uint16_t const& dir); - - uint16_t GetFlightLineEdge() const; - void SetFlightLineEdge(uint16_t const& edge); - - uint8_t GetClassification() const; - void SetClassification(uint8_t const& classify); - - int8_t GetScanAngleRank() const; - void SetScanAngleRank(int8_t const& rank); - - /// Fetch value of File Marker (LAS 1.0) or User Data (LAS 1.1). - uint8_t GetUserData() const; - - /// Set value of File Marker (LAS 1.0) or User Data (LAS 1.1). - void SetUserData(uint8_t const& data); - - /// Fetch value of User Bit Field (LAS 1.0) or Point Source ID (LAS 1.1). - uint16_t GetPointSourceID() const; - - /// Set value of User Bit Field (LAS 1.0) or Point Source ID (LAS 1.1). - void SetPointSourceID(uint16_t const& id); - - /// Fetch color value associated with this point (LAS 1.2) - LASColor const& GetColor() const; - - /// Set color value associated with this point (LAS 1.2) - void SetColor(LASColor const& value); - - - double GetTime() const; - void SetTime(double const& time); - - /// Index operator providing access to XYZ coordinates of point record. - /// Valid index values are 0, 1 or 2. - /// \exception std::out_of_range if requested index is out of range (> 2). - double& operator[](std::size_t const& n); - - /// Const version of index operator providing access to XYZ coordinates of point record. - /// Valid index values are 0, 1 or 2. - /// \exception std::out_of_range if requested index is out of range (> 2). - double const& operator[](std::size_t const& n) const; - - /// \todo TODO: Should we compare other data members, but not only coordinates? - bool equal(LASPoint const& other) const; - - bool Validate() const; - bool IsValid() const; - - -private: - - static std::size_t const coords_size = 3; - double m_coords[coords_size]; - uint16_t m_intensity; - uint8_t m_flags; - uint8_t m_class; - int8_t m_angleRank; - uint8_t m_userData; - uint16_t m_pointSourceId; - double m_gpsTime; - - LASColor m_color; - detail::PointRecord m_rec; - - void throw_out_of_range() const - { - throw std::out_of_range("coordinate subscript out of range"); - } -}; - -/// Equal-to operator implemented in terms of LASPoint::equal method. -inline bool operator==(LASPoint const& lhs, LASPoint const& rhs) -{ - return lhs.equal(rhs); -} - -/// Not-equal-to operator implemented in terms of LASPoint::equal method. -inline bool operator!=(LASPoint const& lhs, LASPoint const& rhs) -{ - return (!(lhs == rhs)); -} - -inline void LASPoint::SetCoordinates(double const& x, double const& y, double const& z) -{ - m_coords[0] = x; - m_coords[1] = y; - m_coords[2] = z; -} - -inline double LASPoint::GetX() const -{ - return m_coords[0]; -} - -inline void LASPoint::SetX( double const& value ) -{ - m_coords[0] = value; -} - -inline double LASPoint::GetY() const -{ - return m_coords[1]; -} - -inline void LASPoint::SetY( double const& value ) -{ - m_coords[1] = value; -} - -inline double LASPoint::GetZ() const -{ - return m_coords[2]; -} - -inline void LASPoint::SetZ( double const& value ) -{ - m_coords[2] = value; -} - -inline uint16_t LASPoint::GetIntensity() const -{ - return m_intensity; -} - -inline void LASPoint::SetIntensity(uint16_t const& intensity) -{ - m_intensity = intensity; -} - -inline uint16_t LASPoint::GetReturnNumber() const -{ - // Read bits 1,2,3 (first 3 bits) - return (m_flags & 0x07); -} - -inline uint16_t LASPoint::GetNumberOfReturns() const -{ - // Read bits 4,5,6 - return ((m_flags >> 3) & 0x07); -} - -inline uint16_t LASPoint::GetScanDirection() const -{ - // Read 7th bit - return ((m_flags >> 6) & 0x01); -} - -inline uint16_t LASPoint::GetFlightLineEdge() const -{ - // Read 8th bit - return ((m_flags >> 7) & 0x01); -} - -inline uint8_t LASPoint::GetScanFlags() const -{ - return m_flags; -} - -inline void LASPoint::SetScanFlags(uint8_t const& flags) -{ - m_flags = flags; -} - -inline uint8_t LASPoint::GetClassification() const -{ - return m_class; -} - -inline void LASPoint::SetClassification(uint8_t const& classify) -{ - m_class = classify; -} - -inline int8_t LASPoint::GetScanAngleRank() const -{ - return m_angleRank; -} - -inline uint8_t LASPoint::GetUserData() const -{ - return m_userData; -} - -inline uint16_t LASPoint::GetPointSourceID() const -{ - return m_pointSourceId; -} - -inline void LASPoint::SetPointSourceID(uint16_t const& id) -{ - m_pointSourceId = id; -} - -inline double LASPoint::GetTime() const -{ - return m_gpsTime; -} - -inline void LASPoint::SetTime(double const& time) -{ - m_gpsTime = time; -} - -inline LASColor const& LASPoint::GetColor() const -{ - return m_color; -} - -inline void LASPoint::SetColor(LASColor const& value) -{ - m_color = value; -} - - -inline double& LASPoint::operator[](std::size_t const& n) -{ - if (coords_size <= n) - throw_out_of_range(); - - return m_coords[n]; -} - -inline double const& LASPoint::operator[](std::size_t const& n) const -{ - if (coords_size <= n) - throw_out_of_range(); - - return m_coords[n]; -} - -} // namespace liblas - -#endif // LIBLAS_LASPOINT_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasreader.hpp work/liblas-src-1.2.1/include/liblas/lasreader.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasreader.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/lasreader.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,103 +0,0 @@ -/****************************************************************************** -* $Id$ -* -* Project: libLAS - http://liblas.org - A BSD library for LAS format data. -* Purpose: LAS reader class -* Author: Mateusz Loskot, mateusz@loskot.net -* -****************************************************************************** -* Copyright (c) 2008, Mateusz Loskot -* Copyright (c) 2008, Phil Vachon -* -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following -* conditions are met: -* -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided -* with the distribution. -* * Neither the name of the Martin Isenburg or Iowa Department -* of Natural Resources nor the names of its contributors may be -* used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -* OF SUCH DAMAGE. -****************************************************************************/ - -#ifndef LIBLAS_LASREADER_HPP_INCLUDED -#define LIBLAS_LASREADER_HPP_INCLUDED - -#include -#include -#include -#include -#include -// std -#include -#include -#include -#include // std::size_t - -namespace liblas { - -/// \todo To be documented. -class LASReader -{ -public: - - LASReader(std::istream& ifs); - ~LASReader(); - - std::size_t GetVersion() const; - LASHeader const& GetHeader() const; - LASPoint const& GetPoint() const; - std::vector const& GetVLRs() const; - /// Allow fetching of the stream - std::istream& GetStream() const; - bool IsEOF() const; - - bool ReadNextPoint(); - bool ReadPointAt(std::size_t n); - bool ReadVLR(); - void Reset(); - - /// Reproject data as they are written if the LASWriter's reference is - /// different than the LASHeader's - bool SetSRS(const LASSpatialReference& ref); - - /// The operator is not const because it updates file stream position. - LASPoint const& operator[](std::size_t n); - -private: - - // Blocked copying operations, declared but not defined. - LASReader(LASReader const& other); - LASReader& operator=(LASReader const& rhs); - - void Init(); // throws on error - - const std::auto_ptr m_pimpl; - LASHeader m_header; - LASPoint m_point; - std::vector m_vlrs; -}; - -} // namespace liblas - -#endif // ndef LIBLAS_LASREADER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasspatialreference.hpp work/liblas-src-1.2.1/include/liblas/lasspatialreference.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasspatialreference.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/lasspatialreference.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,183 +0,0 @@ -/****************************************************************************** - * $Id: lasspatialreference.hpp 1091 2009-03-10 20:17:35Z hobu $ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS Spatial Reference class - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2009, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED -#define LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED - -#include -#include -#include -#include -#include -#include - -// GDAL OSR -#ifdef HAVE_GDAL -#include "ogr_srs_api.h" -#include "cpl_port.h" -#include "cpl_serv.h" -#include "geo_tiffp.h" -#define CPL_ERROR_H_INCLUDED - -#include "geo_normalize.h" -#include "geovalues.h" -#include "ogr_spatialref.h" -#include "gdal.h" -#include "xtiffio.h" -#include "cpl_multiproc.h" - -#endif - -// GeoTIFF -#ifdef HAVE_LIBGEOTIFF -#include "geotiff.h" -#include "geo_simpletags.h" -#include "geo_normalize.h" -#include "geo_simpletags.h" -#include "geovalues.h" -#endif // HAVE_LIBGEOTIFF - -// std -#include // std::out_of_range -#include // std::size_t -#include - -// Fake out the compiler if we don't have libgeotiff -#ifndef HAVE_LIBGEOTIFF -typedef struct GTIFS * GTIF; -typedef struct ST_TIFFS * ST_TIFF; -#endif - -namespace liblas { - -/// Spatial Reference System container for libLAS -class LASSpatialReference -{ -public: - - /// Default constructor. - LASSpatialReference(); - - /// Destructor. - /// If libgeotiff is enabled, deallocates libtiff and libgeotiff objects used internally. - ~LASSpatialReference(); - - /// Constructor creating LASSpatialReference instance from given Variable-Length Record. - LASSpatialReference(const std::vector& vlrs); - - /// Copy constryctor. - LASSpatialReference(LASSpatialReference const& other); - - /// Assignment operator. - LASSpatialReference& operator=(LASSpatialReference const& rhs); - - /// Returns a pointer to the internal GTIF*. Only available if - /// you have libgeotiff linked in. - const GTIF* GetGTIF(); - - void SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff); - - /// Returns the OGC WKT describing Spatial Reference System. - /// If GDAL is linked, it uses GDAL's operations and methods to determine - /// the WKT. If GDAL is not linked, no WKT is returned. - std::string GetWKT() const; - - /// Sets the SRS using GDAL's OGC WKT. If GDAL is not linked, this - /// operation has no effect. - /// \param v - a string containing the WKT string. - void SetWKT(std::string const& v); - - /// Returns the Proj.4 string describing the Spatial Reference System. - /// If GDAL is linked, it uses GDAL's operations and methods to determine - /// the Proj.4 string -- otherwise, if libgeotiff is linked, it uses - /// that. Note that GDAL's operations are much more mature and - /// support more coordinate systems and descriptions. - std::string GetProj4() const; - - /// Sets the Proj.4 string describing the Spatial Reference System. - /// If GDAL is linked, it uses GDAL's operations and methods to determine - /// the Proj.4 string -- otherwise, if libgeotiff is linked, it uses - /// that. Note that GDAL's operations are much more mature and - /// support more coordinate systems and descriptions. - /// \param v - a string containing the Proj.4 string. - void SetProj4(std::string const& v); - - /// Set the LASVLRs for the LASSpatialReference. SetVLRs will only copy - /// VLR records that pertain to the GeoTIFF keys, and extraneous - /// VLR records will not be copied. - /// \param vlrs - A list of VLRs that contains VLRs describing GeoTIFF keys - void SetVLRs(const std::vector& vlrs); - - /// Add a VLR representing GeoTIFF keys to the SRS - void AddVLR(const LASVariableRecord& vlr); - - /// Return a copy of the LASVLRs that LASSpatialReference maintains - std::vector GetVLRs() const; - -private: - - GTIF* m_gtiff; - ST_TIFF* m_tiff; - - std::vector m_vlrs; - bool IsGeoVLR(const LASVariableRecord& vlr) const; - - /// Reset the VLRs of the LASSpatialReference using the existing GTIF* and ST_TIF* - /// Until this method is called, - /// the LASSpatialReference will only contain a SRS description using the VLRs - /// that it was first instantiated with. SetWKT and SetProj4 can - /// be used to change the GTIF* - void ResetVLRs(); -}; - -} // namespace liblas - -#ifdef HAVE_GDAL -LAS_C_START -char LAS_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); -int LAS_DLL GTIFSetFromOGISDefn(GTIF*, const char*); - -void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName); -void SetGeogCSCitation(GTIF* psGTIF, OGRSpatialReference* poSRS, char* angUnitName, int nDatum, short nSpheroid); -LAS_C_END -#endif - -#endif // LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasvariablerecord.hpp work/liblas-src-1.2.1/include/liblas/lasvariablerecord.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/lasvariablerecord.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/lasvariablerecord.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,156 +0,0 @@ -/****************************************************************************** - * $Id: lasvariablerecord.hpp 889 2008-09-28 04:17:22Z hobu $ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS record header class - * Author: Phil Vachon, philippe@cowpig.ca - * - ****************************************************************************** - * Copyright (c) 2008, Phil Vachon - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASVARIABLERECORD_HPP_INCLUDED -#define LIBLAS_LASVARIABLERECORD_HPP_INCLUDED - -#include -// std -#include -#include - -namespace liblas { - -/// Representation of variable-length record data. -class LASVariableRecord -{ -public: - - /// Default constructor. - /// Zero-initialization of record data. - /// \exception No throw - LASVariableRecord(); - - /// Copy constructor. - /// Construction of new record object as a copy of existing one. - /// \exception No throw - LASVariableRecord(LASVariableRecord const& other); - - ~LASVariableRecord(); - - /// Assignment operator. - /// Construction and initializition of record object by - /// assignment of another one. - /// \exception No throw - LASVariableRecord& operator=(LASVariableRecord const& rhs); - - /// Get record signature (LAS 1.0) or reserved bytes (LAS 1.1). - /// \exception No throw - uint16_t GetReserved() const; - - void SetReserved(uint16_t); - - /// Get identifier of user which created the record. - /// The character data is up to 16 bytes long. - /// \exception No throw - std::string GetUserId(bool pad /*= false*/) const; - - void SetUserId(std::string const&); - - /// Get identifier of record. - /// The record ID is closely related to the user ID. - /// \exception No throw - uint16_t GetRecordId() const; - - void SetRecordId(uint16_t); - - /// Get record length after the header. - /// \exception No throw - uint16_t GetRecordLength() const; - - void SetRecordLength(uint16_t); - - /// Get text description of data in the record. - /// The character data is up to 32 bytes long. - /// \exception No throw - std::string GetDescription(bool pad /*= false*/) const; - - void SetDescription(std::string const&); - - /// Get the data for this VLR - std::vector const& GetData() const; - - void SetData(std::vector const&); - - /// Compare actual header object against the other. - /// \exception No throw - bool equal(LASVariableRecord const& other) const; - - /// Get the total size of the VLR in bytes - uint32_t GetTotalSize() const; - -private: - - enum - { - eUIDSize = 16, - eDescriptionSize = 32 - }; - - uint16_t m_reserved; - uint16_t m_recordId; - uint16_t m_recordLength; // after header - - char m_userId[eUIDSize]; - char m_desc[eDescriptionSize]; - std::vector m_data; -}; - -/// Equality operator. -/// Implemented in terms of LASVariableRecord::equal member function. -/// \exception No throw -inline bool operator==(LASVariableRecord const& lhs, LASVariableRecord const& rhs) -{ - return lhs.equal(rhs); -} - -/// Inequality operator. -/// Implemented in terms of LASRecordHeader::equal member function. -/// \exception No throw -inline bool operator!=(LASVariableRecord const& lhs, LASVariableRecord const& rhs) -{ - return (!(lhs == rhs)); -} - -} // namespace liblas - -#endif // LIBLAS_LASVARIABLERECORD_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/laswriter.hpp work/liblas-src-1.2.1/include/liblas/laswriter.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/laswriter.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/laswriter.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,98 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS writer class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#ifndef LIBLAS_LASWRITER_HPP_INCLUDED -#define LIBLAS_LASWRITER_HPP_INCLUDED - -#include -#include -#include -// std -#include // std::ostream -#include -#include -#include // std::size_t - -namespace liblas -{ - -/// \todo To be documented. -class LASWriter -{ -public: - - LASWriter(std::ostream& ofs, LASHeader const& header); - ~LASWriter(); - - std::size_t GetVersion() const; - LASHeader const& GetHeader() const; - - /// \todo TODO: Move point record composition deep into writer implementation. - /// \todo TODO: How to handle point_source_id in portable way, for LAS 1.0 and 1.1 - bool WritePoint(LASPoint const& point); - - // Allow fetching of the stream - std::ostream& GetStream() const; - - // Allow in-place writing of header - void WriteHeader(LASHeader& header); - - // Reproject data as they are written if the LASWriter's reference is - // different than the LASHeader's - bool SetSRS(const LASSpatialReference& ref); - - -private: - - // Blocked copying operations, declared but not defined. - LASWriter(LASWriter const& other); - LASWriter& operator=(LASWriter const& rhs); - - const std::auto_ptr m_pimpl; - - LASHeader m_header; - detail::PointRecord m_record; - -}; - -} // namespace liblas - -#endif // ndef LIBLAS_LASWRITER_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/liblas.hpp work/liblas-src-1.2.1/include/liblas/liblas.hpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/liblas/liblas.hpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/liblas/liblas.hpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,121 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS include file - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Phil Vachon - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - - -#ifndef LIBLAS_HPP_INCLUDED -#define LIBLAS_HPP_INCLUDED - -#include -#include -#include - -/// Namespace grouping all elements of libLAS public interface. -/// \note -/// User's may notice there is namespace \em detail nested -/// in the \em liblas. The \em detail should be considered as -/// private namespace dedicated for implementation details, -/// so libLAS are not supposed to access it directly, -/// nor included headers from the \em detail subdirectory of \em liblas include folder. -namespace liblas -{ - -/// Version numbers of the ASPRS LAS Specification. -/// Numerical representation of versions is calculated according to -/// following formula: major * 100000 + minor -enum LASFileVersion -{ - eLASVersion10 = 1 * 100000 + 0, ///< LAS Format 1.0 - eLASVersion11 = 1 * 100000 + 1, ///< LAS Format 1.1 - eLASVersion12 = 1 * 100000 + 2, ///< LAS Format 1.2 - eLASVersion20 = 2 * 100000 + 0 ///< LAS Format 2.0 -}; - -/// Open file to read in binary mode. -/// The input file is also attached to input stream. -/// \param ifs - reference to input file stream to -/// which opened file is attached -/// \param filename - name of file to open -/// \return true if file has been opened with success, false otherwise -/// \exception No throw -/// -inline bool Open(std::ifstream& ifs, std::string const& filename) // throw() -{ - ifs.open(filename.c_str(), std::ios::in | std::ios::binary); - return ifs.is_open(); -} - -/// Create file and open to write in binary mode. -/// The output file is also attached to output stream. -/// \param ofs - reference to output file stream to -/// which created file is attached -/// \param filename - name of file to open -/// \return true if file has been create with success, false otherwise -/// \exception No throw -/// -inline bool Create(std::ofstream& ofs, std::string const& filename) // throw() -{ - ofs.open(filename.c_str(), std::ios::out | std::ios::binary); - return ofs.is_open(); -} - -inline bool IsGDALEnabled() -{ -#ifdef HAVE_GDAL - return true; -#else - return false; -#endif -} - -inline bool IsLibGeoTIFFEnabled() -{ -#ifdef HAVE_LIBGEOTIFF - return true; -#else - return false; -#endif -} - -} // namespace liblas - -#endif // LIBLAS_HPP_INCLUDED diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/Makefile.am work/liblas-src-1.2.1/include/Makefile.am --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/Makefile.am 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/include/Makefile.am 1970-01-01 08:00:00.000000000 +0800 @@ -1,34 +0,0 @@ -lasdir = $(includedir) - -nobase_las_HEADERS = liblas/cstdint.hpp \ - liblas/exception.hpp \ - liblas/guid.hpp \ - liblas/iterator.hpp \ - liblas/lascolor.hpp \ - liblas/laserror.hpp \ - liblas/lasfile.hpp \ - liblas/lasheader.hpp \ - liblas/laspoint.hpp \ - liblas/lasreader.hpp \ - liblas/lasvariablerecord.hpp \ - liblas/lasspatialreference.hpp \ - liblas/laswriter.hpp \ - liblas/liblas.hpp \ - liblas/capi/liblas.h \ - liblas/capi/las_version.h \ - liblas/capi/las_config.h \ - liblas/detail/endian.hpp \ - liblas/detail/file.hpp \ - liblas/detail/fwd.hpp \ - liblas/detail/reader.hpp \ - liblas/detail/reader10.hpp \ - liblas/detail/reader11.hpp \ - liblas/detail/reader12.hpp \ - liblas/detail/sha1.hpp \ - liblas/detail/sharedptr.hpp \ - liblas/detail/timer.hpp \ - liblas/detail/utility.hpp \ - liblas/detail/writer.hpp \ - liblas/detail/writer10.hpp \ - liblas/detail/writer11.hpp \ - liblas/detail/writer12.hpp \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/Makefile.in work/liblas-src-1.2.1/include/Makefile.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/include/Makefile.in 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/include/Makefile.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,444 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include -DIST_COMMON = $(nobase_las_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(lasdir)" -nobase_lasHEADERS_INSTALL = $(install_sh_DATA) -HEADERS = $(nobase_las_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GDAL_INC = @GDAL_INC@ -GDAL_PREFIX = @GDAL_PREFIX@ -GEOTIFF_INC = @GEOTIFF_INC@ -GEOTIFF_PREFIX = @GEOTIFF_PREFIX@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE_VERSION = @RELEASE_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -lasdir = $(includedir) -nobase_las_HEADERS = liblas/cstdint.hpp \ - liblas/exception.hpp \ - liblas/guid.hpp \ - liblas/iterator.hpp \ - liblas/lascolor.hpp \ - liblas/laserror.hpp \ - liblas/lasfile.hpp \ - liblas/lasheader.hpp \ - liblas/laspoint.hpp \ - liblas/lasreader.hpp \ - liblas/lasvariablerecord.hpp \ - liblas/lasspatialreference.hpp \ - liblas/laswriter.hpp \ - liblas/liblas.hpp \ - liblas/capi/liblas.h \ - liblas/capi/las_version.h \ - liblas/capi/las_config.h \ - liblas/detail/endian.hpp \ - liblas/detail/file.hpp \ - liblas/detail/fwd.hpp \ - liblas/detail/reader.hpp \ - liblas/detail/reader10.hpp \ - liblas/detail/reader11.hpp \ - liblas/detail/reader12.hpp \ - liblas/detail/sha1.hpp \ - liblas/detail/sharedptr.hpp \ - liblas/detail/timer.hpp \ - liblas/detail/utility.hpp \ - liblas/detail/writer.hpp \ - liblas/detail/writer10.hpp \ - liblas/detail/writer11.hpp \ - liblas/detail/writer12.hpp - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-nobase_lasHEADERS: $(nobase_las_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(lasdir)" || $(MKDIR_P) "$(DESTDIR)$(lasdir)" - @$(am__vpath_adj_setup) \ - list='$(nobase_las_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - $(am__vpath_adj) \ - echo " $(nobase_lasHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(lasdir)/$$f'"; \ - $(nobase_lasHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(lasdir)/$$f"; \ - done - -uninstall-nobase_lasHEADERS: - @$(NORMAL_UNINSTALL) - @$(am__vpath_adj_setup) \ - list='$(nobase_las_HEADERS)'; for p in $$list; do \ - $(am__vpath_adj) \ - echo " rm -f '$(DESTDIR)$(lasdir)/$$f'"; \ - rm -f "$(DESTDIR)$(lasdir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(lasdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-nobase_lasHEADERS - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-nobase_lasHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-nobase_lasHEADERS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-nobase_lasHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/INSTALL work/liblas-src-1.2.1/INSTALL --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/INSTALL 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/INSTALL 1970-01-01 08:00:00.000000000 +0800 @@ -1,40 +0,0 @@ -*************************************************************** -libLAS Installation -*************************************************************** - - -Unix -~~~~~~~~~~~~~~~~~~~ - -libLAS uses a typical GNU autoconf/automake framework for -building and installation on unix-like platforms. - -The quick and dirty installation that would install things -by default in /usr/local might look like: - -:: - - ./configure - make - make install - -Configure libLAS for debugging and install in my home directory: - -:: - - ./configure --enable-debug --prefix=/home/hobu/liblas - -If you are building directly from subversion, you will need to generate -the configure script first. This will require that your system have -autotools installed. - -:: - - ./autogen.sh - -Windows -~~~~~~~~~~~~~~~~~~~ - -Copy the windows package zip file into a directory of your -choosing and unzip. You should be able to run the utility -applications. \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/install-sh work/liblas-src-1.2.1/install-sh --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/install-sh 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/install-sh 1970-01-01 08:00:00.000000000 +0800 @@ -1,507 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2006-10-14.15 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -posix_glob= -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chmodcmd=$chmodprog -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - shift - shift - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac -done - -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; - esac - - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac - - oIFS=$IFS - IFS=/ - $posix_glob && set -f - set fnord $dstdir - shift - $posix_glob && set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/ltmain.sh work/liblas-src-1.2.1/ltmain.sh --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/ltmain.sh 2009-10-03 01:02:34.000000000 +0800 +++ work/liblas-src-1.2.1/ltmain.sh 1970-01-01 08:00:00.000000000 +0800 @@ -1,7874 +0,0 @@ -# Generated from ltmain.m4sh. - -# ltmain.sh (GNU libtool) 2.2.4 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.4 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . - -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=2.2.4 -TIMESTAMP="" -package_revision=1.2976 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done - -$lt_unset CDPATH - - - - - -: ${CP="cp -f"} -: ${ECHO="echo"} -: ${EGREP="/usr/bin/grep -E"} -: ${FGREP="/usr/bin/grep -F"} -: ${GREP="/usr/bin/grep"} -: ${LN_S="ln -s"} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SED="/opt/local/bin/gsed"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - -# Generated shell functions inserted here. - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: -func_dirname_and_basename "$progpath" -progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=: - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname${mode+: }$mode: $*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` - done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "X$my_tmpdir" | $Xsed -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - - - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $SED -n '/^# Usage:/,/# -h/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - $ECHO - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help -# Echo long help message to standard output and exit. -func_help () -{ - $SED -n '/^# Usage:/,/# Report bugs to/ { - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p - }' < "$progpath" - exit $? -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - func_error "missing argument for $1" - exit_cmd=exit -} - -exit_cmd=: - - - - - -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. -{ - - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - - # Parse non-mode specific arguments: - while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" - func_echo "enabling shell trace mode" - opt_debug='set -x' - $opt_debug - ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift - ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" - shift - ;; - - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - ;; - - --verbose| -v) preserve_args="$preserve_args $opt" - opt_silent=false - ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here - shift - ;; - - # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} - shift - ;; - - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break - ;; - esac - done - - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps - ;; - esac - - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - test -z "$mode" && func_fatal_error "error: you must specify a MODE." - - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} - - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" - done - case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T <?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - removelist="$removelist $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - command="$command -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - command="$command -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$mode'" - ;; - esac - - $ECHO - $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? -} - - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" - fi - if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $ECHO - - $ECHO "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." - ;; - *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - $ECHO "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS -} - -test "$mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - dir="$dir$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin | *mingw* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - $ECHO >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - $ECHO >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - - -# func_emit_wrapper arg -# -# emit a libtool wrapper script on stdout -# don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variable -# set therein. -# -# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the '.lib' directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $ECHO "\ - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} -# end: func_emit_wrapper - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -# define setmode _setmode -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} -#else -# define LTWRAPPER_DEBUGPRINTF(args) -#endif - -const char *program_name = NULL; - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); - -static const char *script_text = -EOF - - func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - - cat </dev/null || echo $SHELL` - case $lt_newargv0 in - *.exe | *.EXE) ;; - *) lt_newargv0=$lt_newargv0.exe ;; - esac - ;; - * ) lt_newargv0=$SHELL ;; - esac - fi - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal ("Could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -static void -lt_error_core (int exit_status, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - weak_libs="$weak_libs $arg" - prev= - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname '-L' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) - compiler_flags="$compiler_flags $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$linker_flags $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_duplicate_deps ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - case $lib in - *.la) func_source "$lib" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` - case " $weak_libs " in - *" $deplib_base "*) ;; - *) deplibs="$deplibs $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - dir=$func_stripname_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $ECHO - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." - else - $ECHO - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) temp_rpath="$temp_rpath$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw*) - # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $ECHO - $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_dirname "$deplib" "" "." - dir="$func_dirname_result" - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - $ECHO - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - libobjs="$libobjs $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $ECHO - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $ECHO - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` - done - fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO - if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." - else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." - fi - $ECHO "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output - for obj in $save_libobjs - do - $ECHO "$obj" >> $output - done - $ECHO ')' >> $output - delfiles="$delfiles $output" - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - $ECHO "$obj" >> $output - done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - delfiles="$delfiles $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $ECHO "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" - ;; - *) newdlfiles="$newdlfiles $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$mode" = link || test "$mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$mode" = uninstall || test "$mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/Makefile.am work/liblas-src-1.2.1/Makefile.am --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/Makefile.am 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/Makefile.am 1970-01-01 08:00:00.000000000 +0800 @@ -1,18 +0,0 @@ -SUBDIRS = src apps include test - -if GDAL_IS_CONFIG -GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -endif - -if GEOTIFF_IS_CONFIG -GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -endif - -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail - - -EXTRA_DIST = \ - nmake.opt \ - makefile.vc \ - src/makefile.vc \ - src/Version.rc \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/Makefile.in work/liblas-src-1.2.1/Makefile.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/Makefile.in 2009-10-03 01:02:37.000000000 +0800 +++ work/liblas-src-1.2.1/Makefile.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,627 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GDAL_INC = @GDAL_INC@ -GDAL_PREFIX = @GDAL_PREFIX@ -GEOTIFF_INC = @GEOTIFF_INC@ -GEOTIFF_PREFIX = @GEOTIFF_PREFIX@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE_VERSION = @RELEASE_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = src apps include test -@GDAL_IS_CONFIG_TRUE@GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -@GEOTIFF_IS_CONFIG_TRUE@GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail -EXTRA_DIST = \ - nmake.opt \ - makefile.vc \ - src/makefile.vc \ - src/Version.rc - -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/makefile.vc work/liblas-src-1.2.1/makefile.vc --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/makefile.vc 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/makefile.vc 1970-01-01 08:00:00.000000000 +0800 @@ -1,85 +0,0 @@ -# $Id$ -# -# Main libLAS makefile for use with NMAKE and Microsoft Visual C++ -# -LAS_ROOT = . - -!INCLUDE nmake.opt - -CC= cl -LINK= link - -default: src_dir apps_dir - -src_dir: - cd src - $(MAKE) /f makefile.vc - cd .. - -apps_dir: - cd apps - $(MAKE) /f makefile.vc - cd .. - -clean: - -del *.bak - -del *.lib - -del *.obj - -del *.pdb - cd src - $(MAKE) /f makefile.vc clean - cd .. - cd apps - $(MAKE) /f makefile.vc clean - cd .. - -rmdir /s /q osgeo4w - -rmdir /s /q $(BINDIR) - -rmdir /s /q packages - -install: src_dir apps_dir - -mkdir $(BINDIR) - -mkdir $(LAS_HOME)\packages - -mkdir $(BINDIR)\lib - -mkdir $(BINDIR)\include\liblas - -mkdir $(OSGEO4W_DIR) - -mkdir $(OSGEO4W_DIR)\lib - -mkdir $(OSGEO4W_DIR)\devel - -mkdir $(OSGEO4W_DIR)\lib\bin - -mkdir $(OSGEO4W_DIR)\devel\include - -mkdir $(OSGEO4W_DIR)\devel\include\liblas - -mkdir $(OSGEO4W_DIR)\devel\lib - -mkdir $(OSGEO4W_DIR)\apps\python25\lib\site-packages\liblas - cd src - $(MAKE) /f makefile.vc install - cd .. - cd apps - $(MAKE) /f makefile.vc install - cd .. - xcopy /y /r /d /f src\liblas_i.lib $(BINDIR)\lib - xcopy /y /r /d /f src\liblas_i.lib $(OSGEO4W_DIR)\devel\lib - xcopy /y /r /d /f src\liblas.lib $(BINDIR)\lib - xcopy /y /r /d /f src\liblas.lib $(OSGEO4W_DIR)\devel\lib - xcopy /y /r /d /f src\Version.rc $(BINDIR)\include\liblas - xcopy /y /r /d /f src\Version.rc $(OSGEO4W_DIR)\devel\include\liblas - xcopy /y /r /d /f /s include\liblas $(BINDIR)\include\liblas - xcopy /y /r /d /f /s include\liblas $(OSGEO4W_DIR)\devel\include\liblas - xcopy /y /r /d /f /s python\liblas\*.py $(OSGEO4W_DIR)\apps\python25\lib\site-packages\liblas - -package: install - cd $(LAS_HOME)/osgeo4w/lib - C:\cygwin\bin\tar.exe cvf ../../packages/liblas-$(PACKAGE_VERSION).tar * - c:\cygwin\bin\bzip2.exe -f /cygdrive/c/cvs/liblas/packages/liblas-$(PACKAGE_VERSION).tar - cd $(LAS_HOME)/osgeo4w/ - C:\cygwin\bin\tar.exe cvf ../packages/liblas-python-$(PACKAGE_VERSION).tar apps - c:\cygwin\bin\bzip2.exe -f /cygdrive/c/cvs/liblas/packages/liblas-python-$(PACKAGE_VERSION).tar - cd $(LAS_HOME)/osgeo4w/devel - C:\cygwin\bin\tar.exe cvf ../../packages/liblas-devel-$(PACKAGE_VERSION).tar * - c:\cygwin\bin\bzip2.exe -f /cygdrive/c/cvs/liblas/packages/liblas-devel-$(PACKAGE_VERSION).tar - cd $(LAS_HOME)/osgeo4w/ - cd $(LAS_HOME)/ - xcopy /y /r /d /f /s c:\osgeo4w\bin\geotiff.dll $(BINDIR) - xcopy /y /r /d /f /s c:\osgeo4w\bin\libtiff.dll $(BINDIR) - xcopy /y /r /d /f /s c:\osgeo4w\bin\jpeg_osgeo.dll $(BINDIR) - xcopy /y /r /d /f /s c:\osgeo4w\bin\jpeg12_osgeo.dll $(BINDIR) - xcopy /y /r /d /f /s c:\osgeo4w\bin\zlib_osgeo.dll $(BINDIR) - c:\cygwin\bin\zip.exe -r packages/liblas-$(PACKAGE_VERSION)-win32.zip bin \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/missing work/liblas-src-1.2.1/missing --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/missing 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/missing 1970-01-01 08:00:00.000000000 +0800 @@ -1,367 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2006-05-10.23 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/nmake.opt work/liblas-src-1.2.1/nmake.opt --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/nmake.opt 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/nmake.opt 1970-01-01 08:00:00.000000000 +0800 @@ -1,198 +0,0 @@ -# $Id$ -# -# nmake.opt - main configuration file for NMAKE makefiles -# -!MESSAGE *** libLAS Build Configuration *** -!INCLUDE - -############################################################################### -# For convenience, user may put custom settings to private mynmake.opt -# and use EXT_NMAKE_OPT option while calling nmake.exe, as follows: -# -# nmake -f makefile.vc EXT_NMAKE_OPT=mynmake.opt -!IFDEF EXT_NMAKE_OPT -!MESSAGE *** Setting EXT_NMAKE_OPT $(EXT_NMAKE_OPT) -!INCLUDE $(EXT_NMAKE_OPT) -!ENDIF - -############################################################################### -# libLAS package settings - -LAS_LIB = liblas.lib -LAS_DLL = liblas1.dll -LAS_LIB_DLL = liblas_i.lib - -# only used for filenames of packages -PACKAGE_VERSION = 1.2.1 - -!MESSAGE *** Setting PACKAGE_VERSION $(PACKAGE_VERSION) - -############################################################################### -# Set BUILD_DEBUG balue to YES if you want to make debug build -# and to prepare not optimized binaries. -!IFNDEF BUILD_DEBUG -BUILD_DEBUG = NO -!ENDIF - -!MESSAGE *** Setting BUILD_DEBUG $(BUILD_DEBUG) - -############################################################################### -# libLAS include directories -INCLUDES = -I$(LAS_ROOT)/include -I$(LAS_ROOT)/include/liblas/capi - -!MESSAGE *** Setting libLAS INCLUDE to -I$(LAS_ROOT)/include -I$(LAS_ROOT)/include/liblas/capi - -############################################################################### -# GeoTIFF Support -# Uncomment the folling line to build GeoTIFF support for reading and -# writing LAS files with Coordinate Systems information. -# comment out GEOTIFF_HOME if you are building against a GDAL source tree - -!IFNDEF GEOTIFF_HOME -GEOTIFF_HOME=C:\OSGeo4W -!ENDIF - -!IF "$(GEOTIFF_HOME)" != "" && EXIST("$(GEOTIFF_HOME)") -!MESSAGE *** GeoTIFF support enabled -!MESSAGE *** Setting GEOTIFF_HOME $(GEOTIFF_HOME) - -GEOTIFF_LIB = $(GEOTIFF_HOME)\lib\geotiff_i.lib -GEOTIFF_INCLUDE = -I$(GEOTIFF_HOME)\include -INCLUDES = $(INCLUDES) $(GEOTIFF_INCLUDE) - -!ELSE -GEOTIFF_HOME="" -!MESSAGE *** Support of GeoTIFF has been disabled (GEOTIFF_HOME not set) -!ENDIF - -############################################################################### -# GDAL/OGR Support -# Uncomment the following line to build OGR support for the las2ogr command -# and WKT SRS support -#USE_GDAL_SOURCE_TREE=YES -#GDAL_HOME=C:\cvs\buildkit\gdal - -!IFNDEF GDAL_HOME -GDAL_HOME=C:\OSGeo4W -!ENDIF - -!IF "$(GDAL_HOME)" != "" && EXIST("$(GDAL_HOME)") -!MESSAGE *** GDAL/OGR support enabled -!MESSAGE *** Setting GDAL_HOME $(GDAL_HOME) - -GDAL_LIB = $(GDAL_HOME)\lib\gdal_i.lib -GDAL_INCLUDE = -I$(GDAL_HOME)\include -!IF "$(USE_GDAL_SOURCE_TREE)" == "YES" -GDAL_LIB = $(GDAL_HOME)\gdal_i.lib -GDAL_INCLUDE = -I$(GDAL_HOME)\port -I$(GDAL_HOME)\frmts\gtiff\libgeotiff -I$(GDAL_HOME)\frmts\gtiff\libtiff -I$(GDAL_HOME)\ogr -I$(GDAL_HOME)\gcore -GEOTIFF_INCLUDE = -I$(GEOTIFF_HOME)\frmts\gtiff\libgeotiff -!ENDIF -INCLUDES = $(INCLUDES) $(GDAL_INCLUDE) - -!ELSE -GDAL_HOME="" -!MESSAGE *** Support of GDAL/OGR has been disabled (GDAL_HOME not set) -!ENDIF - -############################################################################### -# Distribution directories - -LAS_HOME=C:\cvs\liblas -BINDIR=$(LAS_HOME)\bin -OSGEO4W_DIR = $(LAS_HOME)\osgeo4w -PYDLL_DIR = $(LAS_HOME)\python - -############################################################################### -# Derive version of Visual C++ being used from NMAKE if not specified -# -# WARNING: -# If we should expect variety of NMAKE build versions, tests below may fail -# and we will need to fall back to setting MSVCVER as command line parameter. -# -!IF "$(_NMAKE_VER)" == "" -MSVCVER = 4.0 -!ERROR *** Failed to determine version of Visual C++ -!ELSEIF "$(_NMAKE_VER)" == "162" -MSVCVER = 5.0 -!ERROR *** Detected Visual C++ 5.0 - NOT SUPPORTED -!ELSEIF "$(_NMAKE_VER)" == "6.00.8168.0" -MSVCVER = 6.0 -!ERROR *** Detected Visual C++ 6.0 - NOT SUPPORTED -!ELSEIF "$(_NMAKE_VER)" == "7.00.9466" -MSVCVER = 7.0 -!ELSEIF "$(_NMAKE_VER)" == "7.10.3077" -MSVCVER = 7.1 -!ELSEIF "$(_NMAKE_VER)" == "8.00.50727.42" -MSVCVER = 8.0 -!ELSEIF "$(_NMAKE_VER)" == "8.00.50727.762" -MSVCVER = 8.0 -!ELSEIF "$(_NMAKE_VER)" == "9.00.30729.01" -MSVCVER = 9.0 -!ELSE -MSVCVER = 0.0 -!ENDIF - -!IF "$(MSVCVER)" == "0.0" -!MESSAGE *** Cannot determined Visual C++ version -!ERROR *** Aborting make job -!ELSE -!MESSAGE *** Using Microsoft NMAKE version $(_NMAKE_VER) -!MESSAGE *** Using Microsoft Visual C++ version $(MSVCVER) -!ENDIF - -############################################################################### -# Compilation flags for Release and Debug modes - -!IF "$(BUILD_DEBUG)" == "YES" -OPTFLAGS= /nologo /MDd /EHsc /Z7 /W4 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /DDEBUG /D_DEBUG /Fd$(LAS_ROOT)\las.pdb -LAS_LIB = liblas_d.lib -LAS_DLL = liblas_d1.dll -LAS_LIB_DLL = libl1as_i.lib -!ELSE - -# You may need to remove /GR if you are statically linking libLAS -OPTFLAGS=/nologo /MD /EHsc /Ox /GR /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /DNDEBUG -LAS_LIB = liblas.lib -LAS_DLL = liblas1.dll -LAS_LIB_DLL = liblas_i.lib -!ENDIF - -# Check if multiple process build available -!IF "$(MSVCVER)" == "9.0" -MPFLAGS=/MP -!MESSAGE *** Using /MP flag with number of effective processors -!ELSE -MPFLAGS="" -!ENDIF - -CFLAGS= $(MPFLAGS) $(OPTFLAGS) $(INCLUDES) - -!IF "$(GEOTIFF_HOME)" != "" && EXIST("$(GEOTIFF_HOME)") -CFLAGS = $(CFLAGS) /DHAVE_LIBGEOTIFF=1 -!ENDIF - -!IF "$(GDAL_HOME)" != "" && EXIST("$(GDAL_HOME)") -CFLAGS = $(CFLAGS) /DHAVE_GDAL=1 -!IF "$(USE_GDAL_SOURCE_TREE)" == "YES" -CFLAGS = $(CFLAGS) /DHAVE_LIBGEOTIFF=1 -!ENDIF -!ENDIF - -############################################################################### -# Building toolset programs - -# Compiler executable -CC = cl.exe - -# Linker executable -# - Dynamic-Linked Libraries -# $(LINK) /dll -# - Static Libraries (use of lib.exe wrapper is not portable, see VC++ Toolkit 2003) -# $(LINK) /lib -LINK = link.exe - -.c.obj: - $(CC) $(CFLAGS) /c $*.c /Fo$*.obj - -.cpp.obj: - $(CC) $(CFLAGS) /c $*.cpp /Fo$*.obj diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/README work/liblas-src-1.2.1/README --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/README 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/README 1970-01-01 08:00:00.000000000 +0800 @@ -1,220 +0,0 @@ - -libLAS - LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset -============================================================================== - -libLAS is a C/C++ library for reading and writing ASPRS LAS versions 1.0, 1.1 and 1.2 -data. The LAS format is a sequential binary format used to store data from sensors -and as intermediate processing storage by some `LiDAR`_-related applications. - -libLAS is available under the terms of the `BSD License`_. It builds on work -by `Martin Isenburg and Jonathan Shewchuk`_ of the University of North -Carolina in their `LAStools`_ project by replacing the base C++ library -with new development and porting Martin's tools this new code. - -libLAS' initial development was supported by the `IGSB`_ of the Iowa DNR -for use in its state-wide `LIDAR`_ project. - - -Download ------------------------------------------------------------------------------- - -The 1.2.0 version of libLAS can be downloaded from http://liblas.org/wiki/1.2.0 - -Older releases may be obtained from http://liblas.org/wiki/Releases - -Binaries -.............................................................................. - - -Windows binaries of libLAS are provided in two forms. The easiest form is -to obtain `OSGeo4W`_ and select the libLAS package to install. Alternatively, -you can download a Windows package with full spatial reference support from -the release page. GDAL support is only provided with the `OSGeo4W`_ package, however. - -Linux, Mac OS X, and Solaris binaries are not provided. The source code -uses the standard GNU autotools/automake stack for compilation and installation. - - -Documentation ------------------------------------------------------------------------------- - -`LAStools`_ / libLAS Command-line Utilities -.............................................................................. - -* `lasinfo`_ -* `lasmerge`_ -* `las2las`_ -* `las2txt`_ -* `txt2las`_ -* `las2ogr`_ - -Software Development with libLAS -.............................................................................. - -* `FOSS4G 2008`_ presentation that provides a basic overview of the design and philosophy of libLAS -* `ASPRS Workshop Demo`_ by Jason Woolard of NOAA describing how to use libLAS with Python -* `Tutorials`_ - tutorials on using libLAS from C++, Python and .NET/Mono languages -* `LAS C API`_- doxygen docs that describe the libLAS C API -* `dotnetLibLAS API`_ - docs for the .NET API -* `LAS Doxygen Docs`_ - doxygen docs of the entire C/C++ API -* `LAS Format Elements`_ - comparison of elements of LAS Format 1.0 and 1.1 -* `Software`_ - a list of geospatial software with reading and writing capabilities of LAS Format -* `Resources`_ - a list of general LiDAR/LAS resources - -LAS Format Specifications -.............................................................................. - -The LAS Format Standard is maintained by `ASPRS Standards Committee`_. LAS -format standard documents are available in PDF format: - -* `LAS 1.2 Format Standard`_ (2008-09-02) -* `LAS 1.1 Format Standard`_ (2005-05-07) -* `LAS 1.0 Format Standard`_ (2003-05-09) - -License ------------------------------------------------------------------------------- - -libLAS is available under the terms of the `BSD License`_. -See `License`_ for a copy. - -FAQ ------------------------------------------------------------------------------- - -The FAQ is available from http://liblas.org/wiki/FAQ - -Features of libLAS ------------------------------------------------------------------------------- - -Open Source -.............................................................................. - -libLAS is open source software. You can embed it in your own applications -(and even resell it) as long as you follow the crediting restriction of the BSD -license. See `License`_ for more detail. - -Multiple APIs -.............................................................................. - -libLAS has C, C++, .NET, and Python APIs. - -Spatial Reference System Support -.............................................................................. - -Linked against a 1.2.5+ version of `libgeotiff`_, you can set and get the spatial reference -systems of LAS files using simple `proj.4`_ coordinate system definitions. -Alternatively, with libLAS 1.2, you can link against `GDAL`_ to be able to -manipulate spatial references using WKT. - -Simple Variable Length Record Abstraction -.............................................................................. - -libLAS provides a sensible abstraction for working with variable length records (VLR) -in LAS files, and it transparently manages the VLRs related to spatial referencing -systems for you. - -Command-line Utilities -.............................................................................. - -libLAS provides ports of the `LAStools`_ utilities by Martin Isenburg for doing -things like translating from one version of the LAS format to another, inspecting -header information, and translating LAS data to and from text. - -Cross-platform operation -.............................................................................. - -libLAS is known to work on all editions of Microsoft Visual C++ 7.1+ (Windows) and -GCC 4.1+ (Mac OS X and Linux) platforms on both big- and little-endian architectures. - - -Development ------------------------------------------------------------------------------- - -Authors -.............................................................................. - -The libLAS development team are: - - * `Howard Butler`_ - * `Mateusz Loskot`_ - * `Phil Vachon`_ - * Martin Vales - * `Frank Warmerdam`_ - -Special thanks to `Martin Isenburg and Jonathan Shewchuk`_ for their -`LAStools`_ pioneering implementation of the ASPRS LAS standard that made -development of the libLAS library possible. - -Subversion Tree -.............................................................................. - -The SVN repository URL is available at http://liblas.org/svn - -:: - - svn checkout http://liblas.org/svn/trunk/ - -Information about Trac -.............................................................................. - -* `Trac `_ Open Source Project -* `TracGuide `_ - Built-in Documentation -* `TracFaq `_ - Frequently Asked Questions -* `TracSupport `_ - Trac Support -* `reStructuredText Support in Trac `_ - - -Community ------------------------------------------------------------------------------- - -IRC -.............................................................................. - -Find the libLAS developers on IRC on #liblas at `Freenode`_. - -Mailing Lists -.............................................................................. - -* liblas-devel - http://lists.osgeo.org/mailman/listinfo/liblas-devel -* liblas-commits - http://lists.osgeo.org/mailman/listinfo/liblas-commits - - -.. _`LIDAR`: http://en.wikipedia.org/wiki/LIDAR -.. _`IGSB`: http://www.igsb.uiowa.edu/ -.. _`Martin Isenburg`: http://www.cs.unc.edu/~isenburg/ -.. _`LAStools`: http://www.cs.unc.edu/~isenburg/lastools/ -.. _`Martin Isenburg and Jonathan Shewchuk`: http://www.cs.unc.edu/~isenburg/lastools/ -.. _`LAS Format`: http://www.lasformat.org/ -.. _`LAS 1.2 Format Standard`: http://liblas.org/raw-attachment/wiki/WikiStart/asprs_las_format_v12.pdf -.. _`LAS 1.1 Format Standard`: http://liblas.org/raw-attachment/wiki/WikiStart/asprs_las_format_v11.pdf -.. _`LAS 1.0 Format Standard`: http://liblas.org/raw-attachment/wiki/WikiStart/asprs_las_format_v10.pdf -.. _`ASPRS Standards Committee`: http://www.asprs.org/society/committees/standards/lidar_exchange_format.html -.. _`Howard Butler`: http://hobu.biz -.. _`Mateusz Loskot`: http://mateusz.loskot.net -.. _`Phil Vachon`: http://www.geoscan.info -.. _`Frank Warmerdam`: http://home.gdal.org/warmerda/ -.. _`BSD license`: http://www.opensource.org/licenses/bsd-license.php -.. _`LAS Format Elements`: http://liblas.org/wiki/LASElements -.. _`Tutorials`: http://liblas.org/wiki/Tutorial -.. _`Software`: http://liblas.org/wiki/Software -.. _`Resources`: http://liblas.org/wiki/Resources -.. _`License`: http://liblas.org/wiki/License -.. _`las2las`: http://liblas.org/browser/trunk/doc/las2las.txt -.. _`las2txt`: http://liblas.org/browser/trunk/doc/las2txt.txt -.. _`lasinfo`: http://liblas.org/browser/trunk/doc/lasinfo.txt -.. _`lasmerge`: http://liblas.org/browser/trunk/doc/lasmerge.txt -.. _`txt2las`: http://liblas.org/browser/trunk/doc/txt2las.txt -.. _`las2ogr`: http://liblas.org/browser/trunk/doc/las2ogr.txt -.. _`Freenode`: http://freenode.net -.. _`Library Design`: http://liblas.org/wiki/LibraryDesign -.. _`FOSS4G 2008`: http://liblas.org/raw-attachment/wiki/WikiStart/liblas_foss4g_2008.pdf -.. _`LAS C API`: http://liblas.org/doxygen/liblas_8h.html -.. _`LAS Doxygen Docs`: http://liblas.org/doxygen/ -.. _`How To Release libLAS`: http://liblas.org/wiki/HowToRelease -.. _`libgeotiff`: http://www.remotesensing.org/geotiff/geotiff.html -.. _`7/28/2008`: http://lists.maptools.org/pipermail/geotiff/2008-July/000501.html -.. _`proj.4`: http://proj.maptools.org/ -.. _`GDAL`: http://www.gdal.org -.. _`OSGeo4W`: http://wiki.osgeo.org/wiki/OSGeo_Win32_Installer -.. _`dotnetLibLAS API`: http://liblas.org/wiki/dotnetapi -.. _`FOSS4G 2008`: http://liblas.org/raw-attachment/wiki/WikiStart/liblas_foss4g_2008.pdf -.. _`ASPRS Workshop Demo`: http://liblas.org/raw-attachment/wiki/WikiStart/ASPRS-Workshop-NOAA-Demo.pdf \ No newline at end of file diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/file.cpp work/liblas-src-1.2.1/src/detail/file.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/file.cpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/file.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,195 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: A composite class to handle read/write operations - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace liblas { namespace detail { - -FileImpl::FileImpl(std::string const& filename) - : m_mode(0), m_filename(filename), - m_istrm(0), m_ostrm(0), m_reader(0), m_writer(0) -{ - if (filename == "stdin") - { - m_istrm = &std::cin; - } - else - { - std::ios::openmode const mode = std::ios::in | std::ios::binary; - m_istrm = new std::ifstream(m_filename.c_str(), mode); - - if (!m_istrm->good()) - { - delete m_istrm; - throw_no_file_error(); - } - } - - // TODO: apply RAII - assert(0 != m_istrm); - m_reader = new LASReader(*m_istrm); - m_header = m_reader->GetHeader(); - - assert(0 == m_ostrm); -} - -FileImpl::FileImpl(std::string const& filename, LASHeader const& header, int mode) - : m_mode(mode), m_filename(filename), - m_istrm(0), m_ostrm(0), m_reader(0), m_writer(0), m_header(header) -{ - if (filename == "stdout") - { - m_ostrm = &std::cout; - } - else - { - std::ios::openmode m; - if ( (mode > 2) || (mode < 1)) { - throw std::runtime_error("File mode must be eWrite or eAppend"); - } - - // append mode - if (mode == 2) { - m = std::ios::out | std::ios::in | std::ios::binary | std::ios::ate; - } - // write mode - else { - m = std::ios::out | std::ios::binary | std::ios::ate; - } - m_ostrm = new std::ofstream(m_filename.c_str(), m); - - if (!m_ostrm->good()) - { - delete m_ostrm; - throw_no_file_error(); - } - } - - // TODO: apply RAII - assert(0 != m_ostrm); - m_writer = new LASWriter(*m_ostrm, m_header); - - assert(0 == m_istrm); -} - -FileImpl::~FileImpl() -{ - // NOTE: The order of destruction is very important. - // reader/writer first, then streams. - // In other words, kill clients first, suppliers afterwards. - - if (m_istrm != &std::cin && 0 != m_istrm) - { - assert(0 == m_writer); - assert(0 == m_ostrm); - delete m_reader; - m_reader = 0; - delete m_istrm; - m_istrm = 0; - } - - if (m_ostrm != &std::cout && 0 != m_ostrm) - { - assert(0 == m_reader); - assert(0 == m_istrm); - delete m_writer; - m_writer = 0; - delete m_ostrm; - m_ostrm = 0; - } -} - -std::string FileImpl::GetName() const -{ - return m_filename; -} - -int FileImpl::GetMode() const -{ - return m_mode; -} - -LASHeader const& FileImpl::GetHeader() const -{ - return m_header; -} - -LASReader& FileImpl::GetReader() -{ - if (0 == m_reader) - { - // TODO: Define specialized exception type for this error - std::string msg("Reader is file write-only: " + m_filename); - throw std::runtime_error(msg); - } - - return (*m_reader); -} - -LASWriter& FileImpl::GetWriter() -{ - if (0 == m_writer) - { - // TODO: Define specialized exception type for this error - std::string msg("Writer is file read-only: " + m_filename); - throw std::runtime_error(msg); - } - - return (*m_writer); -} - -void FileImpl::throw_no_file_error() const -{ - // TODO: Define specialized exception type for this error - // for example: liblas::open_error or liblas::no_file_error - std::string msg("can not open file " + m_filename); - throw std::runtime_error(msg); -} - -}} // namespace liblas::detail diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader.cpp work/liblas-src-1.2.1/src/detail/reader.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/reader.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,282 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: Reader implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -// -// // GeoTIFF -// #ifdef HAVE_LIBGEOTIFF -// #include -// #include -// #include "geo_normalize.h" -// #include "geo_simpletags.h" -// #include "geovalues.h" -// #endif // HAVE_LIBGEOTIFF - -#ifdef HAVE_GDAL -#include -#endif - -// std -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { - -Reader::Reader(std::istream& ifs) : - m_ifs(ifs), m_size(0), m_current(0), - m_transform(0), m_in_ref(0), m_out_ref(0) -{ -} - -Reader::~Reader() -{ -#ifdef HAVE_GDAL - if (m_transform) - { - OCTDestroyCoordinateTransformation(m_transform); - } - if (m_in_ref) - { - OSRDestroySpatialReference(m_in_ref); - } - if (m_out_ref) - { - OSRDestroySpatialReference(m_out_ref); - } - -#endif -} - -std::istream& Reader::GetStream() const -{ - return m_ifs; -} - -void Reader::FillPoint(PointRecord& record, LASPoint& point) -{ - - point.SetX(record.x); - point.SetY(record.y); - point.SetZ(record.z); - - if (m_transform) - { - Project(point); - } - - point.SetIntensity(record.intensity); - point.SetScanFlags(record.flags); - point.SetClassification(record.classification); - point.SetScanAngleRank(record.scan_angle_rank); - point.SetUserData(record.user_data); - point.SetPointSourceID(record.point_source_id); -} - -bool Reader::ReadVLR(LASHeader& header) -{ - VLRHeader vlrh = { 0 }; - - m_ifs.seekg(header.GetHeaderSize(), std::ios::beg); - uint32_t count = header.GetRecordsCount(); - header.SetRecordsCount(0); - for (uint32_t i = 0; i < count; ++i) - { - read_n(vlrh, m_ifs, sizeof(VLRHeader)); - - uint16_t length = vlrh.recordLengthAfterHeader; - if (length < 1) - { - throw std::domain_error("VLR record length must be at least 1 byte long"); - } - std::vector data; - data.resize(length); - - read_n(data.front(), m_ifs, length); - - LASVariableRecord vlr; - vlr.SetReserved(vlrh.reserved); - vlr.SetUserId(std::string(vlrh.userId)); - vlr.SetDescription(std::string(vlrh.description)); - vlr.SetRecordLength(vlrh.recordLengthAfterHeader); - vlr.SetRecordId(vlrh.recordId); - vlr.SetData(data); - - header.AddVLR(vlr); - } - return true; -} - -bool Reader::ReadGeoreference(LASHeader& header) -{ - std::vector vlrs; - for (uint16_t i = 0; i < header.GetRecordsCount(); ++i) - { - LASVariableRecord record = header.GetVLR(i); - vlrs.push_back(record); - } - - LASSpatialReference srs(vlrs); - header.SetSRS(srs); - - // keep a copy on the reader in case we're going to reproject data - // on the way out. - m_in_srs = srs; - - return true; -} - -void Reader::Reset(LASHeader const& header) -{ - m_ifs.clear(); - m_ifs.seekg(0); - - // Reset sizes and set internal cursor to the beginning of file. - m_current = 0; - m_size = header.GetPointRecordsCount(); -} - -void Reader::SetSRS(const LASSpatialReference& srs) -{ - m_out_srs = srs; -#ifdef HAVE_GDAL - m_in_ref = OSRNewSpatialReference(0); - m_out_ref = OSRNewSpatialReference(0); - - int result = OSRSetFromUserInput(m_in_ref, m_in_srs.GetWKT().c_str()); - if (result != OGRERR_NONE) - { - std::ostringstream msg; - msg << "Could not import input spatial reference for Reader::" << CPLGetLastErrorMsg() << result; - std::string message(msg.str()); - throw std::runtime_error(message); - } - - result = OSRSetFromUserInput(m_out_ref, m_out_srs.GetWKT().c_str()); - if (result != OGRERR_NONE) - { - std::ostringstream msg; - msg << "Could not import output spatial reference for Reader::" << CPLGetLastErrorMsg() << result; - std::string message(msg.str()); - throw std::runtime_error(message); - } - - m_transform = OCTNewCoordinateTransformation( m_in_ref, m_out_ref); - -#endif -} - -void Reader::Project(LASPoint& point) -{ -#ifdef HAVE_GDAL - - int ret = 0; - double x = point.GetX(); - double y = point.GetY(); - double z = point.GetZ(); - - ret = OCTTransform(m_transform, 1, &x, &y, &z); - if (!ret) - { - std::ostringstream msg; - msg << "Could not project point for Reader::" << CPLGetLastErrorMsg() << ret; - std::string message(msg.str()); - throw std::runtime_error(message); - } - - point.SetX(x); - point.SetY(y); - point.SetZ(z); -#else - UNREFERENCED_PARAMETER(point); -#endif -} - -Reader* ReaderFactory::Create(std::istream& ifs) -{ - if (!ifs) - { - throw std::runtime_error("input stream state is invalid"); - } - - // Determine version of given LAS file and - // instantiate appropriate reader. - uint8_t verMajor = 0; - uint8_t verMinor = 0; - ifs.seekg(24, std::ios::beg); - detail::read_n(verMajor, ifs, 1); - detail::read_n(verMinor, ifs, 1); - - if (1 == verMajor && 0 == verMinor) - { - return new v10::ReaderImpl(ifs); - } - else if (1 == verMajor && 1 == verMinor) - { - return new v11::ReaderImpl(ifs); - } - else if (1 == verMajor && 2 == verMinor) - { - return new v12::ReaderImpl(ifs); - } - else if (2 == verMajor && 0 == verMinor ) - { - // TODO: LAS 2.0 read/write support - throw std::runtime_error("LAS 2.0+ file detected but unsupported"); - } - - throw std::runtime_error("LAS file of unknown version"); -} - - -void ReaderFactory::Destroy(Reader* p) -{ - delete p; - p = 0; -} - -}} // namespace liblas::detail diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader10.cpp work/liblas-src-1.2.1/src/detail/reader10.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader10.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/reader10.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,288 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.0 reader implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include - -// std -#include -#include -#include -#include // std::size_t, std::free -#include - -namespace liblas { namespace detail { namespace v10 { - -ReaderImpl::ReaderImpl(std::istream& ifs) : Base(ifs) -{ -} - -std::size_t ReaderImpl::GetVersion() const -{ - return eLASVersion10; -} - -bool ReaderImpl::ReadHeader(LASHeader& header) -{ - using detail::read_n; - - // Helper variables - uint8_t n1 = 0; - uint16_t n2 = 0; - uint32_t n4 = 0; - double x1 = 0; - double y1 = 0; - double z1 = 0; - double x2 = 0; - double y2 = 0; - double z2 = 0; - std::string buf; - std::string fsig; - - m_ifs.seekg(0); - - // 1. File Signature - read_n(fsig, m_ifs, 4); - header.SetFileSignature(fsig); - - // 2. Reserved - // This data must always contain Zeros. - read_n(n4, m_ifs, sizeof(n4)); - - // 3-6. GUID data - uint32_t d1 = 0; - uint16_t d2 = 0; - uint16_t d3 = 0; - uint8_t d4[8] = { 0 }; - read_n(d1, m_ifs, sizeof(d1)); - read_n(d2, m_ifs, sizeof(d2)); - read_n(d3, m_ifs, sizeof(d3)); - read_n(d4, m_ifs, sizeof(d4)); - liblas::guid g(d1, d2, d3, d4); - header.SetProjectId(g); - - // 7. Version major - read_n(n1, m_ifs, sizeof(n1)); - header.SetVersionMajor(n1); - - // 8. Version minor - read_n(n1, m_ifs, sizeof(n1)); - header.SetVersionMinor(n1); - - // 9. System ID - read_n(buf, m_ifs, 32); - header.SetSystemId(buf); - - // 10. Generating Software ID - read_n(buf, m_ifs, 32); - header.SetSoftwareId(buf); - - // 11. Flight Date Julian - read_n(n2, m_ifs, sizeof(n2)); - header.SetCreationDOY(n2); - - // 12. Year - read_n(n2, m_ifs, sizeof(n2)); - header.SetCreationYear(n2); - - // 13. Header Size - // NOTE: Size of the stanard header block must always be 227 bytes - read_n(n2, m_ifs, sizeof(n2)); - - // 14. Offset to data - read_n(n4, m_ifs, sizeof(n4)); - if (n4 < header.GetHeaderSize()) - { - // TODO: Move this test to LASHeader::Validate() - throw std::domain_error("offset to point data smaller than header size"); - } - header.SetDataOffset(n4); - - // 15. Number of variable length records - read_n(n4, m_ifs, sizeof(n4)); - header.SetRecordsCount(n4); - - // 16. Point Data Format ID - read_n(n1, m_ifs, sizeof(n1)); - if (n1 == LASHeader::ePointFormat0) { - header.SetDataFormatId(LASHeader::ePointFormat0); - } - else if (n1 == LASHeader::ePointFormat1) { - header.SetDataFormatId(LASHeader::ePointFormat1); - } - else if (n1 == LASHeader::ePointFormat2) { - header.SetDataFormatId(LASHeader::ePointFormat2); - } - else if (n1 == LASHeader::ePointFormat3) { - header.SetDataFormatId(LASHeader::ePointFormat3); - } - else { - throw std::domain_error("invalid point data format"); - } - - // 17. Point Data Record Length - // NOTE: No need to set record length because it's - // determined on basis of point data format. - read_n(n2, m_ifs, sizeof(n2)); - - // 18. Number of point records - read_n(n4, m_ifs, sizeof(n4)); - header.SetPointRecordsCount(n4); - - // 19. Number of points by return - std::vector::size_type const srbyr = 5; - uint32_t rbyr[srbyr] = { 0 }; - read_n(rbyr, m_ifs, sizeof(rbyr)); - for (std::size_t i = 0; i < srbyr; ++i) - { - header.SetPointRecordsByReturnCount(i, rbyr[i]); - } - - // 20-22. Scale factors - read_n(x1, m_ifs, sizeof(x1)); - read_n(y1, m_ifs, sizeof(y1)); - read_n(z1, m_ifs, sizeof(z1)); - header.SetScale(x1, y1, z1); - - // 23-25. Offsets - read_n(x1, m_ifs, sizeof(x1)); - read_n(y1, m_ifs, sizeof(y1)); - read_n(z1, m_ifs, sizeof(z1)); - header.SetOffset(x1, y1, z1); - - // 26-27. Max/Min X - read_n(x1, m_ifs, sizeof(x1)); - read_n(x2, m_ifs, sizeof(x2)); - - // 28-29. Max/Min Y - read_n(y1, m_ifs, sizeof(y1)); - read_n(y2, m_ifs, sizeof(y2)); - - // 30-31. Max/Min Z - read_n(z1, m_ifs, sizeof(z1)); - read_n(z2, m_ifs, sizeof(z2)); - - header.SetMax(x1, y1, z1); - header.SetMin(x2, y2, z2); - - Reset(header); - - return true; -} - -bool ReaderImpl::ReadNextPoint(LASPoint& point, const LASHeader& header) -{ - // Read point data record format 0 - - // TODO: Replace with compile-time assert - - detail::PointRecord record; - double t=0; - - assert(LASHeader::ePointSize0 == sizeof(record)); - - if (0 == m_current) - { - m_ifs.clear(); - m_ifs.seekg(header.GetDataOffset(), std::ios::beg); - } - - if (m_current < m_size) - { - try - { - detail::read_n(record, m_ifs, sizeof(PointRecord)); - ++m_current; - } - catch (std::out_of_range const& e) // we reached the end of the file - { - std::cerr << e.what() << std::endl; - return false; - } - - Reader::FillPoint(record, point); - point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - } - return true; - } - - return false; -} - -bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) -{ - // Read point data record format 0 - - // TODO: Replace with compile-time assert - double t=0; - detail::PointRecord record; - assert(LASHeader::ePointSize0 == sizeof(record)); - - if (m_size <= n) - return false; - std::streamsize pos = (static_cast(n) * header.GetDataRecordLength()) + header.GetDataOffset(); - - m_ifs.clear(); - m_ifs.seekg(pos, std::ios::beg); - detail::read_n(record, m_ifs, sizeof(record)); - - Reader::FillPoint(record, point); - point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); - - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - } - - return true; -} - -}}} // namespace liblas::detail::v10 - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader11.cpp work/liblas-src-1.2.1/src/detail/reader11.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader11.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/reader11.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,295 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.1 reader implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include - -// std -#include -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { namespace v11 { - -ReaderImpl::ReaderImpl(std::istream& ifs) : Base(ifs) -{ -} - -std::size_t ReaderImpl::GetVersion() const -{ - return eLASVersion11; -} - -bool ReaderImpl::ReadHeader(LASHeader& header) -{ - using detail::read_n; - - // Helper variables - uint8_t n1 = 0; - uint16_t n2 = 0; - uint32_t n4 = 0; - double x1 = 0; - double y1 = 0; - double z1 = 0; - double x2 = 0; - double y2 = 0; - double z2 = 0; - std::string buf; - std::string fsig; - - m_ifs.seekg(0); - - // 1. File Signature - read_n(fsig, m_ifs, 4); - header.SetFileSignature(fsig); - - // 2. File Source ID - read_n(n2, m_ifs, sizeof(n2)); - header.SetFileSourceId(n2); - - // 3. Reserved - // This data must always contain Zeros. - read_n(n2, m_ifs, sizeof(n2)); - - // 4-7. Project ID - uint32_t d1 = 0; - uint16_t d2 = 0; - uint16_t d3 = 0; - uint8_t d4[8] = { 0 }; - read_n(d1, m_ifs, sizeof(d1)); - read_n(d2, m_ifs, sizeof(d2)); - read_n(d3, m_ifs, sizeof(d3)); - read_n(d4, m_ifs, sizeof(d4)); - liblas::guid g(d1, d2, d3, d4); - header.SetProjectId(g); - - // 8. Version major - read_n(n1, m_ifs, sizeof(n1)); - header.SetVersionMajor(n1); - - // 9. Version minor - read_n(n1, m_ifs, sizeof(n1)); - header.SetVersionMinor(n1); - - // 10. System ID - read_n(buf, m_ifs, 32); - header.SetSystemId(buf); - - // 11. Generating Software ID - read_n(buf, m_ifs, 32); - header.SetSoftwareId(buf); - - // 12. File Creation Day of Year - read_n(n2, m_ifs, sizeof(n2)); - header.SetCreationDOY(n2); - - // 13. File Creation Year - read_n(n2, m_ifs, sizeof(n2)); - header.SetCreationYear(n2); - - // 14. Header Size - // NOTE: Size of the stanard header block must always be 227 bytes - read_n(n2, m_ifs, sizeof(n2)); - - // 15. Offset to data - read_n(n4, m_ifs, sizeof(n4)); - if (n4 < header.GetHeaderSize()) - { - // TODO: Move this test to LASHeader::Validate() - throw std::domain_error("offset to point data smaller than header size"); - } - header.SetDataOffset(n4); - - // 16. Number of variable length records - read_n(n4, m_ifs, sizeof(n4)); - header.SetRecordsCount(n4); - - // 17. Point Data Format ID - read_n(n1, m_ifs, sizeof(n1)); - if (n1 == LASHeader::ePointFormat0) { - header.SetDataFormatId(LASHeader::ePointFormat0); - } - else if (n1 == LASHeader::ePointFormat1) { - header.SetDataFormatId(LASHeader::ePointFormat1); - } - else if (n1 == LASHeader::ePointFormat2) { - header.SetDataFormatId(LASHeader::ePointFormat2); - } - else if (n1 == LASHeader::ePointFormat3) { - header.SetDataFormatId(LASHeader::ePointFormat3); - } - else { - throw std::domain_error("invalid point data format"); - } - - // 18. Point Data Record Length - // NOTE: No need to set record length because it's - // determined on basis of point data format. - read_n(n2, m_ifs, sizeof(n2)); - - // 19. Number of point records - read_n(n4, m_ifs, sizeof(n4)); - header.SetPointRecordsCount(n4); - - // 20. Number of points by return - std::vector::size_type const srbyr = 5; - uint32_t rbyr[srbyr] = { 0 }; - read_n(rbyr, m_ifs, sizeof(rbyr)); - for (std::size_t i = 0; i < srbyr; ++i) - { - header.SetPointRecordsByReturnCount(i, rbyr[i]); - } - - // 21-23. Scale factors - read_n(x1, m_ifs, sizeof(x1)); - read_n(y1, m_ifs, sizeof(y1)); - read_n(z1, m_ifs, sizeof(z1)); - header.SetScale(x1, y1, z1); - - // 24-26. Offsets - read_n(x1, m_ifs, sizeof(x1)); - read_n(y1, m_ifs, sizeof(y1)); - read_n(z1, m_ifs, sizeof(z1)); - header.SetOffset(x1, y1, z1); - - // 27-28. Max/Min X - read_n(x1, m_ifs, sizeof(x1)); - read_n(x2, m_ifs, sizeof(x2)); - - // 29-30. Max/Min Y - read_n(y1, m_ifs, sizeof(y1)); - read_n(y2, m_ifs, sizeof(y2)); - - // 31-32. Max/Min Z - read_n(z1, m_ifs, sizeof(z1)); - read_n(z2, m_ifs, sizeof(z2)); - - header.SetMax(x1, y1, z1); - header.SetMin(x2, y2, z2); - - m_ifs.seekg(header.GetDataOffset(), std::ios::beg); - - Reset(header); - - return true; -} - -bool ReaderImpl::ReadNextPoint(LASPoint& point, const LASHeader& header) -{ - // Read point data record format 0 - - // TODO: Replace with compile-time assert - - double t = 0; - detail::PointRecord record; - assert(LASHeader::ePointSize0 == sizeof(record)); - - if (0 == m_current) - { - m_ifs.clear(); - m_ifs.seekg(header.GetDataOffset(), std::ios::beg); - } - - if (m_current < m_size) - { - try - { - detail::read_n(record, m_ifs, sizeof(PointRecord)); - ++m_current; - } - catch (std::out_of_range const& e) // we reached the end of the file - { - std::cerr << e.what() << std::endl; - return false; - } - - Reader::FillPoint(record, point); - point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - } - return true; - } - - return false; -} - - -bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) -{ - // Read point data record format 0 - - // TODO: Replace with compile-time assert - - double t = 0; - detail::PointRecord record; - assert(LASHeader::ePointSize0 == sizeof(record)); - - if (m_size <= n) - return false; - - std::streamsize pos = (static_cast(n) * header.GetDataRecordLength()) + header.GetDataOffset(); - - m_ifs.clear(); - m_ifs.seekg(pos, std::ios::beg); - detail::read_n(record, m_ifs, sizeof(record)); - - Reader::FillPoint(record, point); - point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - } - return true; -} - - -}}} // namespace liblas::detail::v11 - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader12.cpp work/liblas-src-1.2.1/src/detail/reader12.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/reader12.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/reader12.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,360 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.2 reader implementation for C++ libLAS - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include - -// std -#include -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { namespace v12 { - -ReaderImpl::ReaderImpl(std::istream& ifs) : Base(ifs) -{ -} - -std::size_t ReaderImpl::GetVersion() const -{ - return eLASVersion12; -} - -bool ReaderImpl::ReadHeader(LASHeader& header) -{ - using detail::read_n; - - // Helper variables - uint8_t n1 = 0; - uint16_t n2 = 0; - uint32_t n4 = 0; - double x1 = 0; - double y1 = 0; - double z1 = 0; - double x2 = 0; - double y2 = 0; - double z2 = 0; - std::string buf; - std::string fsig; - - m_ifs.seekg(0); - - // 1. File Signature - read_n(fsig, m_ifs, 4); - header.SetFileSignature(fsig); - - // 2. File Source ID - read_n(n2, m_ifs, sizeof(n2)); - header.SetFileSourceId(n2); - - // 3. Reserved - // This data must always contain Zeros. - read_n(n2, m_ifs, sizeof(n2)); - - // 4-7. Project ID - uint32_t d1 = 0; - uint16_t d2 = 0; - uint16_t d3 = 0; - uint8_t d4[8] = { 0 }; - read_n(d1, m_ifs, sizeof(d1)); - read_n(d2, m_ifs, sizeof(d2)); - read_n(d3, m_ifs, sizeof(d3)); - read_n(d4, m_ifs, sizeof(d4)); - liblas::guid g(d1, d2, d3, d4); - header.SetProjectId(g); - - // 8. Version major - read_n(n1, m_ifs, sizeof(n1)); - header.SetVersionMajor(n1); - - // 9. Version minor - read_n(n1, m_ifs, sizeof(n1)); - header.SetVersionMinor(n1); - - // 10. System ID - read_n(buf, m_ifs, 32); - header.SetSystemId(buf); - - // 11. Generating Software ID - read_n(buf, m_ifs, 32); - header.SetSoftwareId(buf); - - // 12. File Creation Day of Year - read_n(n2, m_ifs, sizeof(n2)); - header.SetCreationDOY(n2); - - // 13. File Creation Year - read_n(n2, m_ifs, sizeof(n2)); - header.SetCreationYear(n2); - - // 14. Header Size - // NOTE: Size of the standard header block must always be 227 bytes - read_n(n2, m_ifs, sizeof(n2)); - - // 15. Offset to data - read_n(n4, m_ifs, sizeof(n4)); - if (n4 < header.GetHeaderSize()) - { - // TODO: Move this test to LASHeader::Validate() - throw std::domain_error("offset to point data smaller than header size"); - } - header.SetDataOffset(n4); - - // 16. Number of variable length records - read_n(n4, m_ifs, sizeof(n4)); - header.SetRecordsCount(n4); - - // 17. Point Data Format ID - read_n(n1, m_ifs, sizeof(n1)); - if (n1 == LASHeader::ePointFormat0) - { - header.SetDataFormatId(LASHeader::ePointFormat0); - } - else if (n1 == LASHeader::ePointFormat1) - { - header.SetDataFormatId(LASHeader::ePointFormat1); - } - else if (n1 == LASHeader::ePointFormat2) - { - header.SetDataFormatId(LASHeader::ePointFormat2); - } - else if (n1 == LASHeader::ePointFormat3) - { - header.SetDataFormatId(LASHeader::ePointFormat3); - } - else - { - throw std::domain_error("invalid point data format"); - } - - // 18. Point Data Record Length - // NOTE: No need to set record length because it's - // determined on basis of point data format. - read_n(n2, m_ifs, sizeof(n2)); - - // 19. Number of point records - read_n(n4, m_ifs, sizeof(n4)); - header.SetPointRecordsCount(n4); - - // 20. Number of points by return - std::vector::size_type const srbyr = 5; - uint32_t rbyr[srbyr] = { 0 }; - read_n(rbyr, m_ifs, sizeof(rbyr)); - for (std::size_t i = 0; i < srbyr; ++i) - { - header.SetPointRecordsByReturnCount(i, rbyr[i]); - } - - // 21-23. Scale factors - read_n(x1, m_ifs, sizeof(x1)); - read_n(y1, m_ifs, sizeof(y1)); - read_n(z1, m_ifs, sizeof(z1)); - header.SetScale(x1, y1, z1); - - // 24-26. Offsets - read_n(x1, m_ifs, sizeof(x1)); - read_n(y1, m_ifs, sizeof(y1)); - read_n(z1, m_ifs, sizeof(z1)); - header.SetOffset(x1, y1, z1); - - // 27-28. Max/Min X - read_n(x1, m_ifs, sizeof(x1)); - read_n(x2, m_ifs, sizeof(x2)); - - // 29-30. Max/Min Y - read_n(y1, m_ifs, sizeof(y1)); - read_n(y2, m_ifs, sizeof(y2)); - - // 31-32. Max/Min Z - read_n(z1, m_ifs, sizeof(z1)); - read_n(z2, m_ifs, sizeof(z2)); - - header.SetMax(x1, y1, z1); - header.SetMin(x2, y2, z2); - - m_ifs.seekg(header.GetDataOffset(), std::ios::beg); - - Reset(header); - - return true; -} - -bool ReaderImpl::ReadNextPoint(LASPoint& point, LASHeader const& header) -{ - // Read point data record format 0 - - // TODO: Replace with compile-time assert - - double t = 0; - uint16_t red = 0; - uint16_t blue = 0; - uint16_t green = 0; - LASColor color; - - detail::PointRecord record; - assert(LASHeader::ePointSize0 == sizeof(record)); - - if (0 == m_current) - { - m_ifs.clear(); - m_ifs.seekg(header.GetDataOffset(), std::ios::beg); - } - - if (m_current < m_size) - { - try - { - detail::read_n(record, m_ifs, sizeof(PointRecord)); - ++m_current; - } - catch (std::out_of_range const& e) // we reached the end of the file - { - std::cerr << e.what() << std::endl; - return false; - } - - Reader::FillPoint(record, point); - point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) - { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - } - else if (header.GetDataFormatId() == LASHeader::ePointFormat2) - { - detail::read_n(red, m_ifs, sizeof(uint16_t)); - detail::read_n(green, m_ifs, sizeof(uint16_t)); - detail::read_n(blue, m_ifs, sizeof(uint16_t)); - color.SetRed(red); - color.SetBlue(blue); - color.SetGreen(green); - point.SetColor(color); - } - else if (header.GetDataFormatId() == LASHeader::ePointFormat3) - { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - detail::read_n(red, m_ifs, sizeof(uint16_t)); - detail::read_n(green, m_ifs, sizeof(uint16_t)); - detail::read_n(blue, m_ifs, sizeof(uint16_t)); - color.SetRed(red); - color.SetBlue(blue); - color.SetGreen(green); - point.SetColor(color); - } - - return true; - } - - return false; -} - -bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, LASHeader const& header) -{ - // Read point data record format 0 - - // TODO: Replace with compile-time assert - - double t = 0; - uint16_t red = 0; - uint16_t blue = 0; - uint16_t green = 0; - LASColor color; - - detail::PointRecord record; - assert(LASHeader::ePointSize0 == sizeof(record)); - - if (m_size <= n) - { - return false; - } - - std::streamsize pos = (static_cast(n) * header.GetDataRecordLength()) + header.GetDataOffset(); - - m_ifs.clear(); - m_ifs.seekg(pos, std::ios::beg); - detail::read_n(record, m_ifs, sizeof(record)); - - Reader::FillPoint(record, point); - point.SetCoordinates(header, point.GetX(), point.GetY(), point.GetZ()); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) - { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - } - else if (header.GetDataFormatId() == LASHeader::ePointFormat2) - { - detail::read_n(red, m_ifs, sizeof(uint16_t)); - detail::read_n(blue, m_ifs, sizeof(uint16_t)); - detail::read_n(green, m_ifs, sizeof(uint16_t)); - color.SetRed(red); - color.SetBlue(blue); - color.SetGreen(green); - point.SetColor(color); - } - else if (header.GetDataFormatId() == LASHeader::ePointFormat3) - { - detail::read_n(t, m_ifs, sizeof(double)); - point.SetTime(t); - detail::read_n(red, m_ifs, sizeof(uint16_t)); - detail::read_n(blue, m_ifs, sizeof(uint16_t)); - detail::read_n(green, m_ifs, sizeof(uint16_t)); - color.SetRed(red); - color.SetBlue(blue); - color.SetGreen(green); - point.SetColor(color); - } - - - return true; -} - -}}} // namespace liblas::detail::v11 - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer.cpp work/liblas-src-1.2.1/src/detail/writer.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer.cpp 2009-10-03 01:28:13.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/writer.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,253 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS writer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_GDAL -#include -#endif - - -// std -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { - -Writer::Writer(std::ostream& ofs) : m_ofs(ofs), m_transform(0), m_in_ref(0), m_out_ref(0) -{ -} - -Writer::~Writer() -{ -#ifdef HAVE_GDAL - if (m_transform) { - OCTDestroyCoordinateTransformation(m_transform); - } - if (m_in_ref) { - OSRDestroySpatialReference(m_in_ref); - } - if (m_out_ref) { - OSRDestroySpatialReference(m_out_ref); - } -#endif -} - -std::ostream& Writer::GetStream() const -{ - return m_ofs; -} - - -void Writer::FillPointRecord(PointRecord& record, const LASPoint& point, const LASHeader& header) -{ - if (m_transform) { - // let's just copy the point for now. - LASPoint p = LASPoint(point); - Project(p); - record.x = static_cast((p.GetX() - header.GetOffsetX()) / header.GetScaleX()); - record.y = static_cast((p.GetY() - header.GetOffsetY()) / header.GetScaleY()); - record.z = static_cast((p.GetZ() - header.GetOffsetZ()) / header.GetScaleZ()); - } else { - record.x = static_cast((point.GetX() - header.GetOffsetX()) / header.GetScaleX()); - record.y = static_cast((point.GetY() - header.GetOffsetY()) / header.GetScaleY()); - record.z = static_cast((point.GetZ() - header.GetOffsetZ()) / header.GetScaleZ()); - } - - record.intensity = point.GetIntensity(); - record.flags = point.GetScanFlags(); - record.classification = point.GetClassification(); - record.scan_angle_rank = point.GetScanAngleRank(); - record.user_data = point.GetUserData(); - record.point_source_id = point.GetPointSourceID(); -} - -uint32_t Writer::WriteVLR(LASHeader const& header) -{ - // If this function returns a value, it is the size that the header's - // data offset must be increased by in order for the VLRs to fit in - // the header. - m_ofs.seekp(header.GetHeaderSize(), std::ios::beg); - - // if the VLRs won't fit because the data offset is too - // small, we need to throw an error. - uint32_t vlr_total_size = 0; - - // Calculate a new data offset size - for (uint32_t i = 0; i < header.GetRecordsCount(); ++i) - { - LASVariableRecord vlr = header.GetVLR(i); - vlr_total_size += vlr.GetTotalSize(); - } - - int32_t difference = header.GetDataOffset() - (vlr_total_size + header.GetHeaderSize()); - - if (difference < 0) - { - return difference; - } - - for (uint32_t i = 0; i < header.GetRecordsCount(); ++i) - { - LASVariableRecord vlr = header.GetVLR(i); - - detail::write_n(m_ofs, vlr.GetReserved(), sizeof(uint16_t)); - detail::write_n(m_ofs, vlr.GetUserId(true).c_str(), 16); - detail::write_n(m_ofs, vlr.GetRecordId(), sizeof(uint16_t)); - detail::write_n(m_ofs, vlr.GetRecordLength(), sizeof(uint16_t)); - detail::write_n(m_ofs, vlr.GetDescription(true).c_str(), 32); - std::vector const& data = vlr.GetData(); - std::streamsize const size = static_cast(data.size()); - detail::write_n(m_ofs, data.front(), size); - } - - // if we had more room than we need for the VLRs, we need to pad that with - // 0's. We must also not forget to add the 1.0 pad bytes to the end of this - // but the impl should be the one doing that, not us. - if (difference > 0) { - detail::write_n(m_ofs, "\0", difference); - } - return 0; -} - - -void Writer::SetSRS(const LASSpatialReference& srs ) -{ - m_out_srs = srs; -#ifdef HAVE_GDAL - m_in_ref = OSRNewSpatialReference(0); - m_out_ref = OSRNewSpatialReference(0); - - int result = OSRSetFromUserInput(m_in_ref, m_in_srs.GetWKT().c_str()); - if (result != OGRERR_NONE) - { - std::ostringstream msg; - msg << "Could not import input spatial reference for Writer::" << CPLGetLastErrorMsg() << result; - std::string message(msg.str()); - throw std::runtime_error(message); - } - - result = OSRSetFromUserInput(m_out_ref, m_out_srs.GetWKT().c_str()); - if (result != OGRERR_NONE) - { - std::ostringstream msg; - msg << "Could not import output spatial reference for Writer::" << CPLGetLastErrorMsg() << result; - std::string message(msg.str()); - throw std::runtime_error(message); - } - - m_transform = OCTNewCoordinateTransformation( m_in_ref, m_out_ref); - -#endif -} - -void Writer::Project(LASPoint& p) -{ -#ifdef HAVE_GDAL - - int ret = 0; - double x = p.GetX(); - double y = p.GetY(); - double z = p.GetZ(); - - ret = OCTTransform(m_transform, 1, &x, &y, &z); - - if (!ret) { - std::ostringstream msg; - msg << "Could not project point for Writer::" << CPLGetLastErrorMsg() << ret; - std::string message(msg.str()); - throw std::runtime_error(message); - } - - p.SetX(x); - p.SetY(y); - p.SetZ(z); -#else - UNREFERENCED_PARAMETER(p); -#endif -} -Writer* WriterFactory::Create(std::ostream& ofs, LASHeader const& header) -{ - if (!ofs) - { - throw std::runtime_error("output stream state is invalid"); - } - - // Select writer implementation based on requested LAS version. - uint8_t major = header.GetVersionMajor(); - uint8_t minor = header.GetVersionMinor(); - - if (1 == major && 0 == minor) - { - return new v10::WriterImpl(ofs); - } - if (1 == major && 1 == minor) - { - return new v11::WriterImpl(ofs); - } - if (1 == major && 2 == minor) - { - return new v12::WriterImpl(ofs); - } - else if (2 == major && 0 == minor) - { - // TODO: LAS 2.0 read/write support - throw std::runtime_error("LAS 2.0 file detected but unsupported"); - } - - throw std::runtime_error("LAS file of unknown version"); -} - -void WriterFactory::Destroy(Writer* p) -{ - delete p; - p = 0; -} - -}} // namespace liblas::detail diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer10.cpp work/liblas-src-1.2.1/src/detail/writer10.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer10.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/writer10.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,273 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.0 writer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -// std -#include -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { namespace v10 { - -WriterImpl::WriterImpl(std::ostream& ofs) : - Base(ofs), m_pointCount(0) -{ -} - -std::size_t WriterImpl::GetVersion() const -{ - return eLASVersion10; -} - -void WriterImpl::WriteHeader(LASHeader& header) -{ - uint8_t n1 = 0; - uint16_t n2 = 0; - uint32_t n4 = 0; - - // Rewrite the georeference VLR entries if they exist - header.SetGeoreference(); - - // Seek to the beginning - m_ofs.seekp(0, std::ios::beg); - std::ios::pos_type beginning = m_ofs.tellp(); - - // Seek to the end - m_ofs.seekp(0, std::ios::end); - std::ios::pos_type end = m_ofs.tellp(); - - // Figure out how many points we already have. Each point record - // should be 20 bytes long, and header.GetDataOffset tells - // us the location to start counting points from. - - // This test should only be true if we were opened in both - // std::ios::in *and* std::ios::out, otherwise it should return false - // and we won't adjust the point count. - - if ((beginning != end) && ((uint32_t)end != 0)) { - m_pointCount = ((uint32_t) end - header.GetDataOffset())/header.GetDataRecordLength(); - - // Position to the beginning of the file to start writing the header - m_ofs.seekp(0, std::ios::beg); - } - - // 1. File Signature - std::string const filesig(header.GetFileSignature()); - assert(filesig.size() == 4); - detail::write_n(m_ofs, filesig, 4); - - // 2. Reserved - n4 = header.GetReserved(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 3-6. GUID data - uint32_t d1 = 0; - uint16_t d2 = 0; - uint16_t d3 = 0; - uint8_t d4[8] = { 0 }; - liblas::guid g = header.GetProjectId(); - g.output_data(d1, d2, d3, d4); - detail::write_n(m_ofs, d1, sizeof(d1)); - detail::write_n(m_ofs, d2, sizeof(d2)); - detail::write_n(m_ofs, d3, sizeof(d3)); - detail::write_n(m_ofs, d4, sizeof(d4)); - - // 7. Version major - n1 = header.GetVersionMajor(); - assert(1 == n1); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 8. Version minor - n1 = header.GetVersionMinor(); - assert(0 == n1); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 9. System ID - std::string sysid(header.GetSystemId(true)); - assert(sysid.size() == 32); - detail::write_n(m_ofs, sysid, 32); - - // 10. Generating Software ID - std::string softid(header.GetSoftwareId(true)); - assert(softid.size() == 32); - detail::write_n(m_ofs, softid, 32); - - // 11. Flight Date Julian - n2 = header.GetCreationDOY(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 12. Year - n2 = header.GetCreationYear(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 13. Header Size - n2 = header.GetHeaderSize(); - assert(227 <= n2); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 14. Offset to data - // Because we are 1.0, we must also add pad bytes to the end of the - // header. This means resetting the dataoffset +=2, but we - // don't want to change the header's actual offset until after we - // write the VLRs or else we'll be off by 2 when we write the pad - // bytes - n4 = header.GetDataOffset() + 2; - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 15. Number of variable length records - // TODO: This value must be updated after new variable length record is added. - n4 = header.GetRecordsCount(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 16. Point Data Format ID - n1 = static_cast(header.GetDataFormatId()); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 17. Point Data Record Length - n2 = header.GetDataRecordLength(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 18. Number of point records - // This value is updated if necessary, see UpdateHeader function. - n4 = header.GetPointRecordsCount(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 19. Number of points by return - std::vector::size_type const srbyr = 5; - std::vector const& vpbr = header.GetPointRecordsByReturnCount(); - assert(vpbr.size() <= srbyr); - uint32_t pbr[srbyr] = { 0 }; - std::copy(vpbr.begin(), vpbr.end(), pbr); - detail::write_n(m_ofs, pbr, sizeof(pbr)); - - // 20-22. Scale factors - detail::write_n(m_ofs, header.GetScaleX(), sizeof(double)); - detail::write_n(m_ofs, header.GetScaleY(), sizeof(double)); - detail::write_n(m_ofs, header.GetScaleZ(), sizeof(double)); - - // 23-25. Offsets - detail::write_n(m_ofs, header.GetOffsetX(), sizeof(double)); - detail::write_n(m_ofs, header.GetOffsetY(), sizeof(double)); - detail::write_n(m_ofs, header.GetOffsetZ(), sizeof(double)); - - // 26-27. Max/Min X - detail::write_n(m_ofs, header.GetMaxX(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinX(), sizeof(double)); - - // 28-29. Max/Min Y - detail::write_n(m_ofs, header.GetMaxY(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinY(), sizeof(double)); - - // 30-31. Max/Min Z - detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinZ(), sizeof(double)); - - // If WriteVLR returns a value, it is because the header's - // offset is not large enough to contain the VLRs. The value - // it returns is the number of bytes we must increase the header - // by in order for it to contain the VLRs. - - int32_t difference = WriteVLR(header); - if (difference < 0) { - header.SetDataOffset(header.GetDataOffset() + abs(difference) ); - WriteVLR(header); - } - - // Write the pad bytes. - uint8_t const sgn1 = 0xCC; - uint8_t const sgn2 = 0xDD; - detail::write_n(m_ofs, sgn1, sizeof(uint8_t)); - detail::write_n(m_ofs, sgn2, sizeof(uint8_t)); - - // We can now reset the header's offset to +=2. If we monkeypatched - // the offset because we were too small to write the VLRs, this will - // end up being header.GetDataOffset() + difference + 2 (see above). - header.SetDataOffset(header.GetDataOffset() + 2); - - // Make sure to rewrite the dataoffset in the header portion now that - // we've changed it. - std::streamsize const current_pos = m_ofs.tellp(); - std::streamsize const offset_pos = 96; - m_ofs.seekp(offset_pos, std::ios::beg); - detail::write_n(m_ofs, header.GetDataOffset() , sizeof(header.GetDataOffset())); - m_ofs.seekp(current_pos, std::ios::beg); - - // If we already have points, we're going to put it at the end of the file. - // If we don't have any points, we're going to leave it where it is. - if (m_pointCount != 0) - m_ofs.seekp(0, std::ios::end); -} - -void WriterImpl::UpdateHeader(LASHeader const& header) -{ - if (m_pointCount != header.GetPointRecordsCount()) - { - // Skip to first byte of number of point records data member - std::streamsize const dataPos = 107; - m_ofs.seekp(dataPos, std::ios::beg); - - detail::write_n(m_ofs, m_pointCount , sizeof(m_pointCount)); - } -} - -void WriterImpl::WritePointRecord(LASPoint const& point, const LASHeader& header) -{ - // TODO: Static assert would be better - - double t = 0; - assert(LASHeader::ePointSize0 == sizeof(m_record)); - Writer::FillPointRecord(m_record, point, header); - detail::write_n(m_ofs, m_record, sizeof(m_record)); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) { - t = point.GetTime(); - detail::write_n(m_ofs, t, sizeof(double)); - } - ++m_pointCount; -} - -}}} // namespace liblas::detail::v10 diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer11.cpp work/liblas-src-1.2.1/src/detail/writer11.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer11.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/writer11.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,264 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.1 writer implementation for C++ libLAS - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -// std -#include -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { namespace v11 { - -WriterImpl::WriterImpl(std::ostream& ofs) : - Base(ofs), m_pointCount(0) -{ -} - -std::size_t WriterImpl::GetVersion() const -{ - return eLASVersion11; -} - -void WriterImpl::WriteHeader(LASHeader& header) -{ - uint8_t n1 = 0; - uint16_t n2 = 0; - uint32_t n4 = 0; - - // Rewrite the georeference VLR entries if they exist - header.SetGeoreference(); - - // Seek to the beginning - m_ofs.seekp(0, std::ios::beg); - std::ios::pos_type beginning = m_ofs.tellp(); - - // Seek to the end - m_ofs.seekp(0, std::ios::end); - std::ios::pos_type end = m_ofs.tellp(); - - // Figure out how many points we already have. Each point record - // should be 20 bytes long, and header.GetDataOffset tells - // us the location to start counting points from. - - // This test should only be true if we were opened in both - // std::ios::in *and* std::ios::out, otherwise it should return false - // and we won't adjust the point count. - - if (beginning != end) { - m_pointCount = ((uint32_t) end - header.GetDataOffset())/header.GetDataRecordLength(); - - // Position to the beginning of the file to start writing the header - m_ofs.seekp(0, std::ios::beg); - } - - // 1. File Signature - std::string const filesig(header.GetFileSignature()); - assert(filesig.size() == 4); - detail::write_n(m_ofs, filesig, 4); - - // 2. File Source ID - n2 = header.GetFileSourceId(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 3. Reserved - n2 = header.GetReserved(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 4-7. GUID data - uint32_t d1 = 0; - uint16_t d2 = 0; - uint16_t d3 = 0; - uint8_t d4[8] = { 0 }; - liblas::guid g = header.GetProjectId(); - g.output_data(d1, d2, d3, d4); - detail::write_n(m_ofs, d1, sizeof(d1)); - detail::write_n(m_ofs, d2, sizeof(d2)); - detail::write_n(m_ofs, d3, sizeof(d3)); - detail::write_n(m_ofs, d4, sizeof(d4)); - - // 8. Version major - n1 = header.GetVersionMajor(); - assert(1 == n1); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 9. Version minor - n1 = header.GetVersionMinor(); - assert(1 == n1); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 10. System ID - std::string const sysid(header.GetSystemId(true)); - assert(sysid.size() == 32); - detail::write_n(m_ofs, sysid, 32); - - // 11. Generating Software ID - std::string const softid(header.GetSoftwareId(true)); - assert(softid.size() == 32); - detail::write_n(m_ofs, softid, 32); - - // 12. File Creation Day of Year - n2 = header.GetCreationDOY(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 13. File Creation Year - n2 = header.GetCreationYear(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 14. Header Size - n2 = header.GetHeaderSize(); - assert(227 <= n2); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 15. Offset to data - // At this point, no variable length records are written, - // so data offset is equal to header size (227) - // TODO: This value must be updated after new variable length record is added. - n4 = header.GetDataOffset(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 16. Number of variable length records - // TODO: This value must be updated after new variable length record is added. - n4 = header.GetRecordsCount(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 17. Point Data Format ID - n1 = static_cast(header.GetDataFormatId()); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 18. Point Data Record Length - n2 = header.GetDataRecordLength(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 19. Number of point records - // This value is updated if necessary, see UpdateHeader function. - n4 = header.GetPointRecordsCount(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 20. Number of points by return - std::vector::size_type const srbyr = 5; - std::vector const& vpbr = header.GetPointRecordsByReturnCount(); - assert(vpbr.size() <= srbyr); - uint32_t pbr[srbyr] = { 0 }; - std::copy(vpbr.begin(), vpbr.end(), pbr); - detail::write_n(m_ofs, pbr, sizeof(pbr)); - - // 21-23. Scale factors - detail::write_n(m_ofs, header.GetScaleX(), sizeof(double)); - detail::write_n(m_ofs, header.GetScaleY(), sizeof(double)); - detail::write_n(m_ofs, header.GetScaleZ(), sizeof(double)); - - // 24-26. Offsets - detail::write_n(m_ofs, header.GetOffsetX(), sizeof(double)); - detail::write_n(m_ofs, header.GetOffsetY(), sizeof(double)); - detail::write_n(m_ofs, header.GetOffsetZ(), sizeof(double)); - - // 27-28. Max/Min X - detail::write_n(m_ofs, header.GetMaxX(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinX(), sizeof(double)); - - // 29-30. Max/Min Y - detail::write_n(m_ofs, header.GetMaxY(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinY(), sizeof(double)); - - // 31-32. Max/Min Z - detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinZ(), sizeof(double)); - - // If WriteVLR returns a value, it is because the header's - // offset is not large enough to contain the VLRs. The value - // it returns is the number of bytes we must increase the header - // by in order for it to contain the VLRs. - int32_t difference = WriteVLR(header); - if (difference < 0) { - header.SetDataOffset(header.GetDataOffset() + abs(difference) ); - WriteVLR(header); - - // Make sure to rewrite the dataoffset in the header portion now that - // we've changed it. - std::streamsize const current_pos = m_ofs.tellp(); - std::streamsize const offset_pos = 96; - m_ofs.seekp(offset_pos, std::ios::beg); - detail::write_n(m_ofs, header.GetDataOffset() , sizeof(header.GetDataOffset())); - m_ofs.seekp(current_pos, std::ios::beg); - } - - // If we already have points, we're going to put it at the end of the file. - // If we don't have any points, we're going to leave it where it is. - if (m_pointCount != 0) - m_ofs.seekp(0, std::ios::end); -} - -void WriterImpl::UpdateHeader(LASHeader const& header) -{ - if (m_pointCount != header.GetPointRecordsCount()) - { - // Skip to first byte of number of point records data member - std::streamsize const dataPos = 107; - m_ofs.seekp(dataPos, std::ios::beg); - - detail::write_n(m_ofs, m_pointCount , sizeof(m_pointCount)); - } -} - -void WriterImpl::WritePointRecord(LASPoint const& point, const LASHeader& header) -{ - // TODO: Static assert would be better - - double t = 0; - assert(LASHeader::ePointSize0 == sizeof(m_record)); - Writer::FillPointRecord(m_record, point, header); - detail::write_n(m_ofs, m_record, sizeof(m_record)); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) { - t = point.GetTime(); - detail::write_n(m_ofs, t, sizeof(double)); - } - ++m_pointCount; -} - -}}} // namespace liblas::detail::v11 - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer12.cpp work/liblas-src-1.2.1/src/detail/writer12.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/detail/writer12.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/detail/writer12.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,298 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS 1.2 writer implementation for C++ libLAS - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -// std -#include -#include -#include -#include // std::size_t -#include - -namespace liblas { namespace detail { namespace v12 { - -WriterImpl::WriterImpl(std::ostream& ofs) : - Base(ofs), m_pointCount(0) -{ -} - -std::size_t WriterImpl::GetVersion() const -{ - return eLASVersion12; -} - -void WriterImpl::WriteHeader(LASHeader& header) -{ - uint8_t n1 = 0; - uint16_t n2 = 0; - uint32_t n4 = 0; - - // Rewrite the georeference VLR entries if they exist - header.SetGeoreference(); - - // Seek to the beginning - m_ofs.seekp(0, std::ios::beg); - std::ios::pos_type beginning = m_ofs.tellp(); - - // Seek to the end - m_ofs.seekp(0, std::ios::end); - std::ios::pos_type end = m_ofs.tellp(); - - // Figure out how many points we already have. Each point record - // should be 20 bytes long, and header.GetDataOffset tells - // us the location to start counting points from. - - // This test should only be true if we were opened in both - // std::ios::in *and* std::ios::out, otherwise it should return false - // and we won't adjust the point count. - - if (beginning != end) - { - m_pointCount = static_cast(end) - header.GetDataOffset(); - m_pointCount /= header.GetDataRecordLength(); - - // Position to the beginning of the file to start writing the header - m_ofs.seekp(0, std::ios::beg); - } - - // 1. File Signature - std::string const filesig(header.GetFileSignature()); - assert(filesig.size() == 4); - detail::write_n(m_ofs, filesig, 4); - - // 2. File Source ID - n2 = header.GetFileSourceId(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 3. Reserved - n2 = header.GetReserved(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 4-7. GUID data - uint32_t d1 = 0; - uint16_t d2 = 0; - uint16_t d3 = 0; - uint8_t d4[8] = { 0 }; - liblas::guid g = header.GetProjectId(); - g.output_data(d1, d2, d3, d4); - detail::write_n(m_ofs, d1, sizeof(d1)); - detail::write_n(m_ofs, d2, sizeof(d2)); - detail::write_n(m_ofs, d3, sizeof(d3)); - detail::write_n(m_ofs, d4, sizeof(d4)); - - // 8. Version major - n1 = header.GetVersionMajor(); - assert(1 == n1); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 9. Version minor - n1 = header.GetVersionMinor(); - assert(2 == n1); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 10. System ID - std::string const sysid(header.GetSystemId(true)); - assert(sysid.size() == 32); - detail::write_n(m_ofs, sysid, 32); - - // 11. Generating Software ID - std::string const softid(header.GetSoftwareId(true)); - assert(softid.size() == 32); - detail::write_n(m_ofs, softid, 32); - - // 12. File Creation Day of Year - n2 = header.GetCreationDOY(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 13. File Creation Year - n2 = header.GetCreationYear(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 14. Header Size - n2 = header.GetHeaderSize(); - assert(227 <= n2); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 15. Offset to data - // At this point, no variable length records are written, - // so data offset is equal to header size (227) - // TODO: This value must be updated after new variable length record is added. - n4 = header.GetDataOffset(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 16. Number of variable length records - // TODO: This value must be updated after new variable length record is added. - n4 = header.GetRecordsCount(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 17. Point Data Format ID - n1 = static_cast(header.GetDataFormatId()); - detail::write_n(m_ofs, n1, sizeof(n1)); - - // 18. Point Data Record Length - n2 = header.GetDataRecordLength(); - detail::write_n(m_ofs, n2, sizeof(n2)); - - // 19. Number of point records - // This value is updated if necessary, see UpdateHeader function. - n4 = header.GetPointRecordsCount(); - detail::write_n(m_ofs, n4, sizeof(n4)); - - // 20. Number of points by return - std::vector::size_type const srbyr = 5; - std::vector const& vpbr = header.GetPointRecordsByReturnCount(); - assert(vpbr.size() <= srbyr); - uint32_t pbr[srbyr] = { 0 }; - std::copy(vpbr.begin(), vpbr.end(), pbr); - detail::write_n(m_ofs, pbr, sizeof(pbr)); - - // 21-23. Scale factors - detail::write_n(m_ofs, header.GetScaleX(), sizeof(double)); - detail::write_n(m_ofs, header.GetScaleY(), sizeof(double)); - detail::write_n(m_ofs, header.GetScaleZ(), sizeof(double)); - - // 24-26. Offsets - detail::write_n(m_ofs, header.GetOffsetX(), sizeof(double)); - detail::write_n(m_ofs, header.GetOffsetY(), sizeof(double)); - detail::write_n(m_ofs, header.GetOffsetZ(), sizeof(double)); - - // 27-28. Max/Min X - detail::write_n(m_ofs, header.GetMaxX(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinX(), sizeof(double)); - - // 29-30. Max/Min Y - detail::write_n(m_ofs, header.GetMaxY(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinY(), sizeof(double)); - - // 31-32. Max/Min Z - detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double)); - detail::write_n(m_ofs, header.GetMinZ(), sizeof(double)); - - // If WriteVLR returns a value, it is because the header's - // offset is not large enough to contain the VLRs. The value - // it returns is the number of bytes we must increase the header - // by in order for it to contain the VLRs. - int32_t difference = WriteVLR(header); - if (difference < 0) { - header.SetDataOffset(header.GetDataOffset() + abs(difference) ); - WriteVLR(header); - - // Make sure to rewrite the dataoffset in the header portion now that - // we've changed it. - std::streamsize const current_pos = m_ofs.tellp(); - std::streamsize const offset_pos = 96; - m_ofs.seekp(offset_pos, std::ios::beg); - detail::write_n(m_ofs, header.GetDataOffset() , sizeof(header.GetDataOffset())); - m_ofs.seekp(current_pos, std::ios::beg); - } - - // If we already have points, we're going to put it at the end of the file. - // If we don't have any points, we're going to leave it where it is. - if (m_pointCount != 0) - { - m_ofs.seekp(0, std::ios::end); - } -} - -void WriterImpl::UpdateHeader(LASHeader const& header) -{ - if (m_pointCount != header.GetPointRecordsCount()) - { - // Skip to first byte of number of point records data member - std::streamsize const dataPos = 107; - m_ofs.seekp(dataPos, std::ios::beg); - - detail::write_n(m_ofs, m_pointCount , sizeof(m_pointCount)); - } -} - -void WriterImpl::WritePointRecord(LASPoint const& point, LASHeader const& header) -{ - // TODO: Static assert would be better - - double t = 0; - uint16_t red = 0; - uint16_t blue = 0; - uint16_t green = 0; - LASColor color; - - assert(LASHeader::ePointSize0 == sizeof(m_record)); - Writer::FillPointRecord(m_record, point, header); - detail::write_n(m_ofs, m_record, sizeof(m_record)); - - if (header.GetDataFormatId() == LASHeader::ePointFormat1) - { - t = point.GetTime(); - detail::write_n(m_ofs, t, sizeof(double)); - } - else if (header.GetDataFormatId() == LASHeader::ePointFormat2) - { - color = point.GetColor(); - red = color.GetRed(); - green = color.GetGreen(); - blue = color.GetBlue(); - detail::write_n(m_ofs, red, sizeof(uint16_t)); - detail::write_n(m_ofs, green, sizeof(uint16_t)); - detail::write_n(m_ofs, blue, sizeof(uint16_t)); - } - else if (header.GetDataFormatId() == LASHeader::ePointFormat3) - { - t = point.GetTime(); - detail::write_n(m_ofs, t, sizeof(double)); - color = point.GetColor(); - red = color.GetRed(); - green = color.GetGreen(); - blue = color.GetBlue(); - detail::write_n(m_ofs, red, sizeof(uint16_t)); - detail::write_n(m_ofs, green, sizeof(uint16_t)); - detail::write_n(m_ofs, blue, sizeof(uint16_t)); - } - - - ++m_pointCount; -} - -}}} // namespace liblas::detail::v12 - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/gt_citation.cpp work/liblas-src-1.2.1/src/gt_citation.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/gt_citation.cpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/gt_citation.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,479 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: GeoTIFF Driver - * Purpose: Implements special parsing of Imagine citation strings, and - * to encode PE String info in citation fields as needed. - * Author: Xiuguang Zhou (ESRI) - * - ****************************************************************************** - * Copyright (c) 2008, Xiuguang Zhou (ESRI) - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - ****************************************************************************/ - -#include "cpl_port.h" -#include "cpl_string.h" - -#include "geo_normalize.h" -#include "geovalues.h" -#include "ogr_spatialref.h" - - -#define nCitationNameTypes 9 -typedef enum -{ - CitCsName = 0, - CitPcsName = 1, - CitProjectionName = 2, - CitLUnitsName = 3, - CitGcsName = 4, - CitDatumName = 5, - CitEllipsoidName = 6, - CitPrimemName = 7, - CitAUnitsName = 8 -} CitationNameType; - -char* ImagineCitationTranslation(const char* psCitation, geokey_t keyID); -char** CitationStringParse(const char* psCitation); -void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName); -void SetGeogCSCitation(GTIF * psGTIF, OGRSpatialReference *poSRS, char* angUnitName, int nDatum, short nSpheroid); -OGRBoolean SetCitationToSRS(GTIF* hGTIF, char* szCTString, int nCTStringLen, - geokey_t geoKey, OGRSpatialReference* poSRS, OGRBoolean* linearUnitIsSet); -void GetGeogCSFromCitation(char* szGCSName, int nGCSName, - geokey_t geoKey, - char **ppszGeogName, - char **ppszDatumName, - char **ppszPMName, - char **ppszSpheroidName, - char **ppszAngularUnits); - -/************************************************************************/ -/* ImagineCitationTranslation() */ -/* */ -/* Translate ERDAS Imagine GeoTif citation */ -/************************************************************************/ -char* ImagineCitationTranslation(const char* psCitation, geokey_t keyID) -{ - char* ret = NULL; - if(!psCitation) - return ret; - if(EQUALN(psCitation, "IMAGINE GeoTIFF Support", strlen("IMAGINE GeoTIFF Support"))) - { - CPLString osName; - - // this is a handle IMAGING style citation - const char* p = NULL; - p = strchr(psCitation, '$'); - if(p) - p = strchr(p, '\n'); - if(p) - p++; - const char* p1 = NULL; - if(p) - p1 = strchr(p, '\n'); - if(p && p1) - { - switch (keyID) - { - case PCSCitationGeoKey: - osName = "PCS Name = "; - break; - case GTCitationGeoKey: - osName = "CS Name = "; - break; - case GeogCitationGeoKey: - if(!strstr(p, "Unable to")) - osName = "GCS Name = "; - break; - default: - break; - } - if(strlen(osName)>0) - { - osName.append(p, p1-p); - osName += "|"; - } - } - p = strstr(psCitation, "Projection Name = "); - if(p) - { - p += strlen("Projection Name = "); - p1 = strchr(p, '\n'); - if(!p1) - p1 = strchr(p, '\0'); - } - if(p && p1) - { - osName.append(p, p1-p); - osName += "|"; - } - p = strstr(psCitation, "Datum = "); - if(p) - { - p += strlen("Datum = "); - p1 = strchr(p, '\n'); - if(!p1) - p1 = strchr(p, '\0'); - } - if(p && p1) - { - osName += "Datum = "; - osName.append(p, p1-p); - osName += "|"; - } - p = strstr(psCitation, "Ellipsoid = "); - if(p) - { - p += strlen("Ellipsoid = "); - p1 = strchr(p, '\n'); - if(!p1) - p1 = strchr(p, '\0'); - } - if(p && p1) - { - osName += "Ellipsoid = "; - osName.append(p, p1-p); - osName += "|"; - } - p = strstr(psCitation, "Units = "); - if(p) - { - p += strlen("Units = "); - p1 = strchr(p, '\n'); - if(!p1) - p1 = strchr(p, '\0'); - } - if(p && p1) - { - osName += "LUnits = "; - osName.append(p, p1-p); - osName += "|"; - } - if(strlen(osName) > 0) - { - ret = CPLStrdup(osName); - } - } - return ret; -} - -/************************************************************************/ -/* CitationStringParse() */ -/* */ -/* Parse a Citation string */ -/************************************************************************/ -char** CitationStringParse(const char* psCitation) -{ - char ** ret = NULL; - if(!psCitation) - return ret; - - ret = (char **) CPLCalloc(sizeof(char*), nCitationNameTypes); - const char* pDelimit = NULL; - const char* pStr = psCitation; - CPLString osName; - int nCitationLen = strlen(psCitation); - OGRBoolean nameFound = FALSE; - while((pStr-psCitation+1)< nCitationLen) - { - if( (pDelimit = strstr(pStr, "|")) ) - { - osName = ""; - osName.append(pStr, pDelimit-pStr); - pStr = pDelimit+1; - } - else - { - osName = pStr; - pStr += strlen(pStr); - } - const char* name = osName.c_str(); - if( strstr(name, "PCS Name = ") ) - { - if (!ret[CitPcsName]) - ret[CitPcsName] = CPLStrdup(name+strlen("PCS Name = ")); - nameFound = TRUE; - } - if(strstr(name, "Projection Name = ")) - { - if (!ret[CitProjectionName]) - ret[CitProjectionName] = CPLStrdup(name+strlen("Projection Name = ")); - nameFound = TRUE; - } - if(strstr(name, "LUnits = ")) - { - if (!ret[CitLUnitsName]) - ret[CitLUnitsName] = CPLStrdup(name+strlen("LUnits = ")); - nameFound = TRUE; - } - if(strstr(name, "GCS Name = ")) - { - if (!ret[CitGcsName]) - ret[CitGcsName] = CPLStrdup(name+strlen("GCS Name = ")); - nameFound = TRUE; - } - if(strstr(name, "Datum = ")) - { - if (!ret[CitDatumName]) - ret[CitDatumName] = CPLStrdup(name+strlen("Datum = ")); - nameFound = TRUE; - } - if(strstr(name, "Ellipsoid = ")) - { - if (!ret[CitEllipsoidName]) - ret[CitEllipsoidName] = CPLStrdup(name+strlen("Ellipsoid = ")); - nameFound = TRUE; - } - if(strstr(name, "Primem = ")) - { - if (!ret[CitPrimemName]) - ret[CitPrimemName] = CPLStrdup(name+strlen("Primem = ")); - nameFound = TRUE; - } - if(strstr(name, "AUnits = ")) - { - if (!ret[CitAUnitsName]) - ret[CitAUnitsName] = CPLStrdup(name+strlen("AUnits = ")); - nameFound = TRUE; - } - } - if(!nameFound) - { - CPLFree( ret ); - ret = (char**)NULL; - } - return ret; -} - -/************************************************************************/ -/* SetLinearUnitCitation() */ -/* */ -/* Set linear unit Citation string */ -/************************************************************************/ -void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName) -{ - char szName[512]; - CPLString osCitation; - int n = 0; - if( GTIFKeyGet( psGTIF, PCSCitationGeoKey, szName, 0, sizeof(szName) ) ) - n = strlen(szName); - if(n>0) - { - osCitation = szName; - if(osCitation[n-1] != '|') - osCitation += "|"; - osCitation += "LUnits = "; - osCitation += pszLinearUOMName; - osCitation += "|"; - } - else - { - osCitation = "LUnits = "; - osCitation += pszLinearUOMName; - } - GTIFKeySet( psGTIF, PCSCitationGeoKey, TYPE_ASCII, 0, osCitation.c_str() ); - return; -} - -/************************************************************************/ -/* SetGeogCSCitation() */ -/* */ -/* Set geogcs Citation string */ -/************************************************************************/ -void SetGeogCSCitation(GTIF * psGTIF, OGRSpatialReference *poSRS, char* angUnitName, int nDatum, short nSpheroid) -{ - int bRewriteGeogCitation = FALSE; - char szName[256]; - CPLString osCitation; - size_t n = 0; - if( GTIFKeyGet( psGTIF, GeogCitationGeoKey, szName, 0, sizeof(szName) ) ) - n = strlen(szName); - if (n == 0) - return; - - if(!EQUALN(szName, "GCS Name = ", strlen("GCS Name = "))) - { - osCitation = "GCS Name = "; - osCitation += szName; - } - else - { - osCitation = szName; - } - - if(nDatum == KvUserDefined ) - { - const char* datumName = poSRS->GetAttrValue( "DATUM" ); - if(datumName && strlen(datumName) > 0) - { - osCitation += "|Datum = "; - osCitation += datumName; - bRewriteGeogCitation = TRUE; - } - } - if(nSpheroid == KvUserDefined ) - { - const char* spheroidName = poSRS->GetAttrValue( "SPHEROID" ); - if(spheroidName && strlen(spheroidName) > 0) - { - osCitation += "|Ellipsoid = "; - osCitation += spheroidName; - bRewriteGeogCitation = TRUE; - } - } - - const char* primemName = poSRS->GetAttrValue( "PRIMEM" ); - if(primemName && strlen(primemName) > 0) - { - osCitation += "|Primem = "; - osCitation += primemName; - bRewriteGeogCitation = TRUE; - - double primemValue = poSRS->GetPrimeMeridian(NULL); - if(angUnitName && !EQUAL(angUnitName, "Degree")) - { - double aUnit = poSRS->GetAngularUnits(NULL); - primemValue *= aUnit; - } - GTIFKeySet( psGTIF, GeogPrimeMeridianLongGeoKey, TYPE_DOUBLE, 1, - primemValue ); - } - if(angUnitName && strlen(angUnitName) > 0 && !EQUAL(angUnitName, "Degree")) - { - osCitation += "|AUnits = "; - osCitation += angUnitName; - bRewriteGeogCitation = TRUE; - } - - if (osCitation[strlen(osCitation) - 1] != '|') - osCitation += "|"; - - if (bRewriteGeogCitation) - GTIFKeySet( psGTIF, GeogCitationGeoKey, TYPE_ASCII, 0, osCitation.c_str() ); - - return; -} - -/************************************************************************/ -/* SetCitationToSRS() */ -/* */ -/* Parse and set Citation string to SRS */ -/************************************************************************/ -OGRBoolean SetCitationToSRS(GTIF* hGTIF, char* szCTString, int nCTStringLen, - geokey_t geoKey, OGRSpatialReference* poSRS, OGRBoolean* linearUnitIsSet) -{ - OGRBoolean ret = FALSE; - *linearUnitIsSet = FALSE; - char* imgCTName = ImagineCitationTranslation(szCTString, geoKey); - if(imgCTName) - { - strncpy(szCTString, imgCTName, nCTStringLen); - szCTString[nCTStringLen-1] = '\0'; - CPLFree( imgCTName ); - } - char** ctNames = CitationStringParse(szCTString); - if(ctNames) - { - if( poSRS->GetRoot() == NULL) - poSRS->SetNode( "PROJCS", "unnamed" ); - if(ctNames[CitPcsName]) - { - poSRS->SetNode( "PROJCS", ctNames[CitPcsName] ); - ret = TRUE; - } - else if(geoKey != GTCitationGeoKey) - { - char szPCSName[128]; - if( GTIFKeyGet( hGTIF, GTCitationGeoKey, szPCSName, 0, sizeof(szPCSName) ) ) - { - poSRS->SetNode( "PROJCS", szPCSName ); - ret = TRUE; - } - } - - if(ctNames[CitProjectionName]) - poSRS->SetProjection( ctNames[CitProjectionName] ); - - if(ctNames[CitLUnitsName]) - { - double unitSize; - if (GTIFKeyGet(hGTIF, ProjLinearUnitSizeGeoKey, &unitSize, 0, - sizeof(unitSize) )) - { - poSRS->SetLinearUnits( ctNames[CitLUnitsName], unitSize); - *linearUnitIsSet = TRUE; - } - } - for(int i= 0; i= 'A' && pszDatum[i] <= 'Z') - && !(pszDatum[i] >= 'a' && pszDatum[i] <= 'z') - && !(pszDatum[i] >= '0' && pszDatum[i] <= '9') ) - { - pszDatum[i] = '_'; - } - } - -/* -------------------------------------------------------------------- */ -/* Remove repeated and trailing underscores. */ -/* -------------------------------------------------------------------- */ - for( i = 1, j = 0; pszDatum[i] != '\0'; i++ ) - { - if( pszDatum[j] == '_' && pszDatum[i] == '_' ) - continue; - - pszDatum[++j] = pszDatum[i]; - } - if( pszDatum[j] == '_' ) - pszDatum[j] = '\0'; - else - pszDatum[j+1] = '\0'; - -/* -------------------------------------------------------------------- */ -/* Search for datum equivelences. Specific massaged names get */ -/* mapped to OpenGIS specified names. */ -/* -------------------------------------------------------------------- */ - for( i = 0; papszDatumEquiv[i] != NULL; i += 2 ) - { - if( EQUAL(*ppszDatum,papszDatumEquiv[i]) ) - { - CPLFree( *ppszDatum ); - *ppszDatum = CPLStrdup( papszDatumEquiv[i+1] ); - return; - } - } -} - -/************************************************************************/ -/* GTIFCleanupImageineNames() */ -/* */ -/* Erdas Imagine sometimes emits big copyright messages, and */ -/* other stuff into citations. These can be pretty messy when */ -/* turned into WKT, so we try to trim and clean the strings */ -/* somewhat. */ -/************************************************************************/ - -/* For example: - GTCitationGeoKey (Ascii,215): "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 16109 $ $Date: 2009-01-18 05:34:57 -0600 (Sun, 18 Jan 2009) $\nProjection Name = UTM\nUnits = meters\nGeoTIFF Units = meters" - - GeogCitationGeoKey (Ascii,267): "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 16109 $ $Date: 2009-01-18 05:34:57 -0600 (Sun, 18 Jan 2009) $\nUnable to match Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)" - - PCSCitationGeoKey (Ascii,214): "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 16109 $ $Date: 2009-01-18 05:34:57 -0600 (Sun, 18 Jan 2009) $\nUTM Zone 10N\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)" - -*/ - -static void GTIFCleanupImagineNames( char *pszCitation ) - -{ - if( strstr(pszCitation,"IMAGINE GeoTIFF") == NULL ) - return; - -/* -------------------------------------------------------------------- */ -/* First, we skip past all the copyright, and RCS stuff. We */ -/* assume that this will have a "$" at the end of it all. */ -/* -------------------------------------------------------------------- */ - char *pszSkip; - - for( pszSkip = pszCitation + strlen(pszCitation) - 1; - pszSkip != pszCitation && *pszSkip != '$'; - pszSkip-- ) {} - - if( *pszSkip == '$' ) - pszSkip++; - - memmove( pszCitation, pszSkip, strlen(pszSkip)+1 ); - -/* -------------------------------------------------------------------- */ -/* Convert any newlines into spaces, they really gum up the */ -/* WKT. */ -/* -------------------------------------------------------------------- */ - int i; - - for( i = 0; pszCitation[i] != '\0'; i++ ) - { - if( pszCitation[i] == '\n' ) - pszCitation[i] = ' '; - } -} - -/************************************************************************/ -/* GTIFGetOGISDefn() */ -/************************************************************************/ - -char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) - -{ - OGRSpatialReference oSRS; - -/* -------------------------------------------------------------------- */ -/* Handle non-standard coordinate systems as LOCAL_CS. */ -/* -------------------------------------------------------------------- */ - if( psDefn->Model != ModelTypeProjected - && psDefn->Model != ModelTypeGeographic ) - { - char *pszWKT; - char szPeStr[2400]; - - /** check if there is a pe string citation key **/ - if( GTIFKeyGet( hGTIF, PCSCitationGeoKey, szPeStr, 0, sizeof(szPeStr) ) && - strstr(szPeStr, "ESRI PE String = " ) ) - { - pszWKT = CPLStrdup( szPeStr + strlen("ESRI PE String = ") ); - return pszWKT; - } - else - { - char *pszUnitsName = NULL; - char szPCSName[300]; - int nKeyCount = 0; - int anVersion[3]; - - if( hGTIF != NULL ) - GTIFDirectoryInfo( hGTIF, anVersion, &nKeyCount ); - - if( nKeyCount > 0 ) // Use LOCAL_CS if we have any geokeys at all. - { - // Handle citation. - strcpy( szPCSName, "unnamed" ); - if( !GTIFKeyGet( hGTIF, GTCitationGeoKey, szPCSName, - 0, sizeof(szPCSName) ) ) - GTIFKeyGet( hGTIF, GeogCitationGeoKey, szPCSName, - 0, sizeof(szPCSName) ); - - GTIFCleanupImagineNames( szPCSName ); - oSRS.SetLocalCS( szPCSName ); - - // Handle units - GTIFGetUOMLengthInfo( psDefn->UOMLength, &pszUnitsName, NULL ); - - if( pszUnitsName != NULL && psDefn->UOMLength != KvUserDefined ) - { - oSRS.SetLinearUnits( pszUnitsName, psDefn->UOMLengthInMeters ); - oSRS.SetAuthority( "LOCAL_CS|UNIT", "EPSG", psDefn->UOMLength); - } - else - oSRS.SetLinearUnits( "unknown", psDefn->UOMLengthInMeters ); - - GTIFFreeMemory( pszUnitsName ); - } - oSRS.exportToWkt( &pszWKT ); - - return pszWKT; - } - } - -/* -------------------------------------------------------------------- */ -/* If this is a projected SRS we set the PROJCS keyword first */ -/* to ensure that the GEOGCS will be a child. */ -/* -------------------------------------------------------------------- */ - OGRBoolean linearUnitIsSet = FALSE; - if( psDefn->Model == ModelTypeProjected ) - { - char szCTString[512]; - strcpy( szCTString, "unnamed" ); - if( psDefn->PCS != KvUserDefined ) - { - char *pszPCSName = NULL; - - GTIFGetPCSInfo( psDefn->PCS, &pszPCSName, NULL, NULL, NULL ); - - oSRS.SetNode( "PROJCS", pszPCSName ? pszPCSName : "unnamed" ); - if ( pszPCSName ) - GTIFFreeMemory( pszPCSName ); - - oSRS.SetAuthority( "PROJCS", "EPSG", psDefn->PCS ); - } - else if(hGTIF && GTIFKeyGet( hGTIF, PCSCitationGeoKey, szCTString, 0, - sizeof(szCTString)) ) - { - SetCitationToSRS(hGTIF, szCTString, sizeof(szCTString), - PCSCitationGeoKey, &oSRS, &linearUnitIsSet); - } - else - { - if( hGTIF ) - { - GTIFKeyGet( hGTIF, GTCitationGeoKey, szCTString, 0, sizeof(szCTString) ); - if(!SetCitationToSRS(hGTIF, szCTString, sizeof(szCTString), - GTCitationGeoKey, &oSRS, &linearUnitIsSet)) - oSRS.SetNode( "PROJCS", szCTString ); - } - else - oSRS.SetNode( "PROJCS", szCTString ); - } - } - -/* ==================================================================== */ -/* Setup the GeogCS */ -/* ==================================================================== */ - char *pszGeogName = NULL; - char *pszDatumName = NULL; - char *pszPMName = NULL; - char *pszSpheroidName = NULL; - char *pszAngularUnits = NULL; - double dfInvFlattening=0.0, dfSemiMajor=0.0; - char szGCSName[512]; - OGRBoolean aUnitGot = FALSE; - - if( !GTIFGetGCSInfo( psDefn->GCS, &pszGeogName, NULL, NULL, NULL ) - && hGTIF != NULL - && GTIFKeyGet( hGTIF, GeogCitationGeoKey, szGCSName, 0, - sizeof(szGCSName)) ) - GetGeogCSFromCitation(szGCSName, sizeof(szGCSName), - GeogCitationGeoKey, - &pszGeogName, &pszDatumName, - &pszPMName, &pszSpheroidName, - &pszAngularUnits); - - if( !pszDatumName ) - GTIFGetDatumInfo( psDefn->Datum, &pszDatumName, NULL ); - if( !pszSpheroidName ) - GTIFGetEllipsoidInfo( psDefn->Ellipsoid, &pszSpheroidName, NULL, NULL ); - else - { - GTIFKeyGet(hGTIF, GeogSemiMajorAxisGeoKey, &(psDefn->SemiMajor), 0, 1 ); - GTIFKeyGet(hGTIF, GeogInvFlatteningGeoKey, &dfInvFlattening, 0, 1 ); - } - if( !pszPMName ) - GTIFGetPMInfo( psDefn->PM, &pszPMName, NULL ); - else - GTIFKeyGet(hGTIF, GeogPrimeMeridianLongGeoKey, &(psDefn->PMLongToGreenwich), 0, 1 ); - - if( !pszAngularUnits ) - { - GTIFGetUOMAngleInfo( psDefn->UOMAngle, &pszAngularUnits, NULL ); - if( pszAngularUnits == NULL ) - pszAngularUnits = CPLStrdup("unknown"); - } - else - { - GTIFKeyGet(hGTIF, GeogAngularUnitSizeGeoKey, &(psDefn->UOMAngleInDegrees), 0, 1 ); - aUnitGot = TRUE; - } - - if( pszDatumName != NULL ) - WKTMassageDatum( &pszDatumName ); - - dfSemiMajor = psDefn->SemiMajor; - if( dfSemiMajor == 0.0 ) - { - pszSpheroidName = CPLStrdup("unretrievable - using WGS84"); - dfSemiMajor = SRS_WGS84_SEMIMAJOR; - dfInvFlattening = SRS_WGS84_INVFLATTENING; - } - else if( dfInvFlattening == 0.0 && ((psDefn->SemiMinor / psDefn->SemiMajor) < 0.99999999999999999 - || (psDefn->SemiMinor / psDefn->SemiMajor) > 1.00000000000000001 ) ) - { - dfInvFlattening = -1.0 / (psDefn->SemiMinor/psDefn->SemiMajor - 1.0); - - /* Take official inverse flattening definition in the WGS84 case */ - if (dfSemiMajor == SRS_WGS84_SEMIMAJOR && - fabs(dfInvFlattening - SRS_WGS84_INVFLATTENING) < 1e-10) - dfInvFlattening = SRS_WGS84_INVFLATTENING; - } - if(!pszGeogName || strlen(pszGeogName) == 0) - pszGeogName = CPLStrdup( pszDatumName ); - if(aUnitGot) - oSRS.SetGeogCS( pszGeogName, pszDatumName, - pszSpheroidName, dfSemiMajor, dfInvFlattening, - pszPMName, - psDefn->PMLongToGreenwich / psDefn->UOMAngleInDegrees, - pszAngularUnits, - psDefn->UOMAngleInDegrees ); - else - oSRS.SetGeogCS( pszGeogName, pszDatumName, - pszSpheroidName, dfSemiMajor, dfInvFlattening, - pszPMName, - psDefn->PMLongToGreenwich / psDefn->UOMAngleInDegrees, - pszAngularUnits, - psDefn->UOMAngleInDegrees * 0.0174532925199433 ); - - if( psDefn->GCS != KvUserDefined && psDefn->GCS > 0 ) - oSRS.SetAuthority( "GEOGCS", "EPSG", psDefn->GCS ); - - if( psDefn->Datum != KvUserDefined ) - oSRS.SetAuthority( "DATUM", "EPSG", psDefn->Datum ); - - if( psDefn->Ellipsoid != KvUserDefined ) - oSRS.SetAuthority( "SPHEROID", "EPSG", psDefn->Ellipsoid ); - - CPLFree( pszGeogName ); - CPLFree( pszDatumName ); - GTIFFreeMemory( pszPMName ); - GTIFFreeMemory( pszSpheroidName ); - GTIFFreeMemory( pszAngularUnits ); - -/* ==================================================================== */ -/* Handle projection parameters. */ -/* ==================================================================== */ - if( psDefn->Model == ModelTypeProjected ) - { -/* -------------------------------------------------------------------- */ -/* Make a local copy of parms, and convert back into the */ -/* angular units of the GEOGCS and the linear units of the */ -/* projection. */ -/* -------------------------------------------------------------------- */ - double adfParm[10]; - int i; - - for( i = 0; i < MIN(10,psDefn->nParms); i++ ) - adfParm[i] = psDefn->ProjParm[i]; - - for( ; i < 10; i++ ) - adfParm[i] = 0.0; - - if(!aUnitGot) - { - adfParm[0] *= psDefn->UOMAngleInDegrees; - adfParm[1] *= psDefn->UOMAngleInDegrees; - adfParm[2] *= psDefn->UOMAngleInDegrees; - adfParm[3] *= psDefn->UOMAngleInDegrees; - } - int unitCode = 0; - GTIFKeyGet(hGTIF, ProjLinearUnitsGeoKey, &unitCode, 0, 1 ); - if(unitCode != KvUserDefined) - { - adfParm[5] /= psDefn->UOMLengthInMeters; - adfParm[6] /= psDefn->UOMLengthInMeters; - } - -/* -------------------------------------------------------------------- */ -/* Translation the fundamental projection. */ -/* -------------------------------------------------------------------- */ - switch( psDefn->CTProjection ) - { - case CT_TransverseMercator: - oSRS.SetTM( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_TransvMercator_SouthOriented: - oSRS.SetTMSO( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_Mercator: - oSRS.SetMercator( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_ObliqueStereographic: - oSRS.SetOS( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_Stereographic: - oSRS.SetOS( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_ObliqueMercator: /* hotine */ - oSRS.SetHOM( adfParm[0], adfParm[1], - adfParm[2], adfParm[3], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_EquidistantConic: - oSRS.SetEC( adfParm[0], adfParm[1], - adfParm[2], adfParm[3], - adfParm[5], adfParm[6] ); - break; - - case CT_CassiniSoldner: - oSRS.SetCS( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_Polyconic: - oSRS.SetPolyconic( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_AzimuthalEquidistant: - oSRS.SetAE( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_MillerCylindrical: - oSRS.SetMC( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_Equirectangular: - oSRS.SetEquirectangular2( adfParm[0], adfParm[1], - adfParm[2], - adfParm[5], adfParm[6] ); - break; - - case CT_Gnomonic: - oSRS.SetGnomonic( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_LambertAzimEqualArea: - oSRS.SetLAEA( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_Orthographic: - oSRS.SetOrthographic( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_Robinson: - oSRS.SetRobinson( adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_Sinusoidal: - oSRS.SetSinusoidal( adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_VanDerGrinten: - oSRS.SetVDG( adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_PolarStereographic: - oSRS.SetPS( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_LambertConfConic_2SP: - oSRS.SetLCC( adfParm[2], adfParm[3], - adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_LambertConfConic_1SP: - oSRS.SetLCC1SP( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); - break; - - case CT_AlbersEqualArea: - oSRS.SetACEA( adfParm[0], adfParm[1], - adfParm[2], adfParm[3], - adfParm[5], adfParm[6] ); - break; - - case CT_NewZealandMapGrid: - oSRS.SetNZMG( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - - case CT_CylindricalEqualArea: - oSRS.SetCEA( adfParm[0], adfParm[1], - adfParm[5], adfParm[6] ); - break; - } - -/* -------------------------------------------------------------------- */ -/* Set projection units. */ -/* -------------------------------------------------------------------- */ - if(!linearUnitIsSet) - { - char *pszUnitsName = NULL; - - GTIFGetUOMLengthInfo( psDefn->UOMLength, &pszUnitsName, NULL ); - - if( pszUnitsName != NULL && psDefn->UOMLength != KvUserDefined ) - { - oSRS.SetLinearUnits( pszUnitsName, psDefn->UOMLengthInMeters ); - oSRS.SetAuthority( "PROJCS|UNIT", "EPSG", psDefn->UOMLength ); - } - else - oSRS.SetLinearUnits( "unknown", psDefn->UOMLengthInMeters ); - - GTIFFreeMemory( pszUnitsName ); - } - } - -/* -------------------------------------------------------------------- */ -/* Return the WKT serialization of the object. */ -/* -------------------------------------------------------------------- */ - char *pszWKT; - - oSRS.FixupOrdering(); - - if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) - return pszWKT; - else - return NULL; -} - -/************************************************************************/ -/* OGCDatumName2EPSGDatumCode() */ -/************************************************************************/ - -static int OGCDatumName2EPSGDatumCode( const char * pszOGCName ) - -{ - FILE *fp; - char **papszTokens; - int nReturn = KvUserDefined; - -/* -------------------------------------------------------------------- */ -/* Do we know it as a built in? */ -/* -------------------------------------------------------------------- */ - if( EQUAL(pszOGCName,"NAD27") - || EQUAL(pszOGCName,"North_American_Datum_1927") ) - return Datum_North_American_Datum_1927; - else if( EQUAL(pszOGCName,"NAD83") - || EQUAL(pszOGCName,"North_American_Datum_1983") ) - return Datum_North_American_Datum_1983; - else if( EQUAL(pszOGCName,"WGS84") || EQUAL(pszOGCName,"WGS_1984") - || EQUAL(pszOGCName,"WGS 84")) - return Datum_WGS84; - else if( EQUAL(pszOGCName,"WGS72") || EQUAL(pszOGCName,"WGS_1972") ) - return Datum_WGS72; - -/* -------------------------------------------------------------------- */ -/* Open the table if possible. */ -/* -------------------------------------------------------------------- */ - fp = VSIFOpen( CSVFilename("gdal_datum.csv"), "r" ); - if( fp == NULL ) - fp = VSIFOpen( CSVFilename("datum.csv"), "r" ); - - if( fp == NULL ) - return nReturn; - -/* -------------------------------------------------------------------- */ -/* Discard the first line with field names. */ -/* -------------------------------------------------------------------- */ - CSLDestroy( CSVReadParseLine( fp ) ); - -/* -------------------------------------------------------------------- */ -/* Read lines looking for our datum. */ -/* -------------------------------------------------------------------- */ - for( papszTokens = CSVReadParseLine( fp ); - CSLCount(papszTokens) > 2 && nReturn == KvUserDefined; - papszTokens = CSVReadParseLine( fp ) ) - { - WKTMassageDatum( papszTokens + 1 ); - - if( EQUAL(papszTokens[1], pszOGCName) ) - nReturn = atoi(papszTokens[0]); - - CSLDestroy( papszTokens ); - } - - CSLDestroy( papszTokens ); - VSIFClose( fp ); - - return nReturn; -} - -/************************************************************************/ -/* GTIFSetFromOGISDefn() */ -/* */ -/* Write GeoTIFF projection tags from an OGC WKT definition. */ -/************************************************************************/ - -int GTIFSetFromOGISDefn( GTIF * psGTIF, const char *pszOGCWKT ) - -{ - OGRSpatialReference *poSRS; - int nPCS = KvUserDefined; - OGRErr eErr; - OGRBoolean peStrStored = FALSE; - - GTIFKeySet(psGTIF, GTRasterTypeGeoKey, TYPE_SHORT, 1, - RasterPixelIsArea); - -/* -------------------------------------------------------------------- */ -/* Create an OGRSpatialReference object corresponding to the */ -/* string. */ -/* -------------------------------------------------------------------- */ - poSRS = new OGRSpatialReference(); - if( poSRS->importFromWkt((char **) &pszOGCWKT) != OGRERR_NONE ) - { - delete poSRS; - return FALSE; - } - -/* -------------------------------------------------------------------- */ -/* Get the ellipsoid definition. */ -/* -------------------------------------------------------------------- */ - short nSpheroid = KvUserDefined; - double dfSemiMajor, dfInvFlattening; - - if( poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM|SPHEROID") != NULL - && EQUAL(poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM|SPHEROID"), - "EPSG")) - { - nSpheroid = (short) - atoi(poSRS->GetAuthorityCode("PROJCS|GEOGCS|DATUM|SPHEROID")); - } - else if( poSRS->GetAuthorityName("GEOGCS|DATUM|SPHEROID") != NULL - && EQUAL(poSRS->GetAuthorityName("GEOGCS|DATUM|SPHEROID"),"EPSG")) - { - nSpheroid = (short) - atoi(poSRS->GetAuthorityCode("GEOGCS|DATUM|SPHEROID")); - } - - dfSemiMajor = poSRS->GetSemiMajor( &eErr ); - dfInvFlattening = poSRS->GetInvFlattening( &eErr ); - if( eErr != OGRERR_NONE ) - { - dfSemiMajor = 0.0; - dfInvFlattening = 0.0; - } - -/* -------------------------------------------------------------------- */ -/* Get the Datum so we can special case a few PCS codes. */ -/* -------------------------------------------------------------------- */ - int nDatum = KvUserDefined; - - if( poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM") != NULL - && EQUAL(poSRS->GetAuthorityName("PROJCS|GEOGCS|DATUM"),"EPSG") ) - nDatum = atoi(poSRS->GetAuthorityCode("PROJCS|GEOGCS|DATUM")); - else if( poSRS->GetAuthorityName("GEOGCS|DATUM") != NULL - && EQUAL(poSRS->GetAuthorityName("GEOGCS|DATUM"),"EPSG") ) - nDatum = atoi(poSRS->GetAuthorityCode("GEOGCS|DATUM")); - else if( poSRS->GetAttrValue("DATUM") != NULL ) - nDatum = OGCDatumName2EPSGDatumCode( poSRS->GetAttrValue("DATUM") ); - -/* -------------------------------------------------------------------- */ -/* Get the GCS if possible. */ -/* -------------------------------------------------------------------- */ - int nGCS = KvUserDefined; - - if( poSRS->GetAuthorityName("PROJCS|GEOGCS") != NULL - && EQUAL(poSRS->GetAuthorityName("PROJCS|GEOGCS"),"EPSG") ) - nGCS = atoi(poSRS->GetAuthorityCode("PROJCS|GEOGCS")); - else if( poSRS->GetAuthorityName("GEOGCS") != NULL - && EQUAL(poSRS->GetAuthorityName("GEOGCS"),"EPSG") ) - nGCS = atoi(poSRS->GetAuthorityCode("GEOGCS")); - - if( nGCS > 32767 ) - nGCS = KvUserDefined; - -/* -------------------------------------------------------------------- */ -/* Get the linear units. */ -/* -------------------------------------------------------------------- */ - char *pszLinearUOMName = NULL; - double dfLinearUOM = poSRS->GetLinearUnits( &pszLinearUOMName ); - int nUOMLengthCode = 9001; /* meters */ - - if( (pszLinearUOMName != NULL - && EQUAL(pszLinearUOMName,SRS_UL_FOOT)) - || dfLinearUOM == atof(SRS_UL_FOOT_CONV) ) - nUOMLengthCode = 9002; /* international foot */ - else if( (pszLinearUOMName != NULL - && EQUAL(pszLinearUOMName,SRS_UL_US_FOOT)) - || ABS(dfLinearUOM-atof(SRS_UL_US_FOOT_CONV)) < 0.0000001 ) - nUOMLengthCode = 9003; /* us survey foot */ - else if( dfLinearUOM != 1.0 ) - nUOMLengthCode = KvUserDefined; - -/* -------------------------------------------------------------------- */ -/* Get some authority values. */ -/* -------------------------------------------------------------------- */ - if( poSRS->GetAuthorityName("PROJCS") != NULL - && EQUAL(poSRS->GetAuthorityName("PROJCS"),"EPSG") ) - { - nPCS = atoi(poSRS->GetAuthorityCode("PROJCS")); - if( nPCS > 32767 ) - nPCS = KvUserDefined; - } - -/* -------------------------------------------------------------------- */ -/* Handle the projection transformation. */ -/* -------------------------------------------------------------------- */ - const char *pszProjection = poSRS->GetAttrValue( "PROJECTION" ); - - if( nPCS != KvUserDefined ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); - } - else if( pszProjection == NULL ) - { - if( poSRS->IsGeographic() ) - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeGeographic); - // otherwise, presumably something like LOCAL_CS. - } - else if( EQUAL(pszProjection,SRS_PT_ALBERS_CONIC_EQUAL_AREA) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_AlbersEqualArea ); - - GTIFKeySet(psGTIF, ProjStdParallelGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( poSRS->GetUTMZone() != 0 ) - { - int bNorth, nZone, nProjection; - - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - - nZone = poSRS->GetUTMZone( &bNorth ); - - if( nDatum == Datum_North_American_Datum_1983 && nZone >= 3 - && nZone <= 22 && bNorth && nUOMLengthCode == 9001 ) - { - nPCS = 26900 + nZone; - - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); - } - else if( nDatum == Datum_North_American_Datum_1927 && nZone >= 3 - && nZone <= 22 && bNorth && nUOMLengthCode == 9001 ) - { - nPCS = 26700 + nZone; - - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); - } - else if( nDatum == Datum_WGS84 && nUOMLengthCode == 9001 ) - { - if( bNorth ) - nPCS = 32600 + nZone; - else - nPCS = 32700 + nZone; - - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, nPCS ); - } - else - { - if( bNorth ) - nProjection = 16000 + nZone; - else - nProjection = 16100 + nZone; - - - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, nProjection ); - } - } - - else if( EQUAL(pszProjection,SRS_PT_TRANSVERSE_MERCATOR) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_TransverseMercator ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_TRANSVERSE_MERCATOR_SOUTH_ORIENTED) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_TransvMercator_SouthOriented ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_MERCATOR_2SP) - || EQUAL(pszProjection,SRS_PT_MERCATOR_1SP) ) - - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Mercator ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_OBLIQUE_STEREOGRAPHIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_ObliqueStereographic ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_STEREOGRAPHIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Stereographic ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_POLAR_STEREOGRAPHIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_PolarStereographic ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStraightVertPoleLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_HOTINE_OBLIQUE_MERCATOR) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_ObliqueMercator ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjAzimuthAngleGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_AZIMUTH, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjRectifiedGridAngleGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_RECTIFIED_GRID_ANGLE, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtCenterGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_CASSINI_SOLDNER) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_CassiniSoldner ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_EQUIDISTANT_CONIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_EquidistantConic ); - - GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_POLYCONIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Polyconic ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_AZIMUTHAL_EQUIDISTANT) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_AzimuthalEquidistant ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_MILLER_CYLINDRICAL) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_MillerCylindrical ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_EQUIRECTANGULAR) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Equirectangular ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_GNOMONIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Gnomonic ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_LambertAzimEqualArea ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_ORTHOGRAPHIC) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Orthographic ); - - GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_NEW_ZEALAND_MAP_GRID) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_NewZealandMapGrid ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_ROBINSON) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Robinson ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_SINUSOIDAL) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_Sinusoidal ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_VANDERGRINTEN) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_VanDerGrinten ); - - GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_ALBERS_CONIC_EQUAL_AREA) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_AlbersEqualArea ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LONGITUDE_OF_CENTER, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_LambertConfConic_2SP ); - - GTIFKeySet(psGTIF, ProjFalseOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_2, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseOriginEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseOriginNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_LambertConfConic_1SP ); - - GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_SCALE_FACTOR, 1.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else if( EQUAL(pszProjection,SRS_PT_CYLINDRICAL_EQUAL_AREA) ) - { - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - ModelTypeProjected); - GTIFKeySet(psGTIF, ProjectedCSTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet(psGTIF, ProjectionGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - - GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, - CT_CylindricalEqualArea ); - - GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_STANDARD_PARALLEL_1, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_EASTING, 0.0 ) ); - - GTIFKeySet(psGTIF, ProjFalseNorthingGeoKey, TYPE_DOUBLE, 1, - poSRS->GetNormProjParm( SRS_PP_FALSE_NORTHING, 0.0 ) ); - } - - else - { - /* Anyhing we can't map, we store as an ESRI PE string with a citation key */ - char *pszPEString = NULL; - poSRS->morphToESRI(); - poSRS->exportToWkt( &pszPEString ); - int peStrLen = strlen(pszPEString); - if(peStrLen > 0) - { - char *outPeStr = new char[peStrLen + strlen("ESRI PE String = ")+1]; - strcpy(outPeStr, "ESRI PE String = "); - strcat(outPeStr, pszPEString); - GTIFKeySet( psGTIF, PCSCitationGeoKey, TYPE_ASCII, 0, outPeStr ); - peStrStored = TRUE; - delete[] outPeStr; - } - if(pszPEString) - CPLFree( pszPEString ); - GTIFKeySet(psGTIF, GTModelTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - } - -/* -------------------------------------------------------------------- */ -/* Write linear units information. */ -/* -------------------------------------------------------------------- */ - if( !poSRS->IsGeographic() ) - { - GTIFKeySet(psGTIF, ProjLinearUnitsGeoKey, TYPE_SHORT, 1, - nUOMLengthCode ); - if( nUOMLengthCode == KvUserDefined ) - GTIFKeySet( psGTIF, ProjLinearUnitSizeGeoKey, TYPE_DOUBLE, 1, - dfLinearUOM); - - /* if linear units name is available and user defined, store it as citation */ - if(!peStrStored && nUOMLengthCode == KvUserDefined && pszLinearUOMName && strlen(pszLinearUOMName)>0) - SetLinearUnitCitation(psGTIF, pszLinearUOMName); - } - -/* -------------------------------------------------------------------- */ -/* Write angular units. Always Degrees for now. */ -/* Changed to support different angular units */ -/* -------------------------------------------------------------------- */ - - char* angUnitName = NULL; - double angUnitValue = poSRS->GetAngularUnits(&angUnitName); - if(EQUAL(angUnitName, "Degree")) - GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1, - Angular_Degree ); - else if(angUnitName) - { - GTIFKeySet(psGTIF, GeogCitationGeoKey, TYPE_ASCII, 0, - angUnitName ); // it may be rewritten if the gcs is userdefined - GTIFKeySet(psGTIF, GeogAngularUnitSizeGeoKey, TYPE_DOUBLE, 1, - angUnitValue ); - } - -/* -------------------------------------------------------------------- */ -/* Try to write a citation from the main coordinate system */ -/* name. */ -/* -------------------------------------------------------------------- */ - if( poSRS->GetRoot() != NULL - && poSRS->GetRoot()->GetChild(0) != NULL - && (poSRS->IsProjected() || poSRS->IsLocal()) ) - { - GTIFKeySet( psGTIF, GTCitationGeoKey, TYPE_ASCII, 0, - poSRS->GetRoot()->GetChild(0)->GetValue() ); - } - -/* -------------------------------------------------------------------- */ -/* Try to write a GCS citation. */ -/* -------------------------------------------------------------------- */ - OGR_SRSNode *poGCS = poSRS->GetAttrNode( "GEOGCS" ); - - if( poGCS != NULL && poGCS->GetChild(0) != NULL ) - { - GTIFKeySet( psGTIF, GeogCitationGeoKey, TYPE_ASCII, 0, - poGCS->GetChild(0)->GetValue() ); - } - -/* -------------------------------------------------------------------- */ -/* Try to identify the GCS/datum, scanning the EPSG datum file for */ -/* a match. */ -/* -------------------------------------------------------------------- */ - if( nPCS == KvUserDefined ) - { - if( nGCS == KvUserDefined ) - { - if( nDatum == Datum_North_American_Datum_1927 ) - nGCS = GCS_NAD27; - else if( nDatum == Datum_North_American_Datum_1983 ) - nGCS = GCS_NAD83; - else if( nDatum == Datum_WGS84 || nDatum == DatumE_WGS84 ) - nGCS = GCS_WGS_84; - } - - if( nGCS != KvUserDefined ) - { - GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, - 1, nGCS ); - } - else if( nDatum != KvUserDefined ) - { - GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet( psGTIF, GeogGeodeticDatumGeoKey, TYPE_SHORT, - 1, nDatum ); - } - else if( nSpheroid != KvUserDefined ) - { - GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet( psGTIF, GeogGeodeticDatumGeoKey, TYPE_SHORT, - 1, KvUserDefined ); - GTIFKeySet( psGTIF, GeogEllipsoidGeoKey, TYPE_SHORT, 1, - nSpheroid ); - } - else if( dfSemiMajor != 0.0 ) - { - GTIFKeySet( psGTIF, GeographicTypeGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet( psGTIF, GeogGeodeticDatumGeoKey, TYPE_SHORT, - 1, KvUserDefined ); - GTIFKeySet( psGTIF, GeogEllipsoidGeoKey, TYPE_SHORT, 1, - KvUserDefined ); - GTIFKeySet( psGTIF, GeogSemiMajorAxisGeoKey, TYPE_DOUBLE, 1, - dfSemiMajor ); - if( dfInvFlattening == 0.0 ) - GTIFKeySet( psGTIF, GeogSemiMinorAxisGeoKey, TYPE_DOUBLE, 1, - dfSemiMajor ); - else - GTIFKeySet( psGTIF, GeogInvFlatteningGeoKey, TYPE_DOUBLE, 1, - dfInvFlattening ); - } - else if( poSRS->GetAttrValue("DATUM") != NULL - && strstr(poSRS->GetAttrValue("DATUM"),"unknown") == NULL - && strstr(poSRS->GetAttrValue("DATUM"),"unnamed") == NULL ) - - { - CPLError( CE_Warning, CPLE_AppDefined, - "Couldn't translate `%s' to a GeoTIFF datum.\n", - poSRS->GetAttrValue("DATUM") ); - } - - /* Always set InvFlattening if it is avaliable. */ - /* So that it doesn'tneed to calculate from SemiMinor */ - if( dfInvFlattening != 0.0 ) - GTIFKeySet( psGTIF, GeogInvFlatteningGeoKey, TYPE_DOUBLE, 1, - dfInvFlattening ); - /* Always set SemiMajor to keep the precision and in case of editing */ - if( dfSemiMajor != 0.0 ) - GTIFKeySet( psGTIF, GeogSemiMajorAxisGeoKey, TYPE_DOUBLE, 1, - dfSemiMajor ); - - if( nGCS == KvUserDefined ) - SetGeogCSCitation(psGTIF, poSRS, angUnitName, nDatum, nSpheroid); - } - -/* -------------------------------------------------------------------- */ -/* Cleanup */ -/* -------------------------------------------------------------------- */ - delete poSRS; - return TRUE; -} - -/************************************************************************/ -/* GTIFWktFromMemBuf() */ -/************************************************************************/ - -CPLErr GTIFWktFromMemBuf( int nSize, unsigned char *pabyBuffer, - char **ppszWKT, double *padfGeoTransform, - int *pnGCPCount, GDAL_GCP **ppasGCPList ) - -{ - TIFF *hTIFF; - GTIF *hGTIF; - GTIFDefn sGTIFDefn; - char szFilename[100]; - - sprintf( szFilename, "/vsimem/wkt_from_mem_buf_%ld.tif", - (long) CPLGetPID() ); - -/* -------------------------------------------------------------------- */ -/* Create a memory file from the buffer. */ -/* -------------------------------------------------------------------- */ - FILE *fp = VSIFileFromMemBuffer( szFilename, pabyBuffer, nSize, FALSE ); - if( fp == NULL ) - return CE_Failure; - VSIFCloseL( fp ); - -/* -------------------------------------------------------------------- */ -/* Initialize access to the memory geotiff structure. */ -/* -------------------------------------------------------------------- */ - hTIFF = VSI_TIFFOpen( szFilename, "r" ); - - if( hTIFF == NULL ) - { - CPLError( CE_Failure, CPLE_AppDefined, - "TIFF/GeoTIFF structure is corrupt." ); - return CE_Failure; - } - -/* -------------------------------------------------------------------- */ -/* Get the projection definition. */ -/* -------------------------------------------------------------------- */ - hGTIF = GTIFNew(hTIFF); - - if( hGTIF != NULL && GTIFGetDefn( hGTIF, &sGTIFDefn ) ) - *ppszWKT = GTIFGetOGISDefn( hGTIF, &sGTIFDefn ); - else - *ppszWKT = NULL; - - if( hGTIF ) - GTIFFree( hGTIF ); - -/* -------------------------------------------------------------------- */ -/* Get geotransform or tiepoints. */ -/* -------------------------------------------------------------------- */ - double *padfTiePoints, *padfScale, *padfMatrix; - int16 nCount; - - padfGeoTransform[0] = 0.0; - padfGeoTransform[1] = 1.0; - padfGeoTransform[2] = 0.0; - padfGeoTransform[3] = 0.0; - padfGeoTransform[4] = 0.0; - padfGeoTransform[5] = 1.0; - - *pnGCPCount = 0; - *ppasGCPList = NULL; - - if( TIFFGetField(hTIFF,TIFFTAG_GEOPIXELSCALE,&nCount,&padfScale ) - && nCount >= 2 ) - { - padfGeoTransform[1] = padfScale[0]; - padfGeoTransform[5] = - ABS(padfScale[1]); - - if( TIFFGetField(hTIFF,TIFFTAG_GEOTIEPOINTS,&nCount,&padfTiePoints ) - && nCount >= 6 ) - { - padfGeoTransform[0] = - padfTiePoints[3] - padfTiePoints[0] * padfGeoTransform[1]; - padfGeoTransform[3] = - padfTiePoints[4] - padfTiePoints[1] * padfGeoTransform[5]; - } - } - - else if( TIFFGetField(hTIFF,TIFFTAG_GEOTIEPOINTS,&nCount,&padfTiePoints ) - && nCount >= 6 ) - { - *pnGCPCount = nCount / 6; - *ppasGCPList = (GDAL_GCP *) CPLCalloc(sizeof(GDAL_GCP),*pnGCPCount); - - for( int iGCP = 0; iGCP < *pnGCPCount; iGCP++ ) - { - char szID[32]; - GDAL_GCP *psGCP = *ppasGCPList + iGCP; - - sprintf( szID, "%d", iGCP+1 ); - psGCP->pszId = CPLStrdup( szID ); - psGCP->pszInfo = CPLStrdup(""); - psGCP->dfGCPPixel = padfTiePoints[iGCP*6+0]; - psGCP->dfGCPLine = padfTiePoints[iGCP*6+1]; - psGCP->dfGCPX = padfTiePoints[iGCP*6+3]; - psGCP->dfGCPY = padfTiePoints[iGCP*6+4]; - psGCP->dfGCPZ = padfTiePoints[iGCP*6+5]; - } - } - - else if( TIFFGetField(hTIFF,TIFFTAG_GEOTRANSMATRIX,&nCount,&padfMatrix ) - && nCount == 16 ) - { - padfGeoTransform[0] = padfMatrix[3]; - padfGeoTransform[1] = padfMatrix[0]; - padfGeoTransform[2] = padfMatrix[1]; - padfGeoTransform[3] = padfMatrix[7]; - padfGeoTransform[4] = padfMatrix[4]; - padfGeoTransform[5] = padfMatrix[5]; - } - -/* -------------------------------------------------------------------- */ -/* Cleanup. */ -/* -------------------------------------------------------------------- */ - XTIFFClose( hTIFF ); - - VSIUnlink( szFilename ); - - if( *ppszWKT == NULL ) - return CE_Failure; - else - return CE_None; -} - -/************************************************************************/ -/* GTIFMemBufFromWkt() */ -/************************************************************************/ - -CPLErr GTIFMemBufFromWkt( const char *pszWKT, const double *padfGeoTransform, - int nGCPCount, const GDAL_GCP *pasGCPList, - int *pnSize, unsigned char **ppabyBuffer ) - -{ - TIFF *hTIFF; - GTIF *hGTIF; - char szFilename[100]; - - sprintf( szFilename, "/vsimem/wkt_from_mem_buf_%ld.tif", - (long) CPLGetPID() ); - -/* -------------------------------------------------------------------- */ -/* Initialize access to the memory geotiff structure. */ -/* -------------------------------------------------------------------- */ - hTIFF = VSI_TIFFOpen( szFilename, "w" ); - - if( hTIFF == NULL ) - { - CPLError( CE_Failure, CPLE_AppDefined, - "TIFF/GeoTIFF structure is corrupt." ); - return CE_Failure; - } - -/* -------------------------------------------------------------------- */ -/* Write some minimal set of image parameters. */ -/* -------------------------------------------------------------------- */ - TIFFSetField( hTIFF, TIFFTAG_IMAGEWIDTH, 1 ); - TIFFSetField( hTIFF, TIFFTAG_IMAGELENGTH, 1 ); - TIFFSetField( hTIFF, TIFFTAG_BITSPERSAMPLE, 8 ); - TIFFSetField( hTIFF, TIFFTAG_SAMPLESPERPIXEL, 1 ); - TIFFSetField( hTIFF, TIFFTAG_ROWSPERSTRIP, 1 ); - TIFFSetField( hTIFF, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ); - TIFFSetField( hTIFF, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK ); - -/* -------------------------------------------------------------------- */ -/* Get the projection definition. */ -/* -------------------------------------------------------------------- */ - - if( pszWKT != NULL ) - { - hGTIF = GTIFNew(hTIFF); - GTIFSetFromOGISDefn( hGTIF, pszWKT ); - GTIFWriteKeys( hGTIF ); - GTIFFree( hGTIF ); - } - -/* -------------------------------------------------------------------- */ -/* Set the geotransform, or GCPs. */ -/* -------------------------------------------------------------------- */ - if( padfGeoTransform[0] != 0.0 || padfGeoTransform[1] != 1.0 - || padfGeoTransform[2] != 0.0 || padfGeoTransform[3] != 0.0 - || padfGeoTransform[4] != 0.0 || ABS(padfGeoTransform[5]) != 1.0 ) - { - - if( padfGeoTransform[2] == 0.0 && padfGeoTransform[4] == 0.0 ) - { - double adfPixelScale[3], adfTiePoints[6]; - - adfPixelScale[0] = padfGeoTransform[1]; - adfPixelScale[1] = fabs(padfGeoTransform[5]); - adfPixelScale[2] = 0.0; - - TIFFSetField( hTIFF, TIFFTAG_GEOPIXELSCALE, 3, adfPixelScale ); - - adfTiePoints[0] = 0.0; - adfTiePoints[1] = 0.0; - adfTiePoints[2] = 0.0; - adfTiePoints[3] = padfGeoTransform[0]; - adfTiePoints[4] = padfGeoTransform[3]; - adfTiePoints[5] = 0.0; - - TIFFSetField( hTIFF, TIFFTAG_GEOTIEPOINTS, 6, adfTiePoints ); - } - else - { - double adfMatrix[16]; - - memset(adfMatrix,0,sizeof(double) * 16); - - adfMatrix[0] = padfGeoTransform[1]; - adfMatrix[1] = padfGeoTransform[2]; - adfMatrix[3] = padfGeoTransform[0]; - adfMatrix[4] = padfGeoTransform[4]; - adfMatrix[5] = padfGeoTransform[5]; - adfMatrix[7] = padfGeoTransform[3]; - adfMatrix[15] = 1.0; - - TIFFSetField( hTIFF, TIFFTAG_GEOTRANSMATRIX, 16, adfMatrix ); - } - } - -/* -------------------------------------------------------------------- */ -/* Otherwise write tiepoints if they are available. */ -/* -------------------------------------------------------------------- */ - else if( nGCPCount > 0 ) - { - double *padfTiePoints; - - padfTiePoints = (double *) CPLMalloc(6*sizeof(double)*nGCPCount); - - for( int iGCP = 0; iGCP < nGCPCount; iGCP++ ) - { - - padfTiePoints[iGCP*6+0] = pasGCPList[iGCP].dfGCPPixel; - padfTiePoints[iGCP*6+1] = pasGCPList[iGCP].dfGCPLine; - padfTiePoints[iGCP*6+2] = 0; - padfTiePoints[iGCP*6+3] = pasGCPList[iGCP].dfGCPX; - padfTiePoints[iGCP*6+4] = pasGCPList[iGCP].dfGCPY; - padfTiePoints[iGCP*6+5] = pasGCPList[iGCP].dfGCPZ; - } - - TIFFSetField( hTIFF, TIFFTAG_GEOTIEPOINTS, 6*nGCPCount, padfTiePoints); - CPLFree( padfTiePoints ); - } - -/* -------------------------------------------------------------------- */ -/* Cleanup and return the created memory buffer. */ -/* -------------------------------------------------------------------- */ - GByte bySmallImage = 0; - - TIFFWriteEncodedStrip( hTIFF, 0, (char *) &bySmallImage, 1 ); - TIFFWriteCheck( hTIFF, TIFFIsTiled(hTIFF), "GTIFMemBufFromWkt"); - TIFFWriteDirectory( hTIFF ); - - XTIFFClose( hTIFF ); - -/* -------------------------------------------------------------------- */ -/* Read back from the memory buffer. It would be preferrable */ -/* to be able to "steal" the memory buffer, but there isn't */ -/* currently any support for this. */ -/* -------------------------------------------------------------------- */ - GUIntBig nBigLength; - - *ppabyBuffer = VSIGetMemFileBuffer( szFilename, &nBigLength, TRUE ); - *pnSize = (int) nBigLength; - - return CE_None; -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/las_c_api.cpp work/liblas-src-1.2.1/src/las_c_api.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/las_c_api.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/las_c_api.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,1841 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: C API for libLAS - * Author: Howard Butler, hobu.inc@gmail.com, but I'm not proud of it. - * I also swiped a lot of it from GDAL. - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -typedef struct LASWriterHS *LASWriterH; -typedef struct LASReaderHS *LASReaderH; -typedef struct LASPointHS *LASPointH; -typedef struct LASHeaderHS *LASHeaderH; -typedef struct LASGuidHS *LASGuidH; -typedef struct LASVLRHS *LASVLRH; -typedef struct LASColorHS *LASColorH; -typedef struct LASSRSHS *LASSRSH; - - -#include -#include -#include -#include -#include // std::stringstream -#include -#include -#include -#include -#include - -using namespace liblas; - -LAS_C_START - -#ifndef _WIN32 -#include -#endif - -#ifdef _WIN32 -#define compare_no_case(a,b,n) _strnicmp( (a), (b), (n) ) -#else -#define compare_no_case(a,b,n) strncasecmp( (a), (b), (n) ) -#endif - -// Error stuff - - -typedef enum -{ - LE_None = 0, - LE_Debug = 1, - LE_Warning = 2, - LE_Failure = 3, - LE_Fatal = 4 -} LASErrorEnum; - - -static std::stack errors; - -#ifdef _MSC_VER -# pragma warning(disable: 4127) // warning C4127: conditional expression is constant -#endif - -#define VALIDATE_LAS_POINTER0(ptr, func) \ - do { if( NULL == ptr ) { \ - LASErrorEnum const ret = LE_Failure; \ - std::ostringstream msg; \ - msg << "Pointer \'" << #ptr << "\' is NULL in \'" << (func) <<"\'."; \ - std::string message(msg.str()); \ - LASError_PushError( ret, message.c_str(), (func)); \ - return; \ - }} while(0) - -#define VALIDATE_LAS_POINTER1(ptr, func, rc) \ - do { if( NULL == ptr ) { \ - LASErrorEnum const ret = LE_Failure; \ - std::ostringstream msg; \ - msg << "Pointer \'" << #ptr << "\' is NULL in \'" << (func) <<"\'."; \ - std::string message(msg.str()); \ - LASError_PushError( ret, message.c_str(), (func)); \ - return (rc); \ - }} while(0) - -LAS_DLL int LAS_IsGDALEnabled(void) { - return IsGDALEnabled(); -} - -LAS_DLL int LAS_IsLibGeoTIFFEnabled(void) { - return IsLibGeoTIFFEnabled(); -} - -LAS_DLL void LASError_Reset(void) { - if (errors.empty()) return; - for (std::size_t i=0;i(errors.size()); -} - -LAS_DLL LASReaderH LASReader_Create(const char* filename) - -{ - VALIDATE_LAS_POINTER1(filename, "LASReader_Create", NULL); - - try { - std::ios::openmode const mode = std::ios::in | std::ios::binary; - std::istream* istrm; - if (compare_no_case(filename,"STDIN",5) == 0) - { - istrm = &std::cin; - } - else - { - istrm = new std::ifstream(filename, mode); - } - - if (!istrm->good()) - { - delete istrm; - throw std::runtime_error("Reading stream was not able to be created"); - } - return (LASReaderH) new LASReader(*istrm); - - - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASReader_Create"); - return NULL; - } - - -} - -LAS_DLL void LASReader_Destroy(LASReaderH hReader) -{ - VALIDATE_LAS_POINTER0(hReader, "LASReader_Destroy"); - - try { - LASReader* reader = (LASReader*)hReader; - std::istream* istrm = &(reader->GetStream()); - - delete reader; - hReader = NULL; - - if (static_cast(*istrm)) - static_cast(*istrm).close(); - delete istrm; - istrm = NULL; - - } catch (std::runtime_error const& e/* e */) - { - LASError_PushError(LE_Failure, e.what(), "LASReader_Destroy"); - return; - } - - - hReader = NULL; -} - - - -LAS_DLL const LASPointH LASReader_GetNextPoint(const LASReaderH hReader) -{ - VALIDATE_LAS_POINTER1(hReader, "LASReader_GetNextPoint", NULL); - - try { - LASReader *reader = ((LASReader*) hReader); - if (reader->ReadNextPoint()) - // return (LASPointH) new LASPoint(reader->GetPoint()); - return (LASPointH) &(reader->GetPoint()); - else - return NULL; - } catch (invalid_point_data const& e /*e */) { - LASError_PushError(LE_Failure, e.what(), "LASReader_GetNextPoint Invalid Point"); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASReader_GetNextPoint"); - } - - return NULL; -} - -LAS_DLL const LASPointH LASReader_GetPointAt(const LASReaderH hReader, liblas::uint32_t position) -{ - VALIDATE_LAS_POINTER1(hReader, "LASReader_GetPointAt", NULL); - - try { - LASReader *reader = ((LASReader*) hReader); - if (reader->ReadPointAt((std::size_t) position)) - // return (LASPointH) new LASPoint(reader->GetPoint()); - return (LASPointH) &(reader->GetPoint()); - else - return NULL; - } catch (invalid_point_data const& e /*e */) { - LASError_PushError(LE_Failure, e.what(), "LASReader_GetPointAt Invalid Point"); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASReader_GetPointAt"); - } - - return NULL; - -} -LAS_DLL LASHeaderH LASReader_GetHeader(const LASReaderH hReader) -{ - VALIDATE_LAS_POINTER1(hReader, "LASReader_GetHeader", NULL); - - LASHeader header = ((LASReader*) hReader)->GetHeader(); - return (LASHeaderH) new LASHeader( header ); -} - -LAS_DLL LASErrorEnum LASReader_SetSRS(LASHeaderH hReader, const LASSRSH hSRS) { - - VALIDATE_LAS_POINTER1(hReader, "LASReader_SetSRS", LE_Failure); - VALIDATE_LAS_POINTER1(hSRS, "LASReader_SetSRS", LE_Failure); - - try { - ((LASReader*) hReader)->SetSRS(*((LASSpatialReference*)hSRS)); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASReader_SetSRS"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL LASHeaderH LASHeader_Create(void) { - return (LASHeaderH) new LASHeader(); -} - -LAS_DLL LASPointH LASPoint_Create(void) { - return (LASPointH) new LASPoint(); -} - -LAS_DLL LASPointH LASPoint_Copy(const LASPointH hPoint) { - return (LASPointH) new LASPoint(*((LASPoint*) hPoint)); -} - -LAS_DLL void LASPoint_Destroy(LASPointH hPoint) { - VALIDATE_LAS_POINTER0(hPoint, "LASPoint_Destroy"); - delete (LASPoint*) hPoint; - hPoint = NULL; -} - -LAS_DLL double LASPoint_GetX(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetX", 0.0); - - double value = ((LASPoint*) hPoint)->GetX(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetX(LASPointH hPoint, double value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetX", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetX(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetX"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL double LASPoint_GetY(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetY", 0.0); - - double value = ((LASPoint*) hPoint)->GetY(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetY(LASPointH hPoint, double value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetY", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetY(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetY"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL double LASPoint_GetZ(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetZ", 0.0); - - double value = ((LASPoint*) hPoint)->GetZ(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetZ(LASPointH hPoint, double value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetZ", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetZ(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetZ"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint16_t LASPoint_GetIntensity(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetIntensity", 0); - - liblas::uint16_t value = ((LASPoint*) hPoint)->GetIntensity(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetIntensity(LASPointH hPoint, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetIntensity", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetIntensity(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetIntensity"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint16_t LASPoint_GetReturnNumber(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetReturnNumber", 0); - - liblas::uint16_t value = ((LASPoint*) hPoint)->GetReturnNumber(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetReturnNumber(LASPointH hPoint, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetReturnNumber", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetReturnNumber(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetReturnNumber"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint16_t LASPoint_GetNumberOfReturns(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetNumberOfReturns", 0); - - liblas::uint16_t value = ((LASPoint*) hPoint)->GetNumberOfReturns(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetNumberOfReturns(LASPointH hPoint, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetNumberOfReturns", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetNumberOfReturns(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetNumberOfReturns"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint16_t LASPoint_GetScanDirection(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetScanDirection", 0); - - liblas::uint16_t value = ((LASPoint*) hPoint)->GetScanDirection(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetScanDirection(LASPointH hPoint, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetScanDirection", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetScanDirection(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetScanDirection"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint16_t LASPoint_GetFlightLineEdge(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetFlightLineEdge", 0); - - liblas::uint16_t value = ((LASPoint*) hPoint)->GetFlightLineEdge(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetFlightLineEdge(LASPointH hPoint, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetFlightLineEdge", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetFlightLineEdge(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetFlightLineEdge"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint8_t LASPoint_GetScanFlags(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetScanFlags", 0); - - liblas::uint8_t value = ((LASPoint*) hPoint)->GetScanFlags(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetScanFlags(LASPointH hPoint, liblas::uint8_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetScanFlags", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetScanFlags(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetScanFlags"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint8_t LASPoint_GetClassification(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetClassification", 0); - - liblas::uint8_t value = ((LASPoint*) hPoint)->GetClassification(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetClassification(LASPointH hPoint, liblas::uint8_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetClassification", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetClassification(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetClassification"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL LASErrorEnum LASPoint_SetTime(LASPointH hPoint, double value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetTime", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetTime(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetTime"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL double LASPoint_GetTime(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetTime", 0.0); - - double value = ((LASPoint*) hPoint)->GetTime(); - return value; -} - -LAS_DLL liblas::int8_t LASPoint_GetScanAngleRank(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetScanAngleRank", 0); - - liblas::int8_t value = ((LASPoint*) hPoint)->GetScanAngleRank(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetScanAngleRank(LASPointH hPoint, liblas::int8_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetScanAngleRank", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetScanAngleRank(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetScanAngleRank"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL liblas::uint16_t LASPoint_GetPointSourceId(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetPointSourceId", 0); - - liblas::uint16_t value = ((LASPoint*) hPoint)->GetPointSourceID(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetPointSourceId(LASPointH hPoint, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetPointSourceId", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetPointSourceID(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetPointSourceId"); - return LE_Failure; - } - - return LE_None; - -} - - -LAS_DLL liblas::uint8_t LASPoint_GetUserData(const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetUserData", 0); - - liblas::uint8_t value = ((LASPoint*) hPoint)->GetUserData(); - return value; -} - -LAS_DLL LASErrorEnum LASPoint_SetUserData(LASPointH hPoint, liblas::uint8_t value) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetUserData", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetUserData(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetUserData"); - return LE_Failure; - } - - return LE_None; - -} - -LAS_DLL int LASPoint_Equal(const LASPointH hPoint1, const LASPointH hPoint2) { - VALIDATE_LAS_POINTER1(hPoint1, "LASPoint_Equal", 0); - VALIDATE_LAS_POINTER1(hPoint2, "LASPoint_Equal", 0); - - LASPoint* point1 = ((LASPoint*) hPoint1); - LASPoint* point2 = ((LASPoint*) hPoint2); - - return (point1 == point2); - -} - -LAS_DLL int LASPoint_Validate(LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_Validate", LE_Failure); - - try { - ((LASPoint*) hPoint)->Validate(); - } catch (invalid_point_data const& e /*e */) { - return e.who(); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASPoint_Validate"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL int LASPoint_IsValid(LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_IsValid", LE_Failure); - return ((LASPoint*) hPoint)->IsValid(); -} - -LAS_DLL char* LASHeader_GetFileSignature(const LASHeaderH hHeader) { - // caller owns it - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetFileSignature", NULL); - - std::string signature = ((LASHeader*) hHeader)->GetFileSignature(); - return strdup(signature.c_str()); -} - -LAS_DLL liblas::uint16_t LASHeader_GetFileSourceId(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetFileSourceId", 0); - - unsigned short value = ((LASHeader*) hHeader)->GetFileSourceId(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetFileSourceId(LASHeaderH hHeader, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetFileSourceId", LE_Failure); - ((LASHeader*) hHeader)->SetFileSourceId(value); - return LE_None; -} - - -LAS_DLL liblas::uint16_t LASHeader_GetReserved(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetReserved", 0); - - unsigned short value = ((LASHeader*) hHeader)->GetReserved(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetReserved(LASHeaderH hHeader, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetReserved", LE_Failure); - ((LASHeader*) hHeader)->SetReserved(value); - return LE_None; -} - -LAS_DLL char* LASHeader_GetProjectId(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetProjectId", 0); - - liblas::guid id = ((LASHeader*) hHeader)->GetProjectId(); - return strdup(id.to_string().c_str()); -} - -LAS_DLL LASErrorEnum LASHeader_SetProjectId(LASHeaderH hHeader, const char* value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetProjectId", LE_Failure); - - try { - liblas::guid id; - id = liblas::guid::guid(value); - ((LASHeader*) hHeader)->SetProjectId(id); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetGUID"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint8_t LASHeader_GetVersionMajor(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetVersionMajor", 0); - - long value = ((LASHeader*) hHeader)->GetVersionMajor(); - return liblas::uint8_t(value); -} - -LAS_DLL LASErrorEnum LASHeader_SetVersionMajor(LASHeaderH hHeader, liblas::uint8_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetVersionMajor", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetVersionMajor(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetVersionMajor"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint8_t LASHeader_GetVersionMinor(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetVersionMinor", 0); - - long value = ((LASHeader*) hHeader)->GetVersionMinor(); - return liblas::uint8_t(value); -} - -LAS_DLL LASErrorEnum LASHeader_SetVersionMinor(LASHeaderH hHeader, liblas::uint8_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetVersionMinor", LE_Failure); - - // TODO: Maybe this should be a fatal error -- hobu - try { - ((LASHeader*) hHeader)->SetVersionMinor(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetVersionMinor"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL char* LASHeader_GetSystemId(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetSystemId", NULL); - - // caller owns it - std::string sysid = ((LASHeader*) hHeader)->GetSystemId(); - return strdup(sysid.c_str()); -} - -LAS_DLL LASErrorEnum LASHeader_SetSystemId(LASHeaderH hHeader, const char* value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetSystemId", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetSystemId(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetSystemId"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL char* LASHeader_GetSoftwareId(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetSoftwareId", NULL); - - // caller owns it - std::string softid = ((LASHeader*) hHeader)->GetSoftwareId(); - return strdup(softid.c_str()); -} - -LAS_DLL LASErrorEnum LASHeader_SetSoftwareId(LASHeaderH hHeader, const char* value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetSoftwareId", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetSoftwareId(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetSoftwareId"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint16_t LASHeader_GetCreationDOY(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetCreationDOY", 0); - - unsigned short value = ((LASHeader*) hHeader)->GetCreationDOY(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetCreationDOY(LASHeaderH hHeader, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetCreationDOY", LE_Failure); - ((LASHeader*) hHeader)->SetCreationDOY(value); - return LE_None; -} - -LAS_DLL liblas::uint16_t LASHeader_GetCreationYear(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetCreationYear", 0); - - unsigned short value = ((LASHeader*) hHeader)->GetCreationYear(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetCreationYear(LASHeaderH hHeader, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetCreationYear", LE_Failure); - ((LASHeader*) hHeader)->SetCreationYear(value); - return LE_None; -} - -LAS_DLL liblas::uint16_t LASHeader_GetHeaderSize(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetHeaderSize", 0); - - unsigned short value = ((LASHeader*) hHeader)->GetHeaderSize(); - return value; -} - -LAS_DLL liblas::uint32_t LASHeader_GetDataOffset(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetDataOffset", 0); - - unsigned long value = ((LASHeader*) hHeader)->GetDataOffset(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetDataOffset(const LASHeaderH hHeader, liblas::uint32_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetDataOffset", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetDataOffset(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetDataOffset"); - return LE_Failure; - } - - return LE_None; -} - - -LAS_DLL liblas::uint32_t LASHeader_GetRecordsCount(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetRecordsCount", 0); - - unsigned long value = ((LASHeader*) hHeader)->GetRecordsCount(); - return value; -} - -LAS_DLL liblas::uint8_t LASHeader_GetDataFormatId(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetDataFormatId", 0); - - LASHeader::PointFormat id = ((LASHeader*) hHeader)->GetDataFormatId(); - return static_cast(id); -} - -LAS_DLL LASErrorEnum LASHeader_SetDataFormatId(LASHeaderH hHeader, liblas::uint8_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetDataFormatId", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetDataFormatId((liblas::LASHeader::PointFormat)value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetDataFormatId"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint16_t LASHeader_GetDataRecordLength(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetDataRecordLength", 0); - - unsigned short value = ((LASHeader*) hHeader)->GetDataRecordLength(); - return value; -} - - -LAS_DLL liblas::uint32_t LASHeader_GetPointRecordsByReturnCount(const LASHeaderH hHeader, int index) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetPointRecordsByReturnCount", 0); - - std::vector counts = ((LASHeader*) hHeader)->GetPointRecordsByReturnCount(); - if ( (index < 5) && (index >= 0)) { - return counts[index]; - } - - return 0; - -} - -LAS_DLL LASErrorEnum LASHeader_SetPointRecordsByReturnCount(const LASHeaderH hHeader, int index, liblas::uint32_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetPointRecordsByReturnCount", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetPointRecordsByReturnCount(index, value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetPointRecordsByReturnCount"); - return LE_Failure; - } - - return LE_None; -} - - -LAS_DLL liblas::uint32_t LASHeader_GetPointRecordsCount(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetPointRecordsCount", 0); - - unsigned long value = ((LASHeader*) hHeader)->GetPointRecordsCount(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetPointRecordsCount(const LASHeaderH hHeader, liblas::uint32_t value) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetPointRecordsCount", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetPointRecordsCount(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetPointRecordsCount"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL double LASHeader_GetScaleX(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetScaleX", 0.0); - - double value = ((LASHeader*) hHeader)->GetScaleX(); - return value; -} - -LAS_DLL double LASHeader_GetScaleY(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetScaleY", 0.0); - - double value = ((LASHeader*) hHeader)->GetScaleY(); - return value; -} - -LAS_DLL double LASHeader_GetScaleZ(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetScaleZ", 0.0); - - double value = ((LASHeader*) hHeader)->GetScaleZ(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetScale(LASHeaderH hHeader, double x, double y, double z) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetScale", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetScale(x,y,z); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetScale"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL double LASHeader_GetOffsetX(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetOffsetX", 0.0); - - double value = ((LASHeader*) hHeader)->GetOffsetX(); - return value; -} - -LAS_DLL double LASHeader_GetOffsetY(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetOffsetY", 0.0); - - double value = ((LASHeader*) hHeader)->GetOffsetY(); - return value; -} - -LAS_DLL double LASHeader_GetOffsetZ(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetOffsetZ", 0.0); - - double value = ((LASHeader*) hHeader)->GetOffsetZ(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetOffset(LASHeaderH hHeader, double x, double y, double z) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetOffset", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetOffset(x,y,z); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetOffset"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL double LASHeader_GetMinX(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMinX", 0.0); - - double value = ((LASHeader*) hHeader)->GetMinX(); - return value; -} - -LAS_DLL double LASHeader_GetMinY(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMinY", 0.0); - - double value = ((LASHeader*) hHeader)->GetMinY(); - return value; -} - -LAS_DLL double LASHeader_GetMinZ(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMinZ", 0.0); - - double value = ((LASHeader*) hHeader)->GetMinZ(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetMin(LASHeaderH hHeader, double x, double y, double z) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetMin", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetMin(x,y,z); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetMin"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL double LASHeader_GetMaxX(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMaxX", 0.0); - - double value = ((LASHeader*) hHeader)->GetMaxX(); - return value; -} - -LAS_DLL double LASHeader_GetMaxY(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMaxY", 0.0); - - double value = ((LASHeader*) hHeader)->GetMaxY(); - return value; -} - -LAS_DLL double LASHeader_GetMaxZ(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetMaxZ", 0.0); - - double value = ((LASHeader*) hHeader)->GetMaxZ(); - return value; -} - -LAS_DLL LASErrorEnum LASHeader_SetMax(LASHeaderH hHeader, double x, double y, double z) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetMax", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetMax(x,y,z); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetMax"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL void LASHeader_Destroy(LASHeaderH hHeader) -{ - VALIDATE_LAS_POINTER0(hHeader, "LASHeader_Destroy"); - delete ((LASHeader*) hHeader); - hHeader=NULL; -} - -LAS_DLL LASHeaderH LASHeader_Copy(const LASHeaderH hHeader) { - return (LASHeaderH) new LASHeader(*((LASHeader*) hHeader)); -} - -LAS_DLL int LASHeader_Equal(const LASHeaderH hHeader1, const LASHeaderH hHeader2) { - VALIDATE_LAS_POINTER1(hHeader1, "LASHeader_Equal", 0); - VALIDATE_LAS_POINTER1(hHeader2, "LASHeader_Equal", 0); - - LASHeader* header1 = ((LASHeader*) hHeader1); - LASHeader* header2 = ((LASHeader*) hHeader2); - - return (header1 == header2); -} - -LAS_DLL LASGuidH LASHeader_GetGUID(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetGUID", 0); - - liblas::guid id = ((LASHeader*) hHeader)->GetProjectId(); - return (LASGuidH) new liblas::guid(id); -} - - -LAS_DLL LASErrorEnum LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetGUID", LE_Failure); - - try { - liblas::guid* id = (liblas::guid*) hId; - - ((LASHeader*) hHeader)->SetProjectId(*id); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetGUID"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, liblas::uint32_t i) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetVLR", 0); - - LASVariableRecord vlr = ((LASHeader*) hHeader)->GetVLR(i); - return (LASVLRH) new LASVariableRecord(vlr); -} - -LAS_DLL LASErrorEnum LASHeader_DeleteVLR(LASHeaderH hHeader, liblas::uint32_t index) { - - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_DeleteVLR", LE_Failure); - - try { - ((LASHeader*) hHeader)->DeleteVLR(index); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASHeader_DeleteVLR"); - return LE_Failure; - } - - - return LE_None; -} - -LAS_DLL LASErrorEnum LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR) { - - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_AddVLR", LE_Failure); - VALIDATE_LAS_POINTER1(hVLR, "LASHeader_AddVLR", LE_Failure); - - try { - ((LASHeader*) hHeader)->AddVLR(*((LASVariableRecord*)hVLR)); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASHeader_AddVLR"); - return LE_Failure; - } - - - return LE_None; -} - - - - -LAS_DLL LASWriterH LASWriter_Create(const char* filename, const LASHeaderH hHeader, int mode) { - VALIDATE_LAS_POINTER1(hHeader, "LASWriter_Create", NULL); - - if (filename == NULL) { - LASError_PushError(LE_Failure, "Input filename was null", "LASWriter_Create"); - return NULL; - } - try { - std::ios::openmode m; - if ( (mode > 2) || (mode < 1)) { - throw std::runtime_error("File mode must be eWrite or eAppend"); - } - - std::ostream* ostrm; - - // append mode - if (mode == 2) { - m = std::ios::out | std::ios::in | std::ios::binary | std::ios::ate; - } - // write mode - else { - m = std::ios::out | std::ios::binary | std::ios::ate; - } - - if (compare_no_case(filename,"STOUT",5) == 0) - { - ostrm = &std::cout; - } - else - { - ostrm = new std::ofstream(filename, m); - } - - - if (!ostrm->good()) - { - delete ostrm; - throw std::runtime_error("Writing stream was not able to be created"); - } - - LASHeader* header = ((LASHeader*) hHeader); - LASWriter* writer = new LASWriter(*ostrm, *header); - return (LASWriterH) writer; - - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASWriter_Create"); - return NULL; - } - -} - -LAS_DLL LASErrorEnum LASWriter_WritePoint(const LASWriterH hWriter, const LASPointH hPoint) { - - VALIDATE_LAS_POINTER1(hPoint, "LASWriter_WritePoint", LE_Failure); - int ret; - - try { - ret = ((LASWriter*) hWriter)->WritePoint(*((LASPoint*) hPoint)); - if (!ret) { - LASError_PushError( LE_Warning, - "Failed to write point because it was invalid", - "LASWriter_WritePoint"); - return LE_Warning; - } - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASWriter_WritePoint"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL LASErrorEnum LASWriter_WriteHeader(const LASWriterH hWriter, const LASHeaderH hHeader) { - - VALIDATE_LAS_POINTER1(hHeader, "LASWriter_WriteHeader", LE_Failure); - VALIDATE_LAS_POINTER1(hWriter, "LASWriter_WriteHeader", LE_Failure); - - try { - ((LASWriter*) hWriter)->WriteHeader(*((LASHeader*) hHeader)); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASWriter_WriteHeader"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL void LASWriter_Destroy(LASWriterH hWriter) -{ - VALIDATE_LAS_POINTER0(hWriter, "LASWriter_Destroy"); - - - - - - - try { - LASWriter* writer = (LASWriter*)hWriter; - std::ostream* ostrm = &(writer->GetStream()); - - delete writer; - hWriter = NULL; - - if (static_cast(*ostrm)) - static_cast(*ostrm).close(); - delete ostrm; - ostrm = NULL; - - } catch (std::runtime_error const& e/* e */) - { - LASError_PushError(LE_Failure, e.what(), "LASWriter_Destroy"); - return; - } - -} - -LAS_DLL LASErrorEnum LASWriter_SetSRS(LASWriterH hWriter, const LASSRSH hSRS) { - - VALIDATE_LAS_POINTER1(hWriter, "LASWriter_SetSRS", LE_Failure); - VALIDATE_LAS_POINTER1(hSRS, "LASWriter_SetSRS", LE_Failure); - - try { - ((LASWriter*) hWriter)->SetSRS(*((LASSpatialReference*)hSRS)); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASWriter_SetSRS"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL void LASError_Print(const char* message) { - - char* errmsg= NULL; - char* errmethod = NULL; - errmsg = LASError_GetLastErrorMsg(); - errmethod = LASError_GetLastErrorMethod(); - if (LASError_GetErrorCount()) { - fprintf(stderr, - "%s: %s (%d) from method %s\n", - message, - errmsg, - LASError_GetLastErrorNum(), - errmethod - ); - if (errmsg) free(errmsg); - if (errmethod) free(errmethod); - } else { - fprintf(stderr, - "You have encountered an error. '%s'\n", - message - ); - } - -} - -LAS_DLL char * LAS_GetVersion() { - - /* XXX - mloskot: I'd suggest to define PACKAGE_VERSION as static object - and return safe const pointer, instead of newly allocated string. */ - - /* FIXME - mloskot: Termporarily, I defined PACKAGE_VERSION - in las_config.h to solve Visual C++ compilation (Ticket #23) */ - - std::ostringstream output; - -// output << LIBLAS_VERSION_MAJOR; -// output << "." << LIBLAS_VERSION_MINOR; -// output << "." << LIBLAS_VERSION_REV; -// output << "." << LIBLAS_VERSION_BUILD; - output << LIBLAS_RELEASE_NAME; - std::string out(output.str()); - return strdup(out.c_str()); -} - - - -LAS_DLL LASVLRH LASVLR_Create(void) { - return (LASVLRH) new LASVariableRecord(); -} - -LAS_DLL void LASVLR_Destroy(LASVLRH hVLR){ - VALIDATE_LAS_POINTER0(hVLR, "LASVLR_Destroy"); - delete (LASVariableRecord*)hVLR; - hVLR = NULL; - -} - -LAS_DLL char* LASVLR_GetUserId(const LASVLRH hVLR) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetUserId", 0); - LASVariableRecord* vlr = (LASVariableRecord*)hVLR; - return strdup(vlr->GetUserId(true).c_str()); -} - -LAS_DLL LASErrorEnum LASVLR_SetUserId(LASVLRH hVLR, const char* value) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetUserId", LE_Failure); - - try { - ((LASVariableRecord*) hVLR)->SetUserId(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASVLR_SetUserId"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL char* LASVLR_GetDescription(const LASVLRH hVLR) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetDescription", 0); - LASVariableRecord* vlr = (LASVariableRecord*)hVLR; - return strdup(vlr->GetDescription(true).c_str()); -} - -LAS_DLL LASErrorEnum LASVLR_SetDescription(LASVLRH hVLR, const char* value) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetDescription", LE_Failure); - - try { - ((LASVariableRecord*) hVLR)->SetDescription(value); - } catch (std::exception const& e) - { - LASError_PushError(LE_Failure, e.what(), "LASVLR_SetDescription"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint16_t LASVLR_GetRecordLength(const LASVLRH hVLR) { - - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetRecordLength", 0); - - liblas::uint16_t value = ((LASVariableRecord*) hVLR)->GetRecordLength(); - return value; -} -LAS_DLL LASErrorEnum LASVLR_SetRecordLength(LASVLRH hVLR, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetRecordLength", LE_Failure); - ((LASVariableRecord*) hVLR)->SetRecordLength(value); - return LE_None; -} - -LAS_DLL liblas::uint16_t LASVLR_GetRecordId(const LASVLRH hVLR) { - - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetRecordId", 0); - - liblas::uint16_t value = ((LASVariableRecord*) hVLR)->GetRecordId(); - return value; -} -LAS_DLL LASErrorEnum LASVLR_SetRecordId(LASVLRH hVLR, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetRecordId", LE_Failure); - ((LASVariableRecord*) hVLR)->SetRecordId(value); - return LE_None; -} - - -LAS_DLL LASErrorEnum LASVLR_SetReserved(LASVLRH hVLR, liblas::uint16_t value) { - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetReserved", LE_Failure); - ((LASVariableRecord*) hVLR)->SetReserved(value); - return LE_None; -} - -LAS_DLL liblas::uint16_t LASVLR_GetReserved(const LASVLRH hVLR) { - - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetReserved", 0); - - liblas::uint16_t value = ((LASVariableRecord*) hVLR)->GetReserved(); - return value; -} - -LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t* data) { - - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_GetData", LE_Failure); - - try { - LASVariableRecord* vlr = ((LASVariableRecord*) hVLR); - std::vector d = vlr->GetData(); - liblas::uint16_t length = vlr->GetRecordLength(); - for (liblas::uint16_t i=0; i < length; i++) { - data[i] = d[i]; - } - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASVLR_GetData"); - return LE_Failure; - } - - - return LE_None; -} - -LAS_DLL LASErrorEnum LASVLR_SetData(const LASVLRH hVLR, liblas::uint8_t* data, liblas::uint16_t length) { - - VALIDATE_LAS_POINTER1(hVLR, "LASVLR_SetData", LE_Failure); - - try { - LASVariableRecord* vlr = ((LASVariableRecord*) hVLR); - std::vector d; - d.resize(length); - for (liblas::uint16_t i=0; i < length; i++) { - d[i] = data[i]; - } - vlr->SetData(d); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASVLR_GetData"); - return LE_Failure; - } - - - return LE_None; -} - -LAS_DLL LASGuidH LASGuid_Create() { - liblas::guid random; - try { - random = liblas::guid::create(); - return (LASGuidH) new liblas::guid(random); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASGuid_Create"); - return NULL; - } -} - -LAS_DLL LASGuidH LASGuid_CreateFromString(const char* string) { - VALIDATE_LAS_POINTER1(string, "LASGuid_CreateFromString", NULL); - liblas::guid id; - try { - id = liblas::guid::guid(string); - return (LASGuidH) new liblas::guid(id); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASGuid_CreateFromString"); - return NULL; - } -} - -LAS_DLL void LASGuid_Destroy(LASGuidH hId) { - VALIDATE_LAS_POINTER0(hId, "LASGuid_Destroy"); - delete (liblas::guid*) hId; - hId = NULL; -} - -LAS_DLL int LASGuid_Equals(LASGuidH hId1, LASGuidH hId2) { - VALIDATE_LAS_POINTER1(hId1, "LASGuid_Equals", LE_Failure); - VALIDATE_LAS_POINTER1(hId2, "LASGuid_Equals", LE_Failure); - - liblas::guid* id1 = (liblas::guid*)hId1; - liblas::guid* id2 = (liblas::guid*)hId2; - try { - - return( *id1 == *id2); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASGuid_Equals"); - return LE_Failure; - } -} - -LAS_DLL char* LASGuid_AsString(LASGuidH hId) { - VALIDATE_LAS_POINTER1(hId, "LASGuid_AsString", 0); - liblas::guid* id= (liblas::guid*)hId; - return strdup(id->to_string().c_str()); -} - - - -LAS_DLL LASColorH LASColor_Create(void) { - return (LASColorH) new LASColor(); -} - -LAS_DLL void LASColor_Destroy(LASColorH hColor){ - VALIDATE_LAS_POINTER0(hColor, "LASColor_Destroy"); - delete (LASColor*)hColor; - hColor = NULL; -} - -LAS_DLL LASErrorEnum LASColor_SetRed(LASColorH hColor, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hColor, "LASColor_SetRed", LE_Failure); - - try { - LASColor* color = ((LASColor*) hColor); - color->SetRed(value); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASColor_SetRed"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint16_t LASColor_GetRed(LASColorH hColor) { - - VALIDATE_LAS_POINTER1(hColor, "LASColor_GetRed", 0); - - liblas::uint16_t value = ((LASColor*) hColor)->GetRed(); - return value; -} - -LAS_DLL LASErrorEnum LASColor_SetBlue(LASColorH hColor, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hColor, "LASColor_SetBlue", LE_Failure); - - try { - LASColor* color = ((LASColor*) hColor); - color->SetBlue(value); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASColor_SetBlue"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint16_t LASColor_GetBlue(LASColorH hColor) { - - VALIDATE_LAS_POINTER1(hColor, "LASColor_GetBlue", 0); - - liblas::uint16_t value = ((LASColor*) hColor)->GetBlue(); - return value; -} - -LAS_DLL LASErrorEnum LASColor_SetGreen(LASColorH hColor, liblas::uint16_t value) { - - VALIDATE_LAS_POINTER1(hColor, "LASColor_SetGreen", LE_Failure); - - try { - LASColor* color = ((LASColor*) hColor); - color->SetGreen(value); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASColor_SetGreen"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL liblas::uint16_t LASColor_GetGreen(LASColorH hColor) { - - VALIDATE_LAS_POINTER1(hColor, "LASColor_GetGreen", 0); - - liblas::uint16_t value = ((LASColor*) hColor)->GetGreen(); - return value; -} - -LAS_DLL LASColorH LASPoint_GetColor(const LASPointH hPoint) { - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_GetColor", 0); - - LASColor color = ((LASPoint*) hPoint)->GetColor(); - return (LASColorH) new LASColor(color); -} - -LAS_DLL LASErrorEnum LASPoint_SetColor(LASPointH hPoint, const LASColorH hColor) { - - VALIDATE_LAS_POINTER1(hPoint, "LASPoint_SetColor", LE_Failure); - VALIDATE_LAS_POINTER1(hColor, "LASPoint_SetColor", LE_Failure); - - try { - ((LASPoint*) hPoint)->SetColor(*((LASColor*)hColor)); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASPoint_SetColor"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL LASSRSH LASSRS_Create(void) { - return (LASSRSH) new LASSpatialReference(); -} - -LAS_DLL void LASSRS_Destroy(LASSRSH hSRS){ - VALIDATE_LAS_POINTER0(hSRS, "LASSRS_Destroy"); - delete (LASSpatialReference*)hSRS; - hSRS = NULL; -} - -LAS_DLL const GTIF* LASSRS_GetGTIF(LASSRSH hSRS) { - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetGTIF", 0); - - try { - return ((LASSpatialReference*) hSRS)->GetGTIF(); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASSRS_GetGTIF"); - return 0; - } -} - -LAS_DLL LASErrorEnum LASSRS_SetGTIF(LASSRSH hSRS, const GTIF* gtiff, const ST_TIFF* tiff) -{ - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetGTIF", LE_Failure); - VALIDATE_LAS_POINTER1(gtiff, "LASSRS_SetGTIF", LE_Failure); - VALIDATE_LAS_POINTER1(tiff, "LASSRS_SetGTIF", LE_Failure); - try { - ((LASSpatialReference*) hSRS)->SetGTIF(gtiff, tiff); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASSRS_SetGTIF"); - return LE_Failure; - } - - return LE_None; -} -LAS_DLL char* LASSRS_GetProj4(LASSRSH hSRS) -{ - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetProj4", NULL); - LASSpatialReference* srs = (LASSpatialReference*)hSRS; - - return strdup((srs)->GetProj4().c_str()); - -} - -LAS_DLL LASErrorEnum LASSRS_SetProj4(LASSRSH hSRS, const char* value) -{ - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetProj4", LE_Failure); - VALIDATE_LAS_POINTER1(value, "LASSRS_SetProj4", LE_Failure); - - try { - ((LASSpatialReference*) hSRS)->SetProj4(value); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASSRS_SetProj4"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL char* LASSRS_GetWKT(LASSRSH hSRS) -{ - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetWKT", NULL); - LASSpatialReference* srs = (LASSpatialReference*)hSRS; - - return strdup((srs)->GetWKT().c_str()); - -} - -LAS_DLL LASErrorEnum LASSRS_SetWKT(LASSRSH hSRS, const char* value) -{ - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetWKT", LE_Failure); - VALIDATE_LAS_POINTER1(value, "LASSRS_SetWKT", LE_Failure); - - try { - ((LASSpatialReference*) hSRS)->SetWKT(value); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASSRS_SetWKT"); - return LE_Failure; - } - - return LE_None; -} - -LAS_DLL LASErrorEnum LASSRS_AddVLR(LASSRSH hSRS, const LASVLRH hVLR) { - - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_AddVLR", LE_Failure); - VALIDATE_LAS_POINTER1(hVLR, "LASSRS_AddVLR", LE_Failure); - - try { - ((LASSpatialReference*) hSRS)->AddVLR(*((LASVariableRecord*)hVLR)); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASSRS_AddVLR"); - return LE_Failure; - } - - - return LE_None; -} - -LAS_DLL LASVLRH LASSRS_GetVLR(const LASSRSH hSRS, liblas::uint32_t i) { - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetVLR", 0); - - LASVariableRecord vlr = ((LASSpatialReference*) hSRS)->GetVLRs()[i]; - return (LASVLRH) new LASVariableRecord(vlr); -} - -LAS_DLL liblas::uint32_t LASSRS_GetVLRCount(const LASSRSH hSRS) { - VALIDATE_LAS_POINTER1(hSRS, "LASSRS_GetVLR", 0); - - liblas::uint32_t size = ((LASSpatialReference*) hSRS)->GetVLRs().size(); - return size; -} - -LAS_DLL LASErrorEnum LASHeader_SetSRS(LASHeaderH hHeader, const LASSRSH hSRS) { - - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_SetSRS", LE_Failure); - VALIDATE_LAS_POINTER1(hSRS, "LASHeader_SetSRS", LE_Failure); - - try { - ((LASHeader*) hHeader)->SetSRS(*((LASSpatialReference*)hSRS)); - } - catch (std::exception const& e) { - LASError_PushError(LE_Failure, e.what(), "LASHeader_SetSRS"); - return LE_Failure; - } - - - return LE_None; -} - -LAS_DLL LASSRSH LASHeader_GetSRS(const LASHeaderH hHeader) { - VALIDATE_LAS_POINTER1(hHeader, "LASHeader_GetSRS", 0); - - LASSpatialReference srs = ((LASHeader*) hHeader)->GetSRS(); - return (LASSRSH) new LASSpatialReference(srs); -} - - -LAS_DLL void LASString_Free(char* string) { - if (string) - free(string); -} - -LAS_C_END - -#ifdef _MSC_VER -# pragma warning(default: 4127) // enable warning C4127: conditional expression is constant -#endif diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lascolor.cpp work/liblas-src-1.2.1/src/lascolor.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lascolor.cpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/lascolor.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,87 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS color class - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include - -// std -#include - -namespace liblas { - -LASColor::LASColor() : - m_red(0), - m_green(0), - m_blue(0) -{ -} - -LASColor::LASColor(LASColor const& other) : - m_red(other.m_red), - m_green(other.m_green), - m_blue(other.m_blue) -{ -} - -LASColor& LASColor::operator=(LASColor const& rhs) -{ - if (&rhs != this) - { - m_red = rhs.m_red; - m_green = rhs.m_green; - m_blue = rhs.m_blue; - } - return *this; -} - -bool LASColor::operator==(LASColor const& other) const -{ - if (&other == this) return true; - - if (m_red != other.m_red) return false; - if (m_green != other.m_green) return false; - if (m_blue != other.m_blue) return false; - - return true; -} - -} // namespace liblas - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/laserror.cpp work/liblas-src-1.2.1/src/laserror.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/laserror.cpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/laserror.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,78 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: An error encapsulation class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * Copyright (c) 2008, Phil Vachon - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -//std -#include - -namespace liblas -{ - -LASError::LASError(int code, std::string const& message, std::string const& method) : - m_code(code), - m_message(message), - m_method(method) -{ -} - -LASError::LASError(LASError const& other) : - m_code(other.m_code), - m_message(other.m_message), - m_method(other.m_method) -{ -} - -LASError& LASError::operator=(LASError const& rhs) -{ - if (&rhs != this) - { - m_code = rhs.m_code; - m_message = rhs.m_message; - m_method = rhs.m_method; - - } - return *this; -} - -} // namespace liblas diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasfile.cpp work/liblas-src-1.2.1/src/lasfile.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasfile.cpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/lasfile.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,116 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: A composite class to handle read/write operations - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include - -#include -#include - -namespace liblas { - -LASFile::LASFile() -{ -} - -LASFile::LASFile(std::string const& filename) - : m_pimpl(new detail::FileImpl(filename)) -{ -} - -LASFile::LASFile(std::string const& filename, LASHeader const& header, Mode mode) - : m_pimpl(new detail::FileImpl(filename, header, mode)) -{ -} - -LASFile::LASFile(LASFile const& other) - : m_pimpl(other.m_pimpl) -{ -} - -LASFile& LASFile::operator=(LASFile const& rhs) -{ - m_pimpl = rhs.m_pimpl; - return (*this); -} - -bool LASFile::IsNull() const -{ - return (0 == m_pimpl.get()); -} - -std::string LASFile::GetName() const -{ - return m_pimpl->GetName(); -} - -LASFile::Mode LASFile::GetMode() const -{ - int const mode = m_pimpl->GetMode(); - if (mode == 0) - return eRead; - else if (mode == 1) - return eWrite; - else if (mode == 2) - return eAppend; - - assert("SHOULD NEVER GET HERE"); - return eRead; -} - -LASHeader const& LASFile::GetHeader() const -{ - return m_pimpl->GetHeader(); -} - -LASReader& LASFile::GetReader() -{ - return m_pimpl->GetReader(); -} - -LASWriter& LASFile::GetWriter() -{ - return m_pimpl->GetWriter(); -} - -} // namespace liblas diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasheader.cpp work/liblas-src-1.2.1/src/lasheader.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasheader.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/lasheader.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,703 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS header class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Phil Vachon - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include - -// GeoTIFF -#ifdef HAVE_LIBGEOTIFF -#include -#include -#include "geo_normalize.h" -#include "geo_simpletags.h" -#include "geovalues.h" -#include "geotiffio.h" -#endif // HAVE_LIBGEOTIFF - -//std -#include -#include -#include -#include -#include -#include // std::memset, std::memcpy, std::strncpy -#include -#include - - -namespace liblas -{ - -char const* const LASHeader::FileSignature = "LASF"; -char const* const LASHeader::SystemIdentifier = "libLAS"; -char const* const LASHeader::SoftwareIdentifier = "libLAS 1.2"; - -LASHeader::LASHeader() -{ - Init(); -} - -LASHeader::LASHeader(LASHeader const& other) : - m_sourceId(other.m_sourceId), - m_reserved(other.m_reserved), - m_projectId1(other.m_projectId1), - m_projectId2(other.m_projectId2), - m_projectId3(other.m_projectId3), - m_versionMajor(other.m_versionMajor), - m_versionMinor(other.m_versionMinor), - m_createDOY(other.m_createDOY), - m_createYear(other.m_createYear), - m_headerSize(other.m_headerSize), - m_dataOffset(other.m_dataOffset), - m_recordsCount(other.m_recordsCount), - m_dataFormatId(other.m_dataFormatId), - m_dataRecordLen(other.m_dataRecordLen), - m_pointRecordsCount(other.m_pointRecordsCount), - m_scales(other.m_scales), - m_offsets(other.m_offsets), - m_extents(other.m_extents), - m_srs(other.m_srs) -{ - void* p = 0; - - p = std::memcpy(m_signature, other.m_signature, eFileSignatureSize); - assert(p == m_signature); - p = std::memcpy(m_projectId4, other.m_projectId4, eProjectId4Size); - assert(p == m_projectId4); - p = std::memcpy(m_systemId, other.m_systemId, eSystemIdSize); - assert(p == m_systemId); - p = std::memcpy(m_softwareId, other.m_softwareId, eSoftwareIdSize); - assert(p == m_softwareId); - std::vector(other.m_pointRecordsByReturn).swap(m_pointRecordsByReturn); - assert(ePointsByReturnSize >= m_pointRecordsByReturn.size()); - - std::vector(other.m_vlrs).swap(m_vlrs); - -} - -LASHeader& LASHeader::operator=(LASHeader const& rhs) -{ - if (&rhs != this) - { - void* p = 0; - p = std::memcpy(m_signature, rhs.m_signature, eFileSignatureSize); - assert(p == m_signature); - m_sourceId = rhs.m_sourceId; - m_reserved = rhs.m_reserved; - m_projectId1 = rhs.m_projectId1; - m_projectId2 = rhs.m_projectId2; - m_projectId3 = rhs.m_projectId3; - p = std::memcpy(m_projectId4, rhs.m_projectId4, eProjectId4Size); - assert(p == m_projectId4); - m_versionMajor = rhs.m_versionMajor; - m_versionMinor = rhs.m_versionMinor; - p = std::memcpy(m_systemId, rhs.m_systemId, eSystemIdSize); - assert(p == m_systemId); - p = std::memcpy(m_softwareId, rhs.m_softwareId, eSoftwareIdSize); - assert(p == m_softwareId); - m_createDOY = rhs.m_createDOY; - m_createYear = rhs.m_createYear; - m_headerSize = rhs.m_headerSize; - m_dataOffset = rhs.m_dataOffset; - m_recordsCount = rhs.m_recordsCount; -// m_recordsCount = 0; - m_dataFormatId = rhs.m_dataFormatId; - m_dataRecordLen = rhs.m_dataRecordLen; - m_pointRecordsCount = rhs.m_pointRecordsCount; - - std::vector(rhs.m_pointRecordsByReturn).swap(m_pointRecordsByReturn); - assert(ePointsByReturnSize >= m_pointRecordsByReturn.size()); - - std::vector(rhs.m_vlrs).swap(m_vlrs); - m_scales = rhs.m_scales; - m_offsets = rhs.m_offsets; - m_extents = rhs.m_extents; - m_srs = rhs.m_srs; - } - return *this; -} - -bool LASHeader::operator==(LASHeader const& other) const -{ - if (&other == this) return true; - - if (m_signature != other.m_signature) return false; - if (m_sourceId != other.m_sourceId) return false; - if (m_reserved != other.m_reserved) return false; - if (m_projectId1 != other.m_projectId1) return false; - if (m_projectId2 != other.m_projectId2) return false; - if (m_projectId3 != other.m_projectId3) return false; - if (m_projectId4 != other.m_projectId4) return false; - if (m_versionMajor != other.m_versionMajor) return false; - if (m_versionMinor != other.m_versionMinor) return false; - if (m_systemId != other.m_systemId) return false; - if (m_softwareId != other.m_softwareId) return false; - if (m_createDOY != other.m_createDOY) return false; - if (m_createYear != other.m_createYear) return false; - if (m_headerSize != other.m_headerSize) return false; - if (m_dataOffset != other.m_dataOffset) return false; - if (m_recordsCount != other.m_recordsCount) return false; - if (m_dataFormatId != other.m_dataFormatId) return false; - if (m_dataRecordLen != other.m_dataRecordLen) return false; - if (m_pointRecordsCount != other.m_pointRecordsCount) return false; - if (m_pointRecordsByReturn != other.m_pointRecordsByReturn) return false; - if (m_scales != other.m_scales) return false; - if (m_offsets != other.m_offsets) return false; - if (m_extents != other.m_extents) return false; - - return true; -} - - -std::string LASHeader::GetFileSignature() const -{ - return std::string(m_signature, eFileSignatureSize); -} - -void LASHeader::SetFileSignature(std::string const& v) -{ - if (0 != v.compare(0, eFileSignatureSize, FileSignature)) - throw std::invalid_argument("invalid file signature"); - - std::strncpy(m_signature, v.c_str(), eFileSignatureSize); -} - -uint16_t LASHeader::GetFileSourceId() const -{ - return m_sourceId; -} - -void LASHeader::SetFileSourceId(uint16_t v) -{ - // TODO: Should we warn or throw about type overflow occuring when - // user passes 65535 + 1 = 0 - m_sourceId = v; -} - -uint16_t LASHeader::GetReserved() const -{ - return m_reserved; -} - -void LASHeader::SetReserved(uint16_t v) -{ - // TODO: Should we warn or throw about type overflow occuring when - // user passes 65535 + 1 = 0 - m_reserved = v; -} - -liblas::guid LASHeader::GetProjectId() const -{ - return liblas::guid(m_projectId1, m_projectId2, m_projectId3, m_projectId4); -} - -void LASHeader::SetProjectId(guid const& v) -{ - v.output_data(m_projectId1, m_projectId2, m_projectId3, m_projectId4); -} - -uint8_t LASHeader::GetVersionMajor() const -{ - return m_versionMajor; -} - -void LASHeader::SetVersionMajor(uint8_t v) -{ - if (eVersionMajorMin > v || v > eVersionMajorMax) - throw std::out_of_range("version major out of range"); - - m_versionMajor = v; -} - -uint8_t LASHeader::GetVersionMinor() const -{ - return m_versionMinor; -} - -void LASHeader::SetVersionMinor(uint8_t v) -{ - if (v > eVersionMinorMax) - throw std::out_of_range("version minor out of range"); - - m_versionMinor = v; -} - -std::string LASHeader::GetSystemId(bool pad /*= false*/) const -{ - // copy array of chars and trim zeros if smaller than 32 bytes - std::string tmp(std::string(m_systemId, eSystemIdSize).c_str()); - - // pad right side with spaces - if (pad && tmp.size() < eSystemIdSize) - { - tmp.resize(eSystemIdSize, 0); - assert(tmp.size() == eSystemIdSize); - } - - assert(tmp.size() <= eSystemIdSize); - return tmp; -} - -void LASHeader::SetSystemId(std::string const& v) -{ - if (v.size() > eSystemIdSize) - throw std::invalid_argument("system id too long"); - - std::fill(m_systemId, m_systemId + eSystemIdSize, 0); - std::strncpy(m_systemId, v.c_str(), eSystemIdSize); -} - -std::string LASHeader::GetSoftwareId(bool pad /*= false*/) const -{ - std::string tmp(std::string(m_softwareId, eSoftwareIdSize).c_str()); - - // pad right side with spaces - if (pad && tmp.size() < eSoftwareIdSize) - { - tmp.resize(eSoftwareIdSize, 0); - assert(tmp.size() == eSoftwareIdSize); - } - - assert(tmp.size() <= eSoftwareIdSize); - return tmp; -} - -void LASHeader::SetSoftwareId(std::string const& v) -{ - if (v.size() > eSoftwareIdSize) - throw std::invalid_argument("generating software id too long"); - -// m_softwareId = v; - std::fill(m_softwareId, m_softwareId + eSoftwareIdSize, 0); - std::strncpy(m_softwareId, v.c_str(), eSoftwareIdSize); -} - -uint16_t LASHeader::GetCreationDOY() const -{ - return m_createDOY; -} - -void LASHeader::SetCreationDOY(uint16_t v) -{ - if (v > 366) - throw std::out_of_range("day of year out of range"); - - m_createDOY = v; -} - -uint16_t LASHeader::GetCreationYear() const -{ - return m_createYear; -} - -void LASHeader::SetCreationYear(uint16_t v) -{ - // mloskot: I've taken these values arbitrarily - if (v > 9999) - throw std::out_of_range("year out of range"); - - m_createYear = v; -} - -uint16_t LASHeader::GetHeaderSize() const -{ - return eHeaderSize; -} - -uint32_t LASHeader::GetDataOffset() const -{ - return m_dataOffset; -} - -void LASHeader::SetDataOffset(uint32_t v) -{ - uint32_t const dataSignatureSize = 2; - uint16_t const hsize = GetHeaderSize(); - - if ( (m_versionMinor == 0 && v < hsize + dataSignatureSize) || - (m_versionMinor == 1 && v < hsize) || - (m_versionMinor == 2 && v < hsize) ) - { - throw std::out_of_range("data offset out of range"); - } - - m_dataOffset = v; - -} - -uint32_t LASHeader::GetRecordsCount() const -{ - return m_recordsCount; -} - -void LASHeader::SetRecordsCount(uint32_t v) -{ - m_recordsCount = v; -} - -LASHeader::PointFormat LASHeader::GetDataFormatId() const -{ - if (ePointFormat0 == m_dataFormatId) - return ePointFormat0; - else if (ePointFormat1 == m_dataFormatId) - return ePointFormat1; - else if (ePointFormat2 == m_dataFormatId) - return ePointFormat2; - else - return ePointFormat3; -} - -void LASHeader::SetDataFormatId(LASHeader::PointFormat v) -{ - m_dataFormatId = static_cast(v); - - if (ePointFormat0 == m_dataFormatId) - m_dataRecordLen = ePointSize0; - else if (ePointFormat1 == m_dataFormatId) - m_dataRecordLen = ePointSize1; - else if (ePointFormat2 == m_dataFormatId) - m_dataRecordLen = ePointSize2; - else if (ePointFormat3 == m_dataFormatId) - m_dataRecordLen = ePointSize3; - else - m_dataRecordLen = ePointSize3; -} - -uint16_t LASHeader::GetDataRecordLength() const -{ - // NOTE: assertions below are used to check if our assumption is correct, - // for debugging purpose only. - - if (ePointFormat0 == m_dataFormatId) - { - assert(ePointSize0 == m_dataRecordLen); - return ePointSize0; - } - if (ePointFormat1 == m_dataFormatId) - { - assert(ePointSize1 == m_dataRecordLen); - return ePointSize1; - } - if (ePointFormat2 == m_dataFormatId) - { - assert(ePointSize2 == m_dataRecordLen); - return ePointSize2; - } - else - { - assert(ePointSize3 == m_dataRecordLen); - return ePointSize3; - } -} - -uint32_t LASHeader::GetPointRecordsCount() const -{ - return m_pointRecordsCount; -} - -void LASHeader::SetPointRecordsCount(uint32_t v) -{ - m_pointRecordsCount = v; -} - -std::vector const& LASHeader::GetPointRecordsByReturnCount() const -{ - return m_pointRecordsByReturn; -} - -void LASHeader::SetPointRecordsByReturnCount(std::size_t index, uint32_t v) -{ - assert(m_pointRecordsByReturn.size() == LASHeader::ePointsByReturnSize); - - uint32_t& t = m_pointRecordsByReturn.at(index); - t = v; -} - - -double LASHeader::GetScaleX() const -{ - return m_scales.x; -} - -double LASHeader::GetScaleY() const -{ - return m_scales.y; -} - -double LASHeader::GetScaleZ() const -{ - return m_scales.z; -} - -void LASHeader::SetScale(double x, double y, double z) -{ - double const minscale = 0.01; - m_scales.x = (0 == x) ? minscale : x; - m_scales.y = (0 == y) ? minscale : y; - m_scales.z = (0 == z) ? minscale : z; -} - -double LASHeader::GetOffsetX() const -{ - return m_offsets.x; -} - -double LASHeader::GetOffsetY() const -{ - return m_offsets.y; -} - -double LASHeader::GetOffsetZ() const -{ - return m_offsets.z; -} - -void LASHeader::SetOffset(double x, double y, double z) -{ - m_offsets = PointOffsets(x, y, z); -} - -double LASHeader::GetMaxX() const -{ - return m_extents.max.x; -} - -double LASHeader::GetMinX() const -{ - return m_extents.min.x; -} - -double LASHeader::GetMaxY() const -{ - return m_extents.max.y; -} - -double LASHeader::GetMinY() const -{ - return m_extents.min.y; -} - -double LASHeader::GetMaxZ() const -{ - return m_extents.max.z; -} - -double LASHeader::GetMinZ() const -{ - return m_extents.min.z; -} - -void LASHeader::SetMax(double x, double y, double z) -{ - m_extents.max = detail::Point(x, y, z); -} - -void LASHeader::SetMin(double x, double y, double z) -{ - m_extents.min = detail::Point(x, y, z); -} - -void LASHeader::AddVLR(LASVariableRecord const& v) -{ - m_vlrs.push_back(v); - m_recordsCount += 1; -} - -LASVariableRecord const& LASHeader::GetVLR(uint32_t index) const -{ - return m_vlrs[index]; -} - -void LASHeader::DeleteVLR(uint32_t index) -{ - if (index >= m_vlrs.size()) - throw std::out_of_range("index is out of range"); - - std::vector::iterator i = m_vlrs.begin() + index; - - m_vlrs.erase(i); - m_recordsCount = static_cast(m_vlrs.size()); - -} - - -void LASHeader::Init() -{ - // Initialize public header block with default - // values according to LAS 1.2 - - m_versionMajor = 1; - m_versionMinor = 2; - m_dataFormatId = ePointFormat0; - m_dataRecordLen = ePointSize0; - - - std::time_t now; - std::tm *ptm; - - std::time(&now); - ptm = std::gmtime(&now); - - m_createDOY = static_cast(ptm->tm_yday); - m_createYear = static_cast(ptm->tm_year + 1900); - - m_headerSize = eHeaderSize; - - m_sourceId = m_reserved = m_projectId2 = m_projectId3 = uint16_t(); - m_projectId1 = uint32_t(); - std::memset(m_projectId4, 0, sizeof(m_projectId4)); - - m_dataOffset = eHeaderSize; // excluding 2 bytes of Point Data Start Signature - m_recordsCount = 0; - m_pointRecordsCount = 0; - - std::memset(m_signature, 0, eFileSignatureSize); - std::strncpy(m_signature, FileSignature, eFileSignatureSize); -// m_signature = LASHeader::FileSignature; - - std::memset(m_systemId, 0, eSystemIdSize); - std::strncpy(m_systemId, SystemIdentifier, eSystemIdSize); -// m_systemId = LASHeader::SystemIdentifier; - - std::memset(m_softwareId, 0, eSoftwareIdSize); - std::strncpy(m_softwareId, SoftwareIdentifier, eSoftwareIdSize); -// m_softwareId = LASHeader::SoftwareIdentifier; - - m_pointRecordsByReturn.resize(ePointsByReturnSize); - - // Zero scale value is useless, so we need to use a small value. - SetScale(0.01, 0.01, 0.01); -} - -void LASHeader::ClearGeoKeyVLRs() -{ - std::string const uid("LASF_Projection"); - - std::vector vlrs = m_vlrs; - std::vector::const_iterator i; - std::vector::iterator j; - - for (i = m_vlrs.begin(); i != m_vlrs.end(); ++i) - { - LASVariableRecord record = *i; - // beg_size += (*i).GetTotalSize(); - - std::string user = record.GetUserId(true); - if (uid == user.c_str()) - { - uint16_t id = record.GetRecordId(); - - if (34735 == id) - { - // Geotiff SHORT key - for(j = vlrs.begin(); j != vlrs.end(); ++j) - { - if (*j == *i) - { - vlrs.erase(j); - break; - } - } - } - else if (34736 == id) - { - // Geotiff DOUBLE key - for(j = vlrs.begin(); j != vlrs.end(); ++j) - { - if (*j == *i) - { - vlrs.erase(j); - break; - } - } - } - else if (34737 == id) - { - // Geotiff ASCII key - for (j = vlrs.begin(); j != vlrs.end(); ++j) - { - if (*j == *i) - { - vlrs.erase(j); - break; - } - } - } - } // uid == user - } - - // Copy our list of surviving VLRs back to our member variable - // and update header information - m_vlrs = vlrs; - m_recordsCount = static_cast(m_vlrs.size()); - -} -void LASHeader::SetGeoreference() -{ - std::vector vlrs = m_srs.GetVLRs(); - - // Wipe the GeoTIFF-related VLR records off of the LASHeader - ClearGeoKeyVLRs(); - - std::vector::const_iterator i; - - for (i = vlrs.begin(); i != vlrs.end(); ++i) - { - AddVLR(*i); - } - -} - -LASSpatialReference LASHeader::GetSRS() const -{ - return m_srs; -} -void LASHeader::SetSRS(LASSpatialReference& srs) -{ - m_srs = srs; -} - -} // namespace liblas - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/laspoint.cpp work/liblas-src-1.2.1/src/laspoint.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/laspoint.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/laspoint.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,226 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS point class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -// std -#include - -namespace liblas { - -LASPoint::LASPoint() : - m_intensity(0), - m_flags(0), - m_class(0), - m_angleRank(0), - m_userData(0), - m_pointSourceId(0), - m_gpsTime(0) -{ - std::memset(m_coords, 0, sizeof(m_coords)); -} - -LASPoint::LASPoint(LASPoint const& other) : - m_intensity(other.m_intensity), - m_flags(other.m_flags), - m_class(other.m_class), - m_angleRank(other.m_angleRank), - m_userData(other.m_userData), - m_pointSourceId(other.m_pointSourceId), - m_gpsTime(other.m_gpsTime), - m_color(other.m_color) -{ - std::memcpy(m_coords, other.m_coords, sizeof(m_coords)); -} - -LASPoint& LASPoint::operator=(LASPoint const& rhs) -{ - if (&rhs != this) - { - m_coords[0] = rhs.m_coords[0]; - m_coords[1] = rhs.m_coords[1]; - m_coords[2] = rhs.m_coords[2]; - m_intensity = rhs.m_intensity; - m_flags = rhs.m_flags; - m_class = rhs.m_class; - m_angleRank = rhs.m_angleRank; - m_userData = rhs.m_userData; - m_pointSourceId = rhs.m_pointSourceId; - m_gpsTime = rhs.m_gpsTime; - m_color = rhs.m_color; - } - return *this; -} - -void LASPoint::SetCoordinates(LASHeader const& header, double x, double y, double z) -{ - double const cx = x * header.GetScaleX() + header.GetOffsetX(); - double const cy = y * header.GetScaleY() + header.GetOffsetY(); - double const cz = z * header.GetScaleZ() + header.GetOffsetZ(); - - SetCoordinates(cx, cy, cz); -} - -void LASPoint::SetReturnNumber(uint16_t const& num) -{ - // Store value in bits 0,1,2 - uint8_t mask = 0x7 << 0; // 0b00000111 - m_flags &= ~mask; - m_flags |= mask & (static_cast(num) << 0); - -} - -void LASPoint::SetNumberOfReturns(uint16_t const& num) -{ - // Store value in bits 3,4,5 - uint8_t mask = 0x7 << 3; // 0b00111000 - m_flags &= ~mask; - m_flags |= mask & (static_cast(num) << 3); -} - -void LASPoint::SetScanDirection(uint16_t const& dir) -{ - // Store value in bit 6 - uint8_t mask = 0x1 << 6; // 0b01000000 - m_flags &= ~mask; - m_flags |= mask & (static_cast(dir) << 6); -} - -void LASPoint::SetFlightLineEdge(uint16_t const& edge) -{ - // Store value in bit 7 - uint8_t mask = 0x1 << 7; // 0b10000000 - m_flags &= ~mask; - m_flags |= mask & (static_cast(edge) << 7);} - -void LASPoint::SetScanAngleRank(int8_t const& rank) -{ - m_angleRank = rank; -} - -void LASPoint::SetUserData(uint8_t const& data) -{ - m_userData = data; -} - -bool LASPoint::equal(LASPoint const& other) const -{ - // TODO - mloskot: Default epsilon is too small. - // Is 0.00001 good as tolerance or too wide? - //double const epsilon = std::numeric_limits::epsilon(); - double const epsilon = 0.00001; - - double const dx = m_coords[0] - other.m_coords[0]; - double const dy = m_coords[1] - other.m_coords[1]; - double const dz = m_coords[2] - other.m_coords[2]; - - // TODO: Should we compare other data members, besides the coordinates? - - if (((dx <= epsilon) && (dx >= -epsilon)) - && ((dy <= epsilon) && (dy >= -epsilon)) - && ((dz <= epsilon) && (dz >= -epsilon))) - { - return true; - } - - return false; -} - -bool LASPoint::Validate() const -{ - unsigned int flags = 0; - - if (this->GetReturnNumber() > 0x07) - flags |= eReturnNumber; - - if (this->GetNumberOfReturns() > 0x07) - flags |= eNumberOfReturns; - - if (this->GetScanDirection() > 0x01) - flags |= eScanDirection; - - if (this->GetFlightLineEdge() > 0x01) - flags |= eFlightLineEdge; - - if (eScanAngleRankMin > this->GetScanAngleRank() - || this->GetScanAngleRank() > eScanAngleRankMax) - { - flags |= eScanAngleRank; - } - - if (flags > 0) - { - throw invalid_point_data("point data members out of range", flags); - } - - return true; -} - - -bool LASPoint::IsValid() const -{ - - if( eScanAngleRankMin > this->GetScanAngleRank() - || this->GetScanAngleRank() > eScanAngleRankMax - ) - return false; - - if (this->GetFlightLineEdge() > 0x01) - return false; - - if (this->GetScanDirection() > 0x01) - return false; - - if (this->GetNumberOfReturns() > 0x07) - return false; - - if (this->GetReturnNumber() > 0x07) - return false; - - - return true; -} - - -} // namespace liblas diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasreader.cpp work/liblas-src-1.2.1/src/lasreader.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasreader.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/lasreader.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,149 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS reader class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * Copyright (c) 2008, Phil Vachon - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -// std -#include -#include -#include -#include // std::memset -#include -#include - -namespace liblas -{ - -LASReader::LASReader(std::istream& ifs) : - m_pimpl(detail::ReaderFactory::Create(ifs)) -{ - Init(); -} - -LASReader::~LASReader() -{ - // empty, but required so we can implement PIMPL using - // std::auto_ptr with incomplete type (Reader). -} - -std::size_t LASReader::GetVersion() const -{ - return m_pimpl->GetVersion(); -} - -LASHeader const& LASReader::GetHeader() const -{ - return m_header; -} - -LASPoint const& LASReader::GetPoint() const -{ - return m_point; -} - -bool LASReader::ReadNextPoint() -{ - bool ret = m_pimpl->ReadNextPoint(m_point, m_header); - return ret; -} - -bool LASReader::ReadPointAt(std::size_t n) -{ - bool ret = m_pimpl->ReadPointAt(n, m_point, m_header); - return ret; -} - -LASPoint const& LASReader::operator[](std::size_t n) -{ - if (m_header.GetPointRecordsCount() <= n) - { - throw std::out_of_range("point subscript out of range"); - } - - bool ret = m_pimpl->ReadPointAt(n, m_point, m_header); - if (!ret) - { - throw std::out_of_range("no point record at given position"); - } - - return m_point; -} - -void LASReader::Init() -{ - bool ret = m_pimpl->ReadHeader(m_header); - if (!ret) - throw std::runtime_error("public header block reading failure"); - - ret = m_pimpl->ReadVLR(m_header); - if (!ret) - throw std::runtime_error("public vlr header block reading failure"); - - m_pimpl->ReadGeoreference(m_header); - m_pimpl->Reset(m_header); - -} - -std::istream& LASReader::GetStream() const -{ - return m_pimpl->GetStream(); -} - -void LASReader::Reset() -{ - Init(); -} - -bool LASReader::IsEOF() const -{ - return GetStream().eof(); -} - -bool LASReader::SetSRS(const LASSpatialReference& srs) -{ - m_pimpl->SetSRS(srs); - return true; -} - - -} // namespace liblas - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasspatialreference.cpp work/liblas-src-1.2.1/src/lasspatialreference.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasspatialreference.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/lasspatialreference.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,529 +0,0 @@ -/****************************************************************************** - * $Id: lasspatialreference.cpp 1104 2009-03-17 04:15:19Z hobu $ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS Spatial Reference class - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * Copyright (c) 2009, Howard Butler - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -#include - -namespace liblas -{ - -LASSpatialReference::LASSpatialReference() : - m_gtiff(0), - m_tiff(0) -{ - assert(0 == m_gtiff); - assert(0 == m_tiff); -} - -LASSpatialReference& LASSpatialReference::operator=(LASSpatialReference const& rhs) -{ - if (&rhs != this) - { - SetVLRs(rhs.GetVLRs()); - GetGTIF(); - } - return *this; -} - -LASSpatialReference::~LASSpatialReference() -{ -#ifdef HAVE_LIBGEOTIFF - if (m_gtiff) - { - GTIFFree(m_gtiff); - m_gtiff = 0; - } - if (m_tiff) - { - ST_Destroy(m_tiff); - m_tiff = 0; - } -#endif -} - -LASSpatialReference::LASSpatialReference(LASSpatialReference const& other) -{ - m_tiff = 0; - m_gtiff = 0; - SetVLRs(other.GetVLRs()); - GetGTIF(); -} - -LASSpatialReference::LASSpatialReference(std::vector const& vlrs) -{ - m_tiff = 0; - m_gtiff = 0; - SetVLRs(vlrs); - GetGTIF(); -} - -/// Keep a copy of the VLRs that are related to GeoTIFF SRS information. -void LASSpatialReference::SetVLRs(std::vector const& vlrs) -{ - - std::string const uid("LASF_Projection"); - - // Wipe out any existing VLRs that might exist on the LASSpatialReference - m_vlrs.clear(); - - // We only copy VLR records from the list which are related to GeoTIFF keys. - // They must have an id of "LASF_Projection" and a record id that's related. - std::vector::const_iterator it; - for (it = vlrs.begin(); it != vlrs.end(); ++it) - { - LASVariableRecord const& vlr = *it; - if (IsGeoVLR(vlr)) - { - m_vlrs.push_back(vlr); - } - } -} - -void LASSpatialReference::AddVLR(LASVariableRecord const& vlr) -{ - if (IsGeoVLR(vlr)) - { - m_vlrs.push_back(vlr); - } -} - -bool LASSpatialReference::IsGeoVLR(LASVariableRecord const& vlr) const -{ - std::string const uid("LASF_Projection"); - - // GTIFF_GEOKEYDIRECTORY == 34735 - if (uid == vlr.GetUserId(true).c_str() && 34735 == vlr.GetRecordId()) - { - return true; - } - - // GTIFF_DOUBLEPARAMS == 34736 - if (uid == vlr.GetUserId(true).c_str() && 34736 == vlr.GetRecordId()) - { - return true; - } - - // GTIFF_ASCIIPARAMS == 34737 - if (uid == vlr.GetUserId(true).c_str() && 34737 == vlr.GetRecordId()) - { - return true; - } - - return false; -} - -std::vector LASSpatialReference::GetVLRs() const -{ - return m_vlrs; -} - -void LASSpatialReference::ResetVLRs() -{ - - m_vlrs.clear(); - -#ifdef HAVE_LIBGEOTIFF - - int ret = 0; - short* kdata = 0; - short kvalue = 0; - double* ddata = 0; - double dvalue = 0; - uint8_t* adata = 0; - uint8_t avalue = 0; - int dtype = 0; - int dcount = 0; - int ktype = 0; - int kcount = 0; - int acount = 0; - int atype =0; - - if (!m_tiff) - throw std::invalid_argument("m_tiff was null, cannot reset VLRs without m_tiff"); - - if (!m_gtiff) - throw std::invalid_argument("m_gtiff was null, cannot reset VLRs without m_gtiff"); - - //GTIFF_GEOKEYDIRECTORY == 34735 - ret = ST_GetKey(m_tiff, 34735, &kcount, &ktype, (void**)&kdata); - if (ret) - { - LASVariableRecord record; - int i = 0; - record.SetRecordId(34735); - record.SetUserId("LASF_Projection"); - std::vector data; - - // Shorts are 2 bytes in length - uint16_t length = 2*kcount; - - record.SetRecordLength(length); - - // Copy the data into the data vector - for (i = 0; i < kcount; i++) - { - kvalue = kdata[i]; - - uint8_t* v = reinterpret_cast(&kvalue); - - data.push_back(v[0]); - data.push_back(v[1]); - } - - record.SetData(data); - m_vlrs.push_back(record); - } - - // GTIFF_DOUBLEPARAMS == 34736 - ret = ST_GetKey(m_tiff, 34736, &dcount, &dtype, (void**)&ddata); - if (ret) - { - LASVariableRecord record; - int i = 0; - record.SetRecordId(34736); - record.SetUserId("LASF_Projection"); - std::vector data; - - // Doubles are 8 bytes in length - uint16_t length = 8*dcount; - record.SetRecordLength(length); - - // Copy the data into the data vector - for (i=0; i(&dvalue); - - data.push_back(v[0]); - data.push_back(v[1]); - data.push_back(v[2]); - data.push_back(v[3]); - data.push_back(v[4]); - data.push_back(v[5]); - data.push_back(v[6]); - data.push_back(v[7]); - } - record.SetData(data); - m_vlrs.push_back(record); - } - - // GTIFF_ASCIIPARAMS == 34737 - ret = ST_GetKey(m_tiff, 34737, &acount, &atype, (void**)&adata); - if (ret) - { - LASVariableRecord record; - int i = 0; - record.SetRecordId(34737); - record.SetUserId("LASF_Projection"); - std::vector data; - - // whoa. If the returned count was 0, it is because there - // was a bug in libgeotiff that existed before r1531 where it - // didn't calculate the string length for an ASCII geotiff tag. - // We need to throw an exception in this case because we're - // screwed, and if we don't we'll end up writing bad GeoTIFF keys. - if (!acount) - { - throw std::runtime_error("GeoTIFF ASCII key with no returned size. " - "Upgrade your libgeotiff to a version greater " - "than r1531 (libgeotiff 1.2.6)"); - } - - uint16_t length = acount; - record.SetRecordLength(length); - - // Copy the data into the data vector - for (i=0; i(&avalue); - - data.push_back(v[0]); - - } - record.SetData(data); - m_vlrs.push_back(record); - } -#endif // ndef HAVE_LIBGEOTIFF -} - -void LASSpatialReference::SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff) -{ - m_gtiff = (GTIF*)gtiff; - m_tiff = (ST_TIFF*)tiff; - ResetVLRs(); - m_gtiff = NULL; - m_tiff = NULL; -} -const GTIF* LASSpatialReference::GetGTIF() -{ -#ifndef HAVE_LIBGEOTIFF - return 0; -#else - - // If we already have m_gtiff and m_tiff, that is because we have - // already called GetGTIF once before. VLRs ultimately drive how the - // LASSpatialReference is defined, not the GeoTIFF keys. - if (m_tiff) - { - ST_Destroy(m_tiff); - m_tiff = 0; - } - - if (m_gtiff) - { - GTIFFree(m_gtiff); - m_gtiff = 0; - } - - m_tiff = ST_Create(); - std::string const uid("LASF_Projection"); - - // Nothing is going to happen here if we don't have any VLRs describing - // SRS information on the LASSpatialReference. - for (uint16_t i = 0; i < m_vlrs.size(); ++i) - { - LASVariableRecord record = m_vlrs[i]; - std::vector data = record.GetData(); - if (uid == record.GetUserId(true).c_str() && 34735 == record.GetRecordId()) - { - int count = data.size()/sizeof(int16_t); - ST_SetKey(m_tiff, record.GetRecordId(), count, STT_SHORT, &(data[0])); - } - - if (uid == record.GetUserId(true).c_str() && 34736 == record.GetRecordId()) - { - int count = data.size() / sizeof(double); - ST_SetKey(m_tiff, record.GetRecordId(), count, STT_DOUBLE, &(data[0])); - } - - if (uid == record.GetUserId(true).c_str() && 34737 == record.GetRecordId()) - { - int count = data.size()/sizeof(uint8_t); - ST_SetKey(m_tiff, record.GetRecordId(), count, STT_ASCII, &(data[0])); - } - } - - m_gtiff = GTIFNewSimpleTags(m_tiff); - if (!m_gtiff) - throw std::runtime_error("The geotiff keys could not read from VLR records"); - - return m_gtiff; -#endif -} - -/// Fetch the SRS as WKT -std::string LASSpatialReference::GetWKT() const -{ -#ifndef HAVE_GDAL - return std::string(); -#else - GTIFDefn sGTIFDefn; - char* pszWKT = 0; - if (!m_gtiff) - { - return std::string(); - } - - if (GTIFGetDefn(m_gtiff, &sGTIFDefn)) - { - pszWKT = GTIFGetOGISDefn( m_gtiff, &sGTIFDefn ); - if (pszWKT) - { - std::string tmp(pszWKT); - std::free(pszWKT); - return tmp; - } - } - return std::string(); -#endif -} - -void LASSpatialReference::SetWKT(std::string const& v) -{ - if (!m_gtiff) - { - GetGTIF(); - } - -#ifdef HAVE_GDAL - - int ret = 0; - ret = GTIFSetFromOGISDefn( m_gtiff, v.c_str() ); - if (!ret) - { - throw std::invalid_argument("could not set m_gtiff from WKT"); - } - - ret = GTIFWriteKeys(m_gtiff); - if (!ret) - { - throw std::runtime_error("The geotiff keys could not be written"); - } - - ResetVLRs(); -#else - UNREFERENCED_PARAMETER(v); - throw std::runtime_error("GDAL is not available, LASSpatialReference could not be set from WKT"); -#endif -} - -std::string LASSpatialReference::GetProj4() const -{ -#ifdef HAVE_GDAL - - std::string wkt = GetWKT(); - const char* poWKT = wkt.c_str(); - - OGRSpatialReference* poSRS = new OGRSpatialReference(); - if (OGRERR_NONE != poSRS->importFromWkt((char **) &poWKT)) - { - delete poSRS; - return std::string(); - } - - char* proj4 = 0; - poSRS->exportToProj4(&proj4); - std::string tmp(proj4); - std::free(proj4); - - delete poSRS; - - return tmp; -#endif - -// if we have libgeotiff but not GDAL, we'll use the -// simple method in libgeotiff -#ifdef HAVE_LIBGEOTIFF -#ifndef HAVE_GDAL - GTIFDefn defn; - - if (m_gtiff && GTIFGetDefn(m_gtiff, &defn)) - { - char* proj4def = GTIFGetProj4Defn(&defn); - std::string tmp(proj4def); - std::free(proj4def); - - return tmp; - } -#endif -#endif - - // If we have neither GDAL nor proj.4, we can't do squat - return std::string(); -} - -void LASSpatialReference::SetProj4(std::string const& v) -{ - if (!m_gtiff) - { - GetGTIF(); - ResetVLRs(); - } - -#ifdef HAVE_GDAL - char* poWKT = 0; - const char* poProj4 = v.c_str(); - OGRSpatialReference* poSRS = new OGRSpatialReference(); - if (OGRERR_NONE != poSRS->importFromProj4((char *) poProj4)) - { - delete poSRS; - throw std::invalid_argument("could not import proj4 into OSRSpatialReference SetProj4"); - } - - poSRS->exportToWkt(&poWKT); - delete poSRS; - - std::string tmp(poWKT); - std::free(poWKT); - - int ret = 0; - ret = GTIFSetFromOGISDefn( m_gtiff, tmp.c_str() ); - if (!ret) - { - throw std::invalid_argument("could not set m_gtiff from Proj4"); - } - - ret = GTIFWriteKeys(m_gtiff); - if (!ret) - { - throw std::runtime_error("The geotiff keys could not be written"); - } - - GTIFDefn defn; - - if (m_gtiff && GTIFGetDefn(m_gtiff, &defn)) - { - char* proj4def = GTIFGetProj4Defn(&defn); - std::string tmp(proj4def); - std::free(proj4def); - } -#else - UNREFERENCED_PARAMETER(v); -#endif - -// if we have libgeotiff but not GDAL, we'll use the -// simple method in libgeotiff -#ifdef HAVE_LIBGEOTIFF -#ifndef HAVE_GDAL - - int ret = 0; - ret = GTIFSetFromProj4( m_gtiff, v.c_str()); - if (!ret) - { - throw std::invalid_argument("PROJ.4 string is invalid or unsupported"); - } - - ret = GTIFWriteKeys(m_gtiff); - if (!ret) - { - throw std::runtime_error("The geotiff keys could not be written"); - } -#endif -#endif - ResetVLRs(); -} - -} // namespace liblas - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasvariablerecord.cpp work/liblas-src-1.2.1/src/lasvariablerecord.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/lasvariablerecord.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/lasvariablerecord.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,221 +0,0 @@ -/****************************************************************************** - * $Id: lasrecordheader.cpp 861 2008-08-22 16:02:32Z mloskot $ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS record header class - * Author: Phil Vachon, philippe@cowpig.ca - * - ****************************************************************************** - * Copyright (c) 2008, Phil Vachon - * Copyright (c) 2008, Mateusz Loskot, mateusz@loskot.net - * Copyright (c) 2008, Howard Butler, hobu.inc@gmail.com - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -// std -#include -#include -#include -#include -#include // std::memset, std::memcpy, std::strncpy -#include - -namespace liblas { - -LASVariableRecord::LASVariableRecord() : - m_reserved(0), m_recordId(0), m_recordLength(0) -{ - std::memset(m_userId, 0, eUIDSize); - std::memset(m_desc, 0, eDescriptionSize); - - m_data.resize(40); - -} - -LASVariableRecord::LASVariableRecord(LASVariableRecord const& other) : - m_reserved(other.m_reserved), - m_recordId(other.m_recordId), - m_recordLength(other.m_recordLength) -{ - void* p = 0; - - p = std::memcpy(m_userId, other.m_userId, eUIDSize); - assert(p == m_userId); - - p = std::memcpy(m_desc, other.m_desc, eDescriptionSize); - assert(p == m_desc); - - std::vector(other.m_data).swap(m_data); -} - -LASVariableRecord::~LASVariableRecord() -{ - -} - -LASVariableRecord& LASVariableRecord::operator=(LASVariableRecord const& rhs) -{ - void* p = 0; - if (this != &rhs) - { - m_reserved = rhs.m_reserved; - m_recordId = rhs.m_recordId; - m_recordLength = rhs.m_recordLength; - - p = std::memcpy(m_userId, rhs.m_userId, eUIDSize); - assert(p == m_userId); - - p = std::memcpy(m_desc, rhs.m_desc, eDescriptionSize); - assert(p == m_desc); - - std::vector(rhs.m_data).swap(m_data); - } - return (*this); -} - -uint16_t LASVariableRecord::GetReserved() const -{ - return m_reserved; -} - -void LASVariableRecord::SetReserved(uint16_t id) -{ - m_reserved = id; -} - -std::string LASVariableRecord::GetUserId(bool pad /*= false*/) const -{ - // copy array of chars and trim zeros if smaller than 32 bytes - std::string tmp(std::string(m_userId, eUIDSize).c_str()); - - // pad right side with spaces - if (pad && tmp.size() < eUIDSize) - { - tmp.resize(eUIDSize, 0); - assert(tmp.size() == eUIDSize); - } - - assert(tmp.size() <= eUIDSize); - return tmp; -} - -void LASVariableRecord::SetUserId(std::string const& v) -{ - if (v.size() > eUIDSize) - throw std::invalid_argument("user id too long"); - - - std::fill(m_userId, m_userId + eUIDSize, 0); - std::strncpy(m_userId, v.c_str(), eUIDSize); -} - - -uint16_t LASVariableRecord::GetRecordId() const -{ - return m_recordId; -} - -void LASVariableRecord::SetRecordId(uint16_t v) { - m_recordId = v; -} - -uint16_t LASVariableRecord::GetRecordLength() const -{ - return m_recordLength; -} - -void LASVariableRecord::SetRecordLength(uint16_t v) { - m_recordLength = v; -} - -std::string LASVariableRecord::GetDescription(bool pad /*= false*/) const -{ - // copy array of chars and trim zeros if smaller than 32 bytes - std::string tmp(std::string(m_desc, eDescriptionSize).c_str()); - - // pad right side with spaces - if (pad && tmp.size() < eDescriptionSize) - { - tmp.resize(eDescriptionSize, 0); - assert(tmp.size() == eDescriptionSize); - } - - assert(tmp.size() <= eDescriptionSize); - return tmp; -} - -void LASVariableRecord::SetDescription(std::string const& v) -{ - if (v.size() > eDescriptionSize) - throw std::invalid_argument("description is too long"); - - - std::fill(m_desc, m_desc + eDescriptionSize, 0); - std::strncpy(m_desc, v.c_str(), eDescriptionSize); -} - - -std::vector const& LASVariableRecord::GetData() const -{ - return m_data; -} - -void LASVariableRecord::SetData(const std::vector& v) -{ - m_data = v; -} - -bool LASVariableRecord::equal(LASVariableRecord const& other) const -{ - return (m_recordId == other.m_recordId - && std::string(m_userId) == std::string(other.m_userId) - && std::string(m_desc) == std::string(other.m_desc) - && m_reserved == other.m_reserved - && m_recordLength == other.m_recordLength); -} - -uint32_t LASVariableRecord::GetTotalSize() const -{ - // Signature 2 bytes - // UserID 16 bytes - // RecordID 2 bytes - // RecordLength after Header 2 bytes - // Description 32 bytes - // Data length -- size of the data's vector * the size of uint8_t - std::size_t const sum = 2 + 16 + 2 + 2 + 32 + GetData().size() * sizeof(uint8_t); - return static_cast(sum); -} - -} // namespace liblas - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/laswriter.cpp work/liblas-src-1.2.1/src/laswriter.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/laswriter.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/laswriter.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,108 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: LAS writer class - * Author: Mateusz Loskot, mateusz@loskot.net - * - ****************************************************************************** - * Copyright (c) 2008, Mateusz Loskot - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following - * conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the Martin Isenburg or Iowa Department - * of Natural Resources nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - ****************************************************************************/ - -#include -#include -// std -#include -#include -#include -#include // std::memset -#include - -namespace liblas -{ - -LASWriter::LASWriter(std::ostream& ofs, LASHeader const& header) : - m_pimpl(detail::WriterFactory::Create(ofs, header)), m_header(header) -{ - m_pimpl->WriteHeader(m_header); -} - -LASWriter::~LASWriter() -{ - assert(0 != m_pimpl.get()); - - m_pimpl->UpdateHeader(m_header); -} - -std::size_t LASWriter::GetVersion() const -{ - return m_pimpl->GetVersion(); -} - -LASHeader const& LASWriter::GetHeader() const -{ - return m_header; -} - -bool LASWriter::WritePoint(LASPoint const& point) -{ - if (!point.IsValid()) - { - return false; - } - - m_pimpl->WritePointRecord(point, m_header); - - return true; -} - -std::ostream& LASWriter::GetStream() const -{ - return m_pimpl->GetStream(); -} - -void LASWriter::WriteHeader(LASHeader& header) -{ - m_pimpl->WriteHeader(header); - m_header = header; -} - -bool LASWriter::SetSRS(const LASSpatialReference& srs) -{ - m_pimpl->SetSRS(srs); - return true; -} - - -} // namespace liblas - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/Makefile.am work/liblas-src-1.2.1/src/Makefile.am --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/Makefile.am 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/Makefile.am 1970-01-01 08:00:00.000000000 +0800 @@ -1,41 +0,0 @@ - -SUBDIRS = . - -if GDAL_IS_CONFIG -GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -endif - -if GEOTIFF_IS_CONFIG -GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -endif - -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail - -lib_LTLIBRARIES = liblas.la - -liblas_la_SOURCES = \ - laserror.cpp \ - laspoint.cpp \ - lasheader.cpp \ - lasvariablerecord.cpp \ - lasreader.cpp \ - laswriter.cpp \ - lasfile.cpp \ - las_c_api.cpp \ - lascolor.cpp \ - lasspatialreference.cpp \ - detail/reader.cpp \ - detail/reader10.cpp \ - detail/reader11.cpp \ - detail/reader12.cpp \ - detail/writer.cpp \ - detail/writer10.cpp \ - detail/writer11.cpp \ - detail/writer12.cpp \ - detail/file.cpp - -if GDAL_IS_CONFIG -liblas_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp -endif - -liblas_la_LDFLAGS = -version-info 1:0:0 diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/Makefile.in work/liblas-src-1.2.1/src/Makefile.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/Makefile.in 2009-10-03 01:02:36.000000000 +0800 +++ work/liblas-src-1.2.1/src/Makefile.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,698 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@GDAL_IS_CONFIG_TRUE@am__append_1 = gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -liblas_la_LIBADD = -am__liblas_la_SOURCES_DIST = laserror.cpp laspoint.cpp lasheader.cpp \ - lasvariablerecord.cpp lasreader.cpp laswriter.cpp lasfile.cpp \ - las_c_api.cpp lascolor.cpp lasspatialreference.cpp \ - detail/reader.cpp detail/reader10.cpp detail/reader11.cpp \ - detail/reader12.cpp detail/writer.cpp detail/writer10.cpp \ - detail/writer11.cpp detail/writer12.cpp detail/file.cpp \ - gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp -@GDAL_IS_CONFIG_TRUE@am__objects_1 = gt_wkt_srs.lo gt_citation.lo \ -@GDAL_IS_CONFIG_TRUE@ tifvsi.lo -am_liblas_la_OBJECTS = laserror.lo laspoint.lo lasheader.lo \ - lasvariablerecord.lo lasreader.lo laswriter.lo lasfile.lo \ - las_c_api.lo lascolor.lo lasspatialreference.lo reader.lo \ - reader10.lo reader11.lo reader12.lo writer.lo writer10.lo \ - writer11.lo writer12.lo file.lo $(am__objects_1) -liblas_la_OBJECTS = $(am_liblas_la_OBJECTS) -liblas_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(liblas_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(liblas_la_SOURCES) -DIST_SOURCES = $(am__liblas_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GDAL_INC = @GDAL_INC@ -GDAL_PREFIX = @GDAL_PREFIX@ -GEOTIFF_INC = @GEOTIFF_INC@ -GEOTIFF_PREFIX = @GEOTIFF_PREFIX@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE_VERSION = @RELEASE_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = . -@GDAL_IS_CONFIG_TRUE@GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -@GEOTIFF_IS_CONFIG_TRUE@GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail -lib_LTLIBRARIES = liblas.la -liblas_la_SOURCES = laserror.cpp laspoint.cpp lasheader.cpp \ - lasvariablerecord.cpp lasreader.cpp laswriter.cpp lasfile.cpp \ - las_c_api.cpp lascolor.cpp lasspatialreference.cpp \ - detail/reader.cpp detail/reader10.cpp detail/reader11.cpp \ - detail/reader12.cpp detail/writer.cpp detail/writer10.cpp \ - detail/writer11.cpp detail/writer12.cpp detail/file.cpp \ - $(am__append_1) -liblas_la_LDFLAGS = -version-info 1:0:0 -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liblas.la: $(liblas_la_OBJECTS) $(liblas_la_DEPENDENCIES) - $(liblas_la_LINK) -rpath $(libdir) $(liblas_la_OBJECTS) $(liblas_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gt_citation.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gt_wkt_srs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/las_c_api.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lascolor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laserror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasfile.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasheader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laspoint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasreader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasspatialreference.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasvariablerecord.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laswriter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reader10.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reader11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reader12.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tifvsi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer10.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer12.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -reader.lo: detail/reader.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reader.lo -MD -MP -MF $(DEPDIR)/reader.Tpo -c -o reader.lo `test -f 'detail/reader.cpp' || echo '$(srcdir)/'`detail/reader.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/reader.Tpo $(DEPDIR)/reader.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/reader.cpp' object='reader.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reader.lo `test -f 'detail/reader.cpp' || echo '$(srcdir)/'`detail/reader.cpp - -reader10.lo: detail/reader10.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reader10.lo -MD -MP -MF $(DEPDIR)/reader10.Tpo -c -o reader10.lo `test -f 'detail/reader10.cpp' || echo '$(srcdir)/'`detail/reader10.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/reader10.Tpo $(DEPDIR)/reader10.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/reader10.cpp' object='reader10.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reader10.lo `test -f 'detail/reader10.cpp' || echo '$(srcdir)/'`detail/reader10.cpp - -reader11.lo: detail/reader11.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reader11.lo -MD -MP -MF $(DEPDIR)/reader11.Tpo -c -o reader11.lo `test -f 'detail/reader11.cpp' || echo '$(srcdir)/'`detail/reader11.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/reader11.Tpo $(DEPDIR)/reader11.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/reader11.cpp' object='reader11.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reader11.lo `test -f 'detail/reader11.cpp' || echo '$(srcdir)/'`detail/reader11.cpp - -reader12.lo: detail/reader12.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reader12.lo -MD -MP -MF $(DEPDIR)/reader12.Tpo -c -o reader12.lo `test -f 'detail/reader12.cpp' || echo '$(srcdir)/'`detail/reader12.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/reader12.Tpo $(DEPDIR)/reader12.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/reader12.cpp' object='reader12.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reader12.lo `test -f 'detail/reader12.cpp' || echo '$(srcdir)/'`detail/reader12.cpp - -writer.lo: detail/writer.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT writer.lo -MD -MP -MF $(DEPDIR)/writer.Tpo -c -o writer.lo `test -f 'detail/writer.cpp' || echo '$(srcdir)/'`detail/writer.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/writer.Tpo $(DEPDIR)/writer.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/writer.cpp' object='writer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o writer.lo `test -f 'detail/writer.cpp' || echo '$(srcdir)/'`detail/writer.cpp - -writer10.lo: detail/writer10.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT writer10.lo -MD -MP -MF $(DEPDIR)/writer10.Tpo -c -o writer10.lo `test -f 'detail/writer10.cpp' || echo '$(srcdir)/'`detail/writer10.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/writer10.Tpo $(DEPDIR)/writer10.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/writer10.cpp' object='writer10.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o writer10.lo `test -f 'detail/writer10.cpp' || echo '$(srcdir)/'`detail/writer10.cpp - -writer11.lo: detail/writer11.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT writer11.lo -MD -MP -MF $(DEPDIR)/writer11.Tpo -c -o writer11.lo `test -f 'detail/writer11.cpp' || echo '$(srcdir)/'`detail/writer11.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/writer11.Tpo $(DEPDIR)/writer11.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/writer11.cpp' object='writer11.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o writer11.lo `test -f 'detail/writer11.cpp' || echo '$(srcdir)/'`detail/writer11.cpp - -writer12.lo: detail/writer12.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT writer12.lo -MD -MP -MF $(DEPDIR)/writer12.Tpo -c -o writer12.lo `test -f 'detail/writer12.cpp' || echo '$(srcdir)/'`detail/writer12.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/writer12.Tpo $(DEPDIR)/writer12.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/writer12.cpp' object='writer12.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o writer12.lo `test -f 'detail/writer12.cpp' || echo '$(srcdir)/'`detail/writer12.cpp - -file.lo: detail/file.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file.lo -MD -MP -MF $(DEPDIR)/file.Tpo -c -o file.lo `test -f 'detail/file.cpp' || echo '$(srcdir)/'`detail/file.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/file.Tpo $(DEPDIR)/file.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='detail/file.cpp' object='file.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o file.lo `test -f 'detail/file.cpp' || echo '$(srcdir)/'`detail/file.cpp - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(LTLIBRARIES) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-libLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/makefile.vc work/liblas-src-1.2.1/src/makefile.vc --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/makefile.vc 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/src/makefile.vc 1970-01-01 08:00:00.000000000 +0800 @@ -1,65 +0,0 @@ -# $Id$ -# -LAS_ROOT = .. - -!INCLUDE $(LAS_ROOT)\nmake.opt - -LAS_OBJS = \ - lascolor.obj \ - laswriter.obj \ - lasreader.obj \ - laserror.obj \ - las_c_api.obj \ - laspoint.obj \ - lasheader.obj \ - lasfile.obj \ - lasspatialreference.obj \ - lasvariablerecord.obj \ - detail\reader.obj \ - detail\reader10.obj \ - detail\reader11.obj \ - detail\reader12.obj \ - detail\writer.obj \ - detail\writer10.obj \ - detail\writer11.obj \ - detail\writer12.obj \ - detail\file.obj - -RES = Version.res - -default: $(LAS_DLL) $(RES) - -all: default - -$(LAS_LIB): $(LAS_OBJS) - if exist $(LAS_LIB) del $(LAS_LIB) - $(LINK) /lib /nologo /out:$(LAS_LIB) $(LAS_OBJS) $(GEOTIFF_LIB) $(GDAL_LIB) - -$(LAS_DLL): $(LAS_LIB) $(RES) - $(LINK) /dll \ - $(LAS_OBJS) $(LAS_LIB) Version.res \ - /out:$(LAS_DLL) /implib:$(LAS_LIB_DLL) - if exist $(LAS_DLL).manifest mt -manifest $(LAS_DLL).manifest -outputresource:$(LAS_DLL);2 - -Version.res: - rc -fo Version.res -r -I..\include\liblas\capi -I..\include -D_MSC_VER Version.rc - -clean: - -del *.bak - -del *.dll - -del *.exp - -del *.lib - -del *.obj - -del *.manifest - -del *.res - for %d in ( $(LAS_OBJS) ) do \ - del %d - -del $(PYDLL_DIR)\$(LAS_DLL) - -del $(PYDLL_DIR)\DLLs\$(LAS_DLL) - -install: $(LAS_DLL) - echo $(BINDIR) - xcopy /y /r /d /f $(LAS_DLL) $(BINDIR) - xcopy /y /r /d /f $(LAS_DLL) $(OSGEO4W_DIR)\lib\bin - xcopy /y /r /d /f $(LAS_DLL) $(PYDLL_DIR) - xcopy /y /r /d /f $(LAS_DLL) $(PYDLL_DIR)\DLLs diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/tifvsi.cpp work/liblas-src-1.2.1/src/tifvsi.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/tifvsi.cpp 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/tifvsi.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,151 +0,0 @@ -/****************************************************************************** - * $Id: tifvsi.cpp 10645 2007-01-18 02:22:39Z warmerdam $ - * - * Project: GeoTIFF Driver - * Purpose: Implement system hook functions for libtiff on top of CPL/VSI, - * including > 2GB support. Based on tif_unix.c from libtiff - * distribution. - * Author: Frank Warmerdam, warmerdam@pobox.com - * - ****************************************************************************** - * Copyright (c) 2005, Frank Warmerdam, warmerdam@pobox.com - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - ****************************************************************************/ - -/* - * TIFF Library UNIX-specific Routines. - */ -#include "tiffio.h" -#include "cpl_vsi.h" - -// We avoid including xtiffio.h since it drags in the libgeotiff version -// of the VSI functions. - -CPL_C_START -extern TIFF CPL_DLL * XTIFFClientOpen(const char* name, const char* mode, - thandle_t thehandle, - TIFFReadWriteProc, TIFFReadWriteProc, - TIFFSeekProc, TIFFCloseProc, - TIFFSizeProc, - TIFFMapFileProc, TIFFUnmapFileProc); -CPL_C_END - -static tsize_t -_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size) -{ - return VSIFReadL( buf, 1, size, (FILE *) fd ); -} - -static tsize_t -_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size) -{ - return VSIFWriteL( buf, 1, size, (FILE *) fd ); -} - -static toff_t -_tiffSeekProc(thandle_t fd, toff_t off, int whence) -{ - if( VSIFSeekL( (FILE *) fd, off, whence ) == 0 ) - return (toff_t) VSIFTellL( (FILE *) fd ); - else - return (toff_t) -1; -} - -static int -_tiffCloseProc(thandle_t fd) -{ - return VSIFCloseL( (FILE *) fd ); -} - -static toff_t -_tiffSizeProc(thandle_t fd) -{ - vsi_l_offset old_off; - toff_t file_size; - - old_off = VSIFTellL( (FILE *) fd ); - VSIFSeekL( (FILE *) fd, 0, SEEK_END ); - - file_size = (toff_t) VSIFTellL( (FILE *) fd ); - VSIFSeekL( (FILE *) fd, old_off, SEEK_SET ); - - return file_size; -} - -static int -_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize) -{ - (void) fd; (void) pbase; (void) psize; - return (0); -} - -static void -_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size) -{ - (void) fd; (void) base; (void) size; -} - -/* - * Open a TIFF file for read/writing. - */ -TIFF* VSI_TIFFOpen(const char* name, const char* mode) -{ - static const char module[] = "TIFFOpen"; - int i, a_out; - char access[32]; - FILE *fp; - TIFF *tif; - - a_out = 0; - access[0] = '\0'; - for( i = 0; mode[i] != '\0'; i++ ) - { - if( mode[i] == 'r' - || mode[i] == 'w' - || mode[i] == '+' - || mode[i] == 'a' ) - { - access[a_out++] = mode[i]; - access[a_out] = '\0'; - } - } - - strcat( access, "b" ); - - fp = VSIFOpenL( name, access ); - if (fp == NULL) { - if( errno >= 0 ) - TIFFError(module,"%s: %s", name, VSIStrerror( errno ) ); - else - TIFFError(module, "%s: Cannot open", name); - return ((TIFF *)0); - } - - tif = XTIFFClientOpen(name, mode, - (thandle_t) fp, - _tiffReadProc, _tiffWriteProc, - _tiffSeekProc, _tiffCloseProc, _tiffSizeProc, - _tiffMapProc, _tiffUnmapProc); - - if( tif == NULL ) - VSIFCloseL( fp ); - - return tif; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/Version.rc work/liblas-src-1.2.1/src/Version.rc --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/src/Version.rc 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/src/Version.rc 1970-01-01 08:00:00.000000000 +0800 @@ -1,100 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Project: libLAS - http://liblas.org - A BSD library for LAS format data. - * Purpose: libLAS DLL registration information - * Author: Howard Butler, hobu.inc@gmail.com - * - ****************************************************************************** - * This script is derived from the GDAL Version.rc script in the GDAL - * source code. The copyright on the file was as follows: - - * Project: GDAL Core - * Purpose: GDAL DLL registration information. - * Author: Martin Daly (Cadcorp) - * - * Copyright assignment provided by Martin Daly by email, "Be my guest. Fame! - * At last! Best not let it go to my head, eh?" - * - * Copyright (c) 2005, Frank Warmerdam - * - * All rights reserved. - * - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - ****************************************************************************/ - - -#define APSTUDIO_HIDDEN_SYMBOLS -#include -#undef APSTUDIO_HIDDEN_SYMBOLS -#include - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -#include "las_version.h" - -#ifndef _MAC - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION LIBLAS_VERSION_MAJOR,LIBLAS_VERSION_MINOR,LIBLAS_VERSION_REV,LIBLAS_VERSION_BUILD - PRODUCTVERSION LIBLAS_VERSION_MAJOR,LIBLAS_VERSION_MINOR,LIBLAS_VERSION_REV,LIBLAS_VERSION_BUILD - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "Hobu, Inc.\0" - VALUE "FileDescription", "libLAS - LAS 1.0/1.1 ASPRS LiDAR data translation toolset\0" - VALUE "FileVersion", LIBLAS_RELEASE_NAME "\0" - VALUE "InternalName", "libLAS\0" - VALUE "LegalCopyright", "See LICENSE.TXT" - VALUE "ProductName", "libLAS\0" - VALUE "ProductVersion", LIBLAS_RELEASE_NAME "\0" - VALUE "WebPage", "http://liblas.org/\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - -#endif // !_MAC - -#endif // Neutral resources diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/Makefile.am work/liblas-src-1.2.1/test/Makefile.am --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/Makefile.am 2009-10-03 01:01:49.000000000 +0800 +++ work/liblas-src-1.2.1/test/Makefile.am 1970-01-01 08:00:00.000000000 +0800 @@ -1 +0,0 @@ -SUBDIRS = unit diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/Makefile.in work/liblas-src-1.2.1/test/Makefile.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/Makefile.in 2009-10-03 01:02:37.000000000 +0800 +++ work/liblas-src-1.2.1/test/Makefile.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,491 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GDAL_INC = @GDAL_INC@ -GDAL_PREFIX = @GDAL_PREFIX@ -GEOTIFF_INC = @GEOTIFF_INC@ -GEOTIFF_PREFIX = @GEOTIFF_PREFIX@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE_VERSION = @RELEASE_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = unit -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu test/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/common.cpp work/liblas-src-1.2.1/test/unit/common.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/common.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/common.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,202 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include "common.hpp" - -namespace tut -{ - -void test_default_header(liblas::LASHeader const& h) -{ - using liblas::LASHeader; - - ensure_equals("wrong default file signature", - h.GetFileSignature(), LASHeader::FileSignature); - - ensure_equals("wrong default file source id", - h.GetFileSourceId(), 0); - ensure_equals("wrong default reserved value", - h.GetReserved(), 0); - - liblas::guid g; - ensure_equals("wrong default project guid", - h.GetProjectId(), g); - - ensure_equals("wrong default major version", - h.GetVersionMajor(), 1); - ensure_equals("wrong default minor version", - h.GetVersionMinor(), 2); - - ensure_equals("wrong default system id", - h.GetSystemId(), LASHeader::SystemIdentifier); - ensure_equals("wrong default software id", - h.GetSoftwareId(), LASHeader::SoftwareIdentifier); - - // TODO: Fix me to use todays day # and year - // ensure_equals("wrong default creation day-of-year", - // h.GetCreationDOY(), 0); - // ensure_equals("wrong default creation year", - // h.GetCreationYear(), 0); - ensure_equals("wrong default header size", - h.GetHeaderSize(), liblas::uint16_t(227)); - - liblas::uint32_t offset = 229; - if (h.GetVersionMinor() == 1 || h.GetVersionMinor() == 2) - { - offset = 227; - } - ensure_equals("wrong default data offset", - h.GetDataOffset(), offset); - - ensure_equals("wrong default records count", - h.GetRecordsCount(), liblas::uint32_t(0)); - ensure_equals("wrong default data format id", - h.GetDataFormatId(), LASHeader::ePointFormat0); - ensure_equals("wrong default data record length", - h.GetDataRecordLength(), LASHeader::ePointSize0); - ensure_equals("wrong default point records count", - h.GetPointRecordsCount(), liblas::uint32_t(0)); - - ensure_equals("wrong default X scale", h.GetScaleX(), double(0.01)); - ensure_equals("wrong default Y scale", h.GetScaleY(), double(0.01)); - ensure_equals("wrong default Z scale", h.GetScaleZ(), double(0.01)); - - ensure_equals("wrong default X offset", h.GetOffsetX(), double(0)); - ensure_equals("wrong default Y offset", h.GetOffsetY(), double(0)); - ensure_equals("wrong default Z offset", h.GetOffsetZ(), double(0)); - - ensure_equals("wrong default min X", h.GetMinX(), double(0)); - ensure_equals("wrong default max X", h.GetMaxX(), double(0)); - ensure_equals("wrong default min Y", h.GetMinY(), double(0)); - ensure_equals("wrong default max Y", h.GetMaxY(), double(0)); - ensure_equals("wrong default min Z", h.GetMinZ(), double(0)); - ensure_equals("wrong default max Z", h.GetMaxZ(), double(0)); -} - -void test_default_point(liblas::LASPoint const& p) -{ - ensure_equals("wrong default X coordinate", - p.GetX(), double(0)); - ensure_equals("wrong default Y coordinate", - p.GetY(), double(0)); - ensure_equals("wrong default Z coordinate", - p.GetZ(), double(0)); - ensure_equals("wrong defualt intensity", - p.GetIntensity(), 0); - ensure_equals("wrong defualt return number", - p.GetReturnNumber(), 0); - ensure_equals("wrong defualt number of returns", - p.GetNumberOfReturns(), 0); - ensure_equals("wrong defualt scan direction", - p.GetScanDirection(), 0); - ensure_equals("wrong defualt edge of flight line", - p.GetFlightLineEdge(), 0); - ensure_equals("wrong defualt classification", - p.GetClassification(), 0); - ensure_equals("wrong defualt scan angle rank", - p.GetScanAngleRank(), 0); - ensure_equals("wrong defualt file marker/user data value", - p.GetUserData(), 0); - ensure_equals("wrong defualt user bit field/point source id value", - p.GetPointSourceID(), 0); - ensure_equals("wrong defualt time", - p.GetTime(), double(0)); - - ensure_equals("invalid default red color", - p.GetColor().GetRed(), 0); - ensure_equals("invalid default green color", - p.GetColor().GetGreen(), 0); - ensure_equals("invalid default blue color", - p.GetColor().GetBlue(), 0); - - ensure("invalid defualt point record", p.IsValid()); -} - -void test_file10_header(liblas::LASHeader const& h) -{ - ensure_equals(h.GetFileSignature(), liblas::LASHeader::FileSignature); - ensure_equals(h.GetFileSourceId(), 0); - ensure_equals(h.GetReserved(), 0); - - liblas::guid g; - ensure(g.is_null()); - ensure_equals(h.GetProjectId(), g); - - ensure_equals(h.GetVersionMajor(), 1); - ensure_equals(h.GetVersionMinor(), 0); - ensure_equals(h.GetSystemId(), std::string("")); - ensure_equals(h.GetSoftwareId(), std::string("TerraScan")); - ensure_equals(h.GetCreationDOY(), 0); - ensure_equals(h.GetCreationYear(), 0); - ensure_equals(h.GetHeaderSize(), liblas::uint16_t(227)); - ensure_equals(h.GetDataOffset(), liblas::uint32_t(229)); - ensure_equals(h.GetRecordsCount(), liblas::uint32_t(0)); - ensure_equals(h.GetDataFormatId(), liblas::LASHeader::ePointFormat1); - ensure_equals(h.GetDataRecordLength(), liblas::LASHeader::ePointSize1); - ensure_equals(h.GetPointRecordsCount(), liblas::uint32_t(8)); - ensure_equals(h.GetScaleX(), double(0.01)); - ensure_equals(h.GetScaleY(), double(0.01)); - ensure_equals(h.GetScaleZ(), double(0.01)); - ensure_equals(h.GetOffsetX(), double(-0)); - ensure_equals(h.GetOffsetY(), double(-0)); - ensure_equals(h.GetOffsetZ(), double(-0)); - ensure_equals(h.GetMinX(), double(630262.3)); - ensure_equals(h.GetMaxX(), double(630346.83)); - ensure_equals(h.GetMinY(), double(4834500)); - ensure_equals(h.GetMaxY(), double(4834500)); - ensure_equals(h.GetMinZ(), double(50.9)); - ensure_equals(h.GetMaxZ(), double(55.26)); -} - -void test_file10_point1(liblas::LASPoint const& p) -{ - ensure_distance(p.GetX(), double(630262.30), 0.0001); - ensure_distance(p.GetY(), double(4834500), 0.0001); - ensure_distance(p.GetZ(), double(51.53), 0.0001); - ensure_equals(p.GetIntensity(), 670); - ensure_equals(p.GetClassification(), liblas::uint8_t(1)); - ensure_equals(p.GetScanAngleRank(), 0); - ensure_equals(p.GetUserData(), 3); - ensure_equals(p.GetPointSourceID(), 0); - ensure_equals(p.GetScanFlags(), 9); - ensure_distance(p.GetTime(), double(413665.23360000004), 0.0001); -} - -void test_file10_point2(liblas::LASPoint const& p) -{ - ensure_distance(p.GetX(), double(630282.45), 0.0001); - ensure_distance(p.GetY(), double(4834500), 0.0001); - ensure_distance(p.GetZ(), double(51.63), 0.0001); - ensure_equals(p.GetIntensity(), 350); - ensure_equals(p.GetClassification(), 1); - ensure_equals(p.GetScanAngleRank(), 0); - ensure_equals(p.GetUserData(), 3); - ensure_equals(p.GetPointSourceID(), 0); - ensure_equals(p.GetScanFlags(), 9); - ensure_distance(p.GetTime(), double(413665.52880000003), 0.0001); -} - -void test_file10_point4(liblas::LASPoint const& p) -{ - ensure_distance(p.GetX(), double(630346.83), 0.0001); - ensure_distance(p.GetY(), double(4834500), 0.0001); - ensure_distance(p.GetZ(), double(50.90), 0.0001); - ensure_equals(p.GetIntensity(), 150); - ensure_equals(p.GetClassification(), 1); - ensure_equals(p.GetScanAngleRank(), 0); - ensure_equals(p.GetUserData(), 4); - ensure_equals(p.GetPointSourceID(), 0); - ensure_equals(p.GetScanFlags(), 18); - ensure_distance(p.GetTime(), double(414093.84360000002), 0.0001); -} - -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/guid_test.cpp work/liblas-src-1.2.1/test/unit/guid_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/guid_test.cpp 2009-10-03 01:01:50.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/guid_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,181 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include // std::std::transform -#include // std::memset -#include // std::size_t -#include // std::toupper - -namespace tut -{ - struct guid_data - { - guid_data() - : m_dstr("00000000-0000-0000-0000-000000000000") - {} - - std::string m_dstr; - liblas::guid m_d; - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_guid("liblas::guid"); - - // Test default construction - template<> - template<> - void to::test<1>() - { - ensure(m_d.is_null()); - - std::size_t const len = 16; - ensure_equals(len, m_d.byte_count()); - - std::string s = m_d.to_string(); - ensure_equals(s, m_dstr); - - liblas::guid g; - ensure_equals(len, g.byte_count()); - ensure_equals(g, m_d); - } - - // Test construction from C string - template<> - template<> - void to::test<2>() - { - std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); - liblas::guid g(s1.c_str()); - - ensure_not(g.is_null()); - ensure_not(m_d == g); - - std::string s2 = m_d.to_string(); - std::transform(s2.begin(), s2.end(), s2.begin(), (int(*)(int))std::toupper); - ensure_not(s1 == s2); - - s2 = g.to_string(); - std::transform(s2.begin(), s2.end(), s2.begin(), (int(*)(int))std::toupper); - ensure_equals(s2, s1); - } - - // Test construction from std::string - template<> - template<> - void to::test<3>() - { - std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); - liblas::guid g(s1.c_str()); - - ensure_not(g.is_null()); - ensure_not(m_d == g); - - std::string s2 = g.to_string(); - std::transform(s2.begin(), s2.end(), s2.begin(), (int(*)(int))std::toupper); - ensure_equals(s2, s1); - } - - // Test construction from 4-2-2-8-bytes long fields - template<> - template<> - void to::test<4>() - { - liblas::uint32_t d1(0); - liblas::uint16_t d2(0); - liblas::uint16_t d3(0); - liblas::uint8_t d4[8] = { 0 }; - - liblas::guid g(d1, d2, d3, d4); - - ensure(g.is_null()); - ensure_equals(g, m_d); - - } - - // Test copy constructor - template<> - template<> - void to::test<5>() - { - liblas::guid g(m_d); - - ensure(g.is_null()); - ensure_equals(g, m_d); - - std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); - liblas::guid g1(s1.c_str()); - - liblas::guid g2(g1); - ensure_equals(g2, g1); - } - - // Test assignment operator - template<> - template<> - void to::test<6>() - { - liblas::guid g; - ensure(g.is_null()); - - g = m_d; - ensure(g.is_null()); - ensure_equals(g, m_d); - - std::string s1("3F2504E0-4F89-11D3-9A0C-0305E82C3301"); - liblas::guid g1(s1.c_str()); - - liblas::guid g2; - ensure(g.is_null()); - ensure_equals(g, m_d); - - g2 = g1; - ensure_equals(g2, g1); - } - - // Test guid construction with 4-parts data - template<> - template<> - void to::test<7>() - { - std::string strguid("01234567-89ab-cdef-0123-456789abcdef"); - liblas::guid g1(strguid); - ensure_equals(g1.to_string(), strguid); - - // Binary representation of "01234567-89ab-cdef-0123-456789abcdef" - liblas::uint32_t n1 = 19088743; - liblas::uint16_t n2 = 35243; - liblas::uint16_t n3 = 52719; - liblas::uint8_t n4[8] = { 0 }; - n4[0] = 0x01; - n4[1] = 0x23; - n4[2] = 0x45; - n4[3] = 0x67; - n4[4] = 0x89; - n4[5] = 0xab; - n4[6] = 0xcd; - n4[7] = 0xef; - - liblas::guid g2(n1, n2, n3, n4); - ensure_equals(g1, g2); - - n1 = n2 = n3 = 0; - std::memset(n4, 0, 8); - - g2.output_data(n1, n2, n3, n4); - liblas::guid g3(n1, n2, n3, n4); - - ensure_equals(g1, g3); - ensure_equals(g2, g3); - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/laserror_test.cpp work/liblas-src-1.2.1/test/unit/laserror_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/laserror_test.cpp 2009-10-03 01:01:50.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/laserror_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,77 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include - -namespace tut -{ - struct laserror_data - { - int const code; - std::string const msg; - std::string const method; - - laserror_data() - : code(101), msg("Test message"), method("foo") - {} - - private: - // non-copyable type - laserror_data(laserror_data const&); - laserror_data& operator=(laserror_data const&); - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_laserror("liblas::LASError"); - - // Test constructor - template<> - template<> - void to::test<1>() - { - liblas::LASError err(code, msg, method); - - ensure_equals(err.GetCode(), code); - ensure_equals(err.GetMessage(), msg); - ensure_equals(err.GetMethod(), method); - } - - // Test copy constructor - template<> - template<> - void to::test<2>() - { - liblas::LASError err(code, msg, method); - liblas::LASError copy(err); - - ensure_equals(copy.GetCode(), code); - ensure_equals(copy.GetMessage(), msg); - ensure_equals(copy.GetMethod(), method); - } - - // Test assignment operator - template<> - template<> - void to::test<3>() - { - liblas::LASError copy(0, "", "");; - - { - liblas::LASError err(code, msg, method); - copy = err; - } - - ensure_equals(copy.GetCode(), code); - ensure_equals(copy.GetMessage(), msg); - ensure_equals(copy.GetMethod(), method); - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasfile_test.cpp work/liblas-src-1.2.1/test/unit/lasfile_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasfile_test.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/lasfile_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,266 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include -#include "liblas_test.hpp" -#include "common.hpp" - -namespace tut -{ - struct lasfile_data - { - std::string tmpfile_; - std::string file10_; - - lasfile_data() - : tmpfile_(g_test_data_path + "//lasfile_tmp.las"), - file10_(g_test_data_path + "//TO_core_last_clip.las") - {} - - ~lasfile_data() - { - // remove temporary file after each test case - std::remove(tmpfile_.c_str()); - } - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_lasfile("liblas::LASFile"); - - // Test default constructor - template<> - template<> - void to::test<1>() - { - liblas::LASFile file; - ensure(file.IsNull()); - } - - // Test custom constructor - template<> - template<> - void to::test<2>() - { - liblas::LASFile file(file10_); - ensure_not(file.IsNull()); - - ensure_equals(file.GetName(), file10_); - ensure_equals(file.GetMode(), liblas::LASFile::eRead); - - liblas::LASHeader const& header1 = file.GetHeader(); - test_file10_header(header1); - - liblas::LASReader& reader = file.GetReader(); - liblas::LASHeader const& header2 = reader.GetHeader(); - test_file10_header(header2); - - try - { - liblas::LASWriter& writer = file.GetWriter(); - ensure_equals(writer.GetVersion(), liblas::eLASVersion10); - ensure("std::runtime_error not thrown", false); - } - catch (std::runtime_error const& e) - { - ensure_equals(std::string(e.what()).substr(0, 6), std::string("Writer")); - } - } - - // Test custom constructor - template<> - template<> - void to::test<3>() - { - liblas::LASHeader header; - - try - { - liblas::LASFile file(tmpfile_, header, liblas::LASFile::eRead); - ensure_equals(file.GetName(), tmpfile_); - ensure("std::runtime_error not thrown", false); - } - catch (std::runtime_error const& e) - { - ensure_equals(std::string(e.what()), - std::string("File mode must be eWrite or eAppend")); - } - } - - // Test custom constructor - template<> - template<> - void to::test<4>() - { - liblas::LASHeader header; - liblas::LASFile file(tmpfile_, header, liblas::LASFile::eWrite); - ensure_not(file.IsNull()); - ensure_equals(file.GetName(), tmpfile_); - ensure_equals(file.GetMode(), liblas::LASFile::eWrite); - - liblas::LASHeader const& header1 = file.GetHeader(); - test_default_header(header1); - - liblas::LASWriter& writer = file.GetWriter(); - liblas::LASHeader const& header2 = writer.GetHeader(); - test_default_header(header2); - - try - { - liblas::LASReader& reader = file.GetReader(); - ensure_equals(reader.GetVersion(), liblas::eLASVersion10); - ensure("std::runtime_error not thrown", false); - } - catch (std::runtime_error const& e) - { - ensure_equals(std::string(e.what()).substr(0, 6), std::string("Reader")); - } - } - - // Test copy constructor on default initialized object - template<> - template<> - void to::test<5>() - { - liblas::LASFile file; - ensure(file.IsNull()); - - liblas::LASFile file2(file); - ensure(file2.IsNull()); - } - - // Test assignment operator - template<> - template<> - void to::test<6>() - { - liblas::LASFile file; - ensure(file.IsNull()); - - liblas::LASFile file2; - file2 = file; - ensure(file2.IsNull()); - } - - // Test copy constructor on read-only file - template<> - template<> - void to::test<7>() - { - liblas::LASFile file(file10_); - - ensure_not(file.IsNull()); - ensure_equals(file.GetName(), file10_); - ensure_equals(file.GetMode(), liblas::LASFile::eRead); - - liblas::LASHeader const& header1 = file.GetHeader(); - test_file10_header(header1); - - liblas::LASFile file2(file); - - ensure_not(file2.IsNull()); - ensure_equals(file2.GetName(), file10_); - ensure_equals(file2.GetMode(), liblas::LASFile::eRead); - - liblas::LASHeader const& header2 = file2.GetHeader(); - test_file10_header(header2); - } - - // Test assignment operator on read-only file - template<> - template<> - void to::test<8>() - { - liblas::LASFile file2; - - { - liblas::LASFile file(file10_); - - ensure_not(file.IsNull()); - ensure_equals(file.GetName(), file10_); - ensure_equals(file.GetMode(), liblas::LASFile::eRead); - - liblas::LASHeader const& header1 = file.GetHeader(); - test_file10_header(header1); - - file2 = file; - - // file object is deallocated here - } - - ensure_not(file2.IsNull()); - ensure_equals(file2.GetName(), file10_); - ensure_equals(file2.GetMode(), liblas::LASFile::eRead); - - liblas::LASHeader const& header1 = file2.GetHeader(); - test_file10_header(header1); - } - - // Test assignment operator on write-only file - template<> - template<> - void to::test<9>() - { - liblas::LASHeader header; - liblas::LASFile file(tmpfile_, header, liblas::LASFile::eWrite); - - ensure_not(file.IsNull()); - ensure_equals(file.GetName(), tmpfile_); - ensure_equals(file.GetMode(), liblas::LASFile::eWrite); - - liblas::LASHeader const& header1 = file.GetHeader(); - test_default_header(header1); - - liblas::LASFile file2(file); - - ensure_not(file2.IsNull()); - ensure_equals(file2.GetName(), tmpfile_); - ensure_equals(file2.GetMode(), liblas::LASFile::eWrite); - - liblas::LASHeader const& header2 = file2.GetHeader(); - test_default_header(header2); - } - - // Test assignment operator on write-only file - template<> - template<> - void to::test<10>() - { - liblas::LASFile file2; - - { - liblas::LASHeader header; - liblas::LASFile file(tmpfile_, header, liblas::LASFile::eWrite); - - ensure_not(file.IsNull()); - ensure_equals(file.GetName(), tmpfile_); - ensure_equals(file.GetMode(), liblas::LASFile::eWrite); - - liblas::LASHeader const& header1 = file.GetHeader(); - test_default_header(header1); - - file2 = file; - - // file object is deallocated here - } - - ensure_not(file2.IsNull()); - ensure_equals(file2.GetName(), tmpfile_); - ensure_equals(file2.GetMode(), liblas::LASFile::eWrite); - - liblas::LASHeader const& header1 = file2.GetHeader(); - test_default_header(header1); - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasheader_test.cpp work/liblas-src-1.2.1/test/unit/lasheader_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasheader_test.cpp 2009-10-03 01:01:50.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/lasheader_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,298 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include -#include "common.hpp" - -namespace tut -{ - struct lasheader_data - { - liblas::LASHeader m_default; - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_lasheader("liblas::LASHeader"); - - // Test default constructor - template<> - template<> - void to::test<1>() - { - test_default_header(m_default); - } - - // Test copy constructor - template<> - template<> - void to::test<2>() - { - using liblas::LASHeader; - - LASHeader copy_of_default(m_default); - test_default_header(copy_of_default); - - std::string sig("LASF and garbage"); - - LASHeader h1; - - h1.SetFileSignature(sig); - ensure_not(h1.GetFileSignature() == sig); - ensure_equals(h1.GetFileSignature().size(), 4); - ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); - - LASHeader h2(h1); - - ensure_not(h2.GetFileSignature() == sig); - ensure_equals(h2.GetFileSignature().size(), 4); - ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); - } - - - // Test assignment operator - template<> - template<> - void to::test<3>() - { - using liblas::LASHeader; - - LASHeader copy_of_default; - copy_of_default = m_default; - test_default_header(copy_of_default); - - } - - // Test Get/SetFileSignature - template<> - template<> - void to::test<4>() - { - using liblas::LASHeader; - - std::string sig("LASF and garbage"); - - LASHeader h1; - h1.SetFileSignature(sig); - - ensure_not(h1.GetFileSignature() == sig); - ensure_equals(h1.GetFileSignature().size(), 4); - ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); - - LASHeader h2; - h2 = h1; - - ensure_not(h2.GetFileSignature() == sig); - ensure_equals(h2.GetFileSignature().size(), 4); - ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); - } - - // Test Get/SetFileSourceId - template<> - template<> - void to::test<5>() - { - using liblas::LASHeader; - using liblas::uint16_t; - - uint16_t const id1 = 1; - uint16_t const id2 = 65535; - uint16_t const overflowed = 0; - - LASHeader h1; - h1.SetFileSourceId(id1); - ensure_equals(h1.GetFileSourceId(), id1); - h1.SetFileSourceId(id2); - ensure_equals(h1.GetFileSourceId(), id2); - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4305) // truncation from 'int' to 'liblas::uint16_t' -# pragma warning(disable: 4309) // conditional expression is constant. -#endif - // Unsigned overflow - // Likely compiler warning: truncation from int to liblas::uint16_t - h1.SetFileSourceId(id2 + 1); - ensure_equals(h1.GetFileSourceId(), overflowed); - -#ifdef _MSC_VER -# pragma warning(push) -#endif - } - - // Test GetReserved - template<> - template<> - void to::test<6>() - { - liblas::LASHeader h; - ensure_equals(h.GetReserved(), 0); - } - - // Test Set/GetProjectId - template<> - template<> - void to::test<7>() - { - std::string strid("030B4A82-1B7C-11CF-9D53-00AA003C9CB6"); - liblas::guid id(strid.c_str()); - - liblas::LASHeader h; - h.SetProjectId(id); - - ensure_not(h.GetProjectId().is_null()); - ensure_equals(h.GetProjectId(), id); - } - - // Test handling minor/major version - template<> - template<> - void to::test<8>() - { - liblas::LASHeader h; - - h.SetVersionMajor(1); - h.SetVersionMinor(0); - ensure_equals(h.GetVersionMajor(), 1); - ensure_equals(h.GetVersionMinor(), 0); - - h.SetVersionMajor(1); - h.SetVersionMinor(1); - ensure_equals(h.GetVersionMajor(), 1); - ensure_equals(h.GetVersionMinor(), 1); - - try - { - h.SetVersionMajor(2); - ensure("std::out_of_range not thrown", false); - } - catch (std::out_of_range const& e) - { - ensure(e.what(), true); - } - - try - { - h.SetVersionMinor(3); - ensure("std::out_of_range not thrown", false); - } - catch (std::out_of_range const& e) - { - ensure(e.what(), true); - } - } - - // Test Get/SetSystemId - template<> - template<> - void to::test<9>() - { - using liblas::LASHeader; - - std::string sysid1("Short Sys Id"); // 12 bytes - std::string::size_type const len1 = sysid1.size(); - std::string sysid2("Long System Identifier - XXX YYY"); // 32 bytes - std::string::size_type const len2 = sysid2.size(); - - LASHeader h; - - h.SetSystemId(sysid1); - ensure_equals(h.GetSystemId(), sysid1); - ensure_equals(h.GetSystemId().size(), len1); - ensure_equals(h.GetSystemId(true).size(), 32); - - h.SetSystemId(sysid2); - ensure_equals(h.GetSystemId(), sysid2); - ensure_equals(h.GetSystemId().size(), len2); - ensure_equals(h.GetSystemId(true).size(), 32); - } - - // Test Get/SetSoftwareId - template<> - template<> - void to::test<10>() - { - using liblas::LASHeader; - - std::string softid1("Short Soft Id"); // 13 bytes - std::string::size_type const len1 = softid1.size(); - std::string softid2("Long Software Identifier - XX YY"); // 32 bytes - std::string::size_type const len2 = softid2.size(); - - LASHeader h; - h.SetSoftwareId(softid1); - ensure_equals(h.GetSoftwareId(), softid1); - ensure_equals(h.GetSoftwareId().size(), len1); - ensure_equals(h.GetSoftwareId(true).size(), 32); - - h.SetSoftwareId(softid2); - ensure_equals(h.GetSoftwareId(), softid2); - ensure_equals(h.GetSoftwareId().size(), len2); - ensure_equals(h.GetSoftwareId(true).size(), 32); - } - - // Test GetPointRecordsByReturnCount - template<> - template<> - void to::test<11>() - { - liblas::LASHeader h; - ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); - - h.SetPointRecordsByReturnCount(0, 100); - ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); - ensure_equals(h.GetPointRecordsByReturnCount().at(0), 100); - - h.SetPointRecordsByReturnCount(1, 101); - ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); - ensure_equals(h.GetPointRecordsByReturnCount().at(1), 101); - - h.SetPointRecordsByReturnCount(2, 102); - ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); - ensure_equals(h.GetPointRecordsByReturnCount().at(2), 102); - - h.SetPointRecordsByReturnCount(3, 103); - ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); - ensure_equals(h.GetPointRecordsByReturnCount().at(3), 103); - - h.SetPointRecordsByReturnCount(4, 104); - ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); - ensure_equals(h.GetPointRecordsByReturnCount().at(4), 104); - - try - { - // 5 is out of range - h.SetPointRecordsByReturnCount(5, 500); - ensure("std::out_of_range not thrown", false); - } - catch (std::out_of_range const& e) - { - ensure(e.what(), true); - } - } - - // Test GetSRS - template<> - template<> - void to::test<12>() - { - liblas::LASHeader h; - liblas::LASSpatialReference srs = h.GetSRS(); - - ensure_equals(srs.GetProj4(), ""); - ensure_equals(srs.GetWKT(), ""); - - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/laspoint_test.cpp work/liblas-src-1.2.1/test/unit/laspoint_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/laspoint_test.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/laspoint_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,414 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include "common.hpp" - -namespace tut -{ - struct laspoint_data - { - liblas::LASPoint m_default; - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_laspoint("liblas::LASPoint"); - - // Test default construction - template<> - template<> - void to::test<1>() - { - test_default_point(m_default); - } - - // Test copy constructor - template<> - template<> - void to::test<2>() - { - liblas::LASPoint p(m_default); - - test_default_point(p); - } - - // Test assignment operator - template<> - template<> - void to::test<3>() - { - liblas::LASPoint p; - p = m_default; - - test_default_point(p); - } - - // Test equal-to operator - template<> - template<> - void to::test<4>() - { - liblas::LASPoint p; - - ensure("points are not equal", m_default == p); - } - - // Test not-equal-to operator - template<> - template<> - void to::test<5>() - { - liblas::LASPoint p; - p.SetCoordinates(1.123, 2.456, 3.789); - - ensure("points are equal", m_default != p); - } - - // Test Get/SetReturnNumber - template<> - template<> - void to::test<6>() - { - ensure_equals("invalid default return number", - m_default.GetReturnNumber(), 0); - - liblas::uint16_t const num1 = 7; - m_default.SetReturnNumber(num1); - ensure_equals("invalid return number", - m_default.GetReturnNumber(), num1); - - liblas::uint16_t const num2 = 3; - m_default.SetReturnNumber(num2); - ensure_equals("invalid return number", - m_default.GetReturnNumber(), num2); - - try - { - liblas::uint16_t const outofrange = 8; - m_default.SetReturnNumber(outofrange); - m_default.Validate(); // throws - - // XXX - mloskot: Flag gets reset because of value overflow, - // so in-range value is returned. - //ensure("std::invalid_point_data not thrown", false); - } - catch (liblas::invalid_point_data const& e) - { - ensure_equals(e.who() & liblas::LASPoint::eReturnNumber, - liblas::LASPoint::eReturnNumber); - } - } - - // Test Get/SetNumberOfReturns - template<> - template<> - void to::test<7>() - { - ensure_equals("invalid default number of returns", - m_default.GetNumberOfReturns(), 0); - - liblas::uint16_t const num1 = 7; - m_default.SetNumberOfReturns(num1); - ensure_equals("invalid number of returns", - m_default.GetNumberOfReturns(), num1); - - liblas::uint16_t const num2 = 3; - m_default.SetNumberOfReturns(num2); - ensure_equals("invalid number of returns", - m_default.GetNumberOfReturns(), num2); - - try - { - liblas::uint16_t const outofrange = 8; - m_default.SetNumberOfReturns(outofrange); - m_default.Validate(); // throws - - // XXX - mloskot: Flag gets reset because of value overflow, - // so in-range value is returned. - //ensure("std::invalid_point_data not thrown", false); - } - catch (liblas::invalid_point_data const& e) - { - ensure_equals(e.who() & liblas::LASPoint::eNumberOfReturns, - liblas::LASPoint::eNumberOfReturns); - } - } - - // Test Get/SetScanDirection - template<> - template<> - void to::test<8>() - { - ensure_equals("invalid default scan direction flag", - m_default.GetScanDirection(), 0); - - liblas::uint16_t const positive = 1; - m_default.SetScanDirection(positive); - ensure_equals("invalid scan direction flag", - m_default.GetScanDirection(), positive); - - liblas::uint16_t const negative = 0; - m_default.SetScanDirection(negative); - ensure_equals("invalid scan direction flag", - m_default.GetScanDirection(), negative); - - try - { - liblas::uint16_t const outofrange = 2; - m_default.SetScanDirection(outofrange); - m_default.Validate(); // throws - - // XXX - mloskot: Flag gets reset because of value overflow, - // so in-range value is returned. - //ensure("std::invalid_point_data not thrown", false); - } - catch (liblas::invalid_point_data const& e) - { - ensure_equals(e.who() & liblas::LASPoint::eScanDirection, - liblas::LASPoint::eScanDirection); - } - } - - // Test Get/SetFlightLineEdge - template<> - template<> - void to::test<9>() - { - ensure_equals("invalid default edge of flight line", - m_default.GetFlightLineEdge(), 0); - - liblas::uint16_t const endofscan = 1; - m_default.SetFlightLineEdge(endofscan); - ensure_equals("invalid edge of flight line", - m_default.GetFlightLineEdge(), endofscan); - - liblas::uint16_t const notendofscan = 0; - m_default.SetFlightLineEdge(notendofscan); - ensure_equals("invalid edge of flight line", - m_default.GetFlightLineEdge(), notendofscan); - - try - { - liblas::uint16_t const outofrange = 2; - m_default.SetFlightLineEdge(outofrange); - m_default.Validate(); // throws - - // XXX - mloskot: Flag gets reset because of value overflow, - // so in-range value is returned. - //ensure("std::invalid_point_data not thrown", false); - } - catch (liblas::invalid_point_data const& e) - { - ensure_equals(e.who() & liblas::LASPoint::eFlightLineEdge, - liblas::LASPoint::eFlightLineEdge); - } - } - - // Test Get/SetScanFlags - template<> - template<> - void to::test<10>() - { - std::bitset<8> zeros; - std::bitset<8> bits = m_default.GetScanFlags(); - - ensure_equals("invalid default scan flags", bits, zeros); - - m_default.SetReturnNumber(3); - m_default.SetNumberOfReturns(7); - m_default.SetScanDirection(0); - m_default.SetFlightLineEdge(1); - - std::bitset<8> expected(std::string("10111011")); - bits = m_default.GetScanFlags(); - - ensure_equals("invalid scan flags pattern", bits, expected); - - liblas::LASPoint copy(m_default); - bits = copy.GetScanFlags(); - - ensure_equals("invalid copy of scan flags pattern", bits, expected); - } - - // Test Get/SetClassification - template<> - template<> - void to::test<11>() - { - ensure_equals("invalid default classification", - m_default.GetClassification(), 0); - - liblas::uint8_t const begclass = 0; - m_default.SetClassification(begclass); - ensure_equals("invalid classification", - m_default.GetClassification(), begclass); - - liblas::uint8_t const endclass = 31; - m_default.SetClassification(endclass); - ensure_equals("invalid classification", - m_default.GetClassification(), endclass); - } - - // Test Get/SetScanAngleRank - template<> - template<> - void to::test<12>() - { - ensure_equals("invalid default scan angle rank", - m_default.GetScanAngleRank(), 0); - - liblas::int8_t const rank1 = -90; - m_default.SetScanAngleRank(rank1); - ensure_equals("invalid scan angle rank", - m_default.GetScanAngleRank(), rank1); - - liblas::int8_t const rank2 = 90; - m_default.SetScanAngleRank(rank2); - ensure_equals("invalid scan angle rank", - m_default.GetScanAngleRank(), rank2); - - try - { - liblas::int8_t const outofrange = 91; - m_default.SetScanAngleRank(outofrange); - m_default.Validate(); // throws - - ensure("invalid_point_data not thrown", false); - } - catch (liblas::invalid_point_data const& e) - { - ensure_equals(e.who() & liblas::LASPoint::eScanAngleRank, - liblas::LASPoint::eScanAngleRank); - } - } - - // Test Get/SetUserData - template<> - template<> - void to::test<13>() - { - ensure_equals("invalid default user data value", - m_default.GetUserData(), 0); - - liblas::uint8_t const data = 7; // dummy value - m_default.SetUserData(data); - - ensure_equals("invalid user data value", - m_default.GetUserData(), data); - } - - // Test Get/SetTime - template<> - template<> - void to::test<14>() - { - ensure_equals("invalid default time", - m_default.GetTime(), 0); - - double const time = 3.14; // dummy value - m_default.SetTime(time); - - ensure_equals("invalid time", - m_default.GetTime(), time); - } - - // Test IsValid method - template<> - template<> - void to::test<15>() - { - { - liblas::LASPoint p; - liblas::uint16_t const outofrange = 8; - p.SetReturnNumber(outofrange); - // XXX: Bit flag overflowed, so point data recognized as valid - //ensure_not(p.IsValid()); - } - - { - liblas::LASPoint p; - liblas::uint16_t const outofrange = 8; - p.SetNumberOfReturns(outofrange); - // XXX: Bit flag overflowed, so point data recognized as valid - //ensure_not(p.IsValid()); - } - - { - liblas::LASPoint p; - liblas::uint16_t const outofrange = 2; - p.SetScanDirection(outofrange); - // XXX: Bit flag overflowed, so point data recognized as valid - //ensure_not(p.IsValid()); - } - - { - liblas::LASPoint p; - liblas::uint16_t const outofrange = 2; - p.SetFlightLineEdge(outofrange); - // XXX: Bit flag overflowed, so point data recognized as valid - //ensure_not(p.IsValid()); - } - - { - liblas::LASPoint p; - liblas::int8_t const outofrange = 91; - p.SetScanAngleRank(outofrange); - ensure_not(p.IsValid()); - } - } - - // Test Get/SetColor - template<> - template<> - void to::test<16>() - { - ensure_equals("invalid default red color", - m_default.GetColor().GetRed(), 0); - - ensure_equals("invalid default green color", - m_default.GetColor().GetGreen(), 0); - - ensure_equals("invalid default blue color", - m_default.GetColor().GetBlue(), 0); - - liblas::LASColor color; - color.SetRed(211); - color.SetGreen(211); - color.SetBlue(211); - - m_default.SetColor(color); - - ensure_equals("invalid set red color", - m_default.GetColor().GetRed(), 211); - - ensure_equals("invalid set green color", - m_default.GetColor().GetGreen(), 211); - - ensure_equals("invalid set blue color", - m_default.GetColor().GetBlue(), 211); - - liblas::LASPoint p = m_default; - - ensure_equals("invalid copied red color", - p.GetColor().GetRed(), 211); - - ensure_equals("invalid copied green color", - p.GetColor().GetGreen(), 211); - - ensure_equals("invalid copied blue color", - p.GetColor().GetBlue(), 211); - - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasreader_iterator_test.cpp work/liblas-src-1.2.1/test/unit/lasreader_iterator_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasreader_iterator_test.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/lasreader_iterator_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,388 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "liblas_test.hpp" -#include "common.hpp" -using namespace liblas; - -namespace tut -{ - struct lasreader_iterator_data - { - std::string file10_; - std::ifstream ifs_; - LASReader reader_; - - lasreader_iterator_data() : - file10_(g_test_data_path + "//TO_core_last_clip.las"), - ifs_(file10_.c_str(), std::ios::in | std::ios::binary), - reader_(ifs_) - {} - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_lasreader_iterator("liblas::lasreader_iterator"); - - // Test default constructor - template<> - template<> - void to::test<1>() - { - lasreader_iterator it; - } - - // Test user-defined constructor - template<> - template<> - void to::test<2>() - { - lasreader_iterator it(reader_); - } - - // Test copy constructor with default initialized iterator - template<> - template<> - void to::test<3>() - { - lasreader_iterator it1; - lasreader_iterator it2(it1); - - ensure(it1 == it2); - } - - // Test copy constructor with initialized iterator - template<> - template<> - void to::test<4>() - { - lasreader_iterator it1(reader_); - lasreader_iterator it2(it1); - - ensure(it1 == it2); - } - - // Test assignment operator with default initialized iterator - template<> - template<> - void to::test<5>() - { - lasreader_iterator it1; - lasreader_iterator it2; - it1 = it2; - - ensure(it1 == it2); - } - - // Test assignment operator with initialized iterator - template<> - template<> - void to::test<6>() - { - lasreader_iterator it1(reader_); - lasreader_iterator it2; - it1 = it2; - - ensure(it1 == it2); - } - - // Test dereference operator - template<> - template<> - void to::test<7>() - { - lasreader_iterator it(reader_); - - test_file10_point1(*it); - } - - // Test pointer-to-member operator - template<> - template<> - void to::test<8>() - { - lasreader_iterator it(reader_); - - // test 1st point data record - ensure_distance(it->GetX(), double(630262.30), 0.0001); - ensure_distance(it->GetY(), double(4834500), 0.0001); - ensure_distance(it->GetZ(), double(51.53), 0.0001); - ensure_equals(it->GetIntensity(), 670); - ensure_equals(it->GetClassification(), liblas::uint8_t(1)); - ensure_equals(it->GetScanAngleRank(), 0); - ensure_equals(it->GetUserData(), 3); - ensure_equals(it->GetScanFlags(), 9); - ensure_distance(it->GetTime(), double(413665.23360000004), 0.0001); - } - - // Test pre-increment operator - template<> - template<> - void to::test<9>() - { - lasreader_iterator it(reader_); // move to 1st point - ++it; // move to 2nd record - - test_file10_point2(*it); - } - - // Test post-increment operator - template<> - template<> - void to::test<10>() - { - lasreader_iterator it(reader_); // move to 1st point - it++; // move to 2nd record - - test_file10_point2(*it); - } - - // Test equal-to operator - template<> - template<> - void to::test<11>() - { - lasreader_iterator it(reader_); // move to 1st point - lasreader_iterator end; - - ensure_not(end == it); - } - - // Test not-equal-to operator - template<> - template<> - void to::test<12>() - { - lasreader_iterator it(reader_); // move to 1st point - lasreader_iterator end; - - ensure(end != it); - } - - // Test iteration - template<> - template<> - void to::test<13>() - { - liblas::uint32_t const cnt = reader_.GetHeader().GetPointRecordsCount(); - lasreader_iterator it(reader_); // move to 1st point - lasreader_iterator end; - - liblas::uint32_t s = 0; - while (end != it) - { - s++; - ++it; - } - - ensure_equals(cnt, s); - } - - // Test std::distance operation - template<> - template<> - void to::test<14>() - { - liblas::uint32_t const cnt = reader_.GetHeader().GetPointRecordsCount(); - lasreader_iterator it(reader_); // move to 1st point - lasreader_iterator end; - - lasreader_iterator::difference_type const d = std::distance(it, end); - ensure_equals(d, cnt); - } - - // Test std::distance operation - template<> - template<> - void to::test<15>() - { - std::size_t a = std::distance(lasreader_iterator(reader_), lasreader_iterator()); - - // Reader state is set to "past-the-end-of-file" - // So, reset is needed - reader_.Reset(); - - std::size_t b = std::distance(lasreader_iterator(reader_), lasreader_iterator()); - - ensure_equals(a, b); - } - - // Test std::advance operation - template<> - template<> - void to::test<16>() - { - lasreader_iterator it(reader_); // move to 1st point - - std::advance(it, 1); // move to 2nd record - test_file10_point2(*it); - - std::advance(it, 2); // move to 4th record - test_file10_point4(*it); - } - - // Test std::copy algorithm - template<> - template<> - void to::test<17>() - { - liblas::uint32_t const size = reader_.GetHeader().GetPointRecordsCount(); - lasreader_iterator it(reader_); - lasreader_iterator end; - - typedef std::list list_t; - typedef std::back_insert_iterator inserter_t; - list_t cache; - - // Test copying LAS records to std::list based cache - std::copy(it, end, inserter_t(cache)); - ensure_equals(cache.size(), size); - - // Test copied data - list_t::const_iterator cit = cache.begin(); // 1st element - std::advance(cit, 1); // move to 2nd element in cache - test_file10_point2(*cit); - std::advance(cit, 2); // move to 4th element in cache - test_file10_point4(*cit); - } - - // Test std::count algorithm - template<> - template<> - void to::test<18>() - { - // Construct copy of 2nd point record from tested file - LASPoint pt; - pt.SetCoordinates(630282.45, 4834500, 51.63); - pt.SetIntensity(350); - pt.SetClassification(1); - pt.SetScanAngleRank(0); - pt.SetUserData(3); - pt.SetScanFlags(9); - pt.SetTime(413665.52880000003); - ensure(pt.IsValid()); - test_file10_point2(pt); - - lasreader_iterator it(reader_); - lasreader_iterator end; - - // Count records equal to given point object - lasreader_iterator::difference_type const expected = 1; - lasreader_iterator::difference_type n = std::count(it, end, pt); - ensure_equals(n, expected); - } - - // Test std::equal algorithm - template<> - template<> - void to::test<19>() - { - std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary); - LASReader reader(ifs); - - // Copy LAS records to std::list based cache - typedef std::list list_t; - typedef std::back_insert_iterator inserter_t; - list_t cache; - { - lasreader_iterator it(reader); - lasreader_iterator end; - ensure(it != end); - - std::copy(it, end, inserter_t(cache)); - ensure_equals(cache.size(), reader.GetHeader().GetPointRecordsCount()); - } - - // Reset reader to the beginning of LAS file - reader.Reset(); - - // Compare LAS file with cache - { - lasreader_iterator it(reader); - lasreader_iterator end; - ensure(it != end); - - bool eq = std::equal(it, end, cache.begin()); - ensure(eq); - } - } - - // Test std::find algorithm - template<> - template<> - void to::test<20>() - { - // Construct copy of 2nd point record from tested file - LASPoint pt; - pt.SetCoordinates(630282.45, 4834500, 51.63); - pt.SetIntensity(350); - pt.SetClassification(1); - pt.SetScanAngleRank(0); - pt.SetUserData(3); - pt.SetScanFlags(9); - pt.SetTime(413665.52880000003); - ensure(pt.IsValid()); - test_file10_point2(pt); - - lasreader_iterator it(reader_); - lasreader_iterator end; - - // find 2nd point data record - lasreader_iterator fit; - fit = std::find(it, end, pt); - ensure(fit != end); - test_file10_point2(*fit); - } - - // Test std::find_if algorithm - template<> - template<> - void to::test<21>() - { - lasreader_iterator it(reader_); - lasreader_iterator end; - - // find 2nd point data record comparing XY coordinates - lasreader_iterator fit; - fit = std::find_if(it, end, is_xy(630282.45, 4834500, 0.0001)); - ensure(fit != end); - test_file10_point2(*fit); - } - - // Test std::for_each algorithm - template<> - template<> - void to::test<22>() - { - lasreader_iterator it(reader_); - lasreader_iterator end; - - typedef liblas::detail::Point point_t; - typedef liblas::detail::Extents bbox_t; - - LASHeader const& h = reader_.GetHeader(); - bbox_t lasbbox(point_t(h.GetMinX(), h.GetMinY(), h.GetMinZ()), - point_t(h.GetMaxX(), h.GetMaxY(), h.GetMaxZ())); - - // Accumulate points extents to common bounding box - bbox_t bbox; - std::for_each(it, end, bbox_calculator(bbox)); - - ensure(lasbbox == bbox); - } -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasreader_test.cpp work/liblas-src-1.2.1/test/unit/lasreader_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasreader_test.cpp 2009-10-03 01:01:50.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/lasreader_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,162 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include -#include -#include "liblas_test.hpp" -#include "common.hpp" - -namespace tut -{ - struct lasreader_data - { - std::string file10_; - - lasreader_data() - : file10_(g_test_data_path + "//TO_core_last_clip.las") - {} - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_lasreader("liblas::LASReader"); - - // Test user-declared constructor - template<> - template<> - void to::test<1>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - ensure_equals(reader.GetVersion(), liblas::eLASVersion10); - } - - // Test reading header - template<> - template<> - void to::test<2>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - liblas::LASHeader const& hdr = reader.GetHeader(); - - test_file10_header(hdr); - } - - // Test GetPoint method - template<> - template<> - void to::test<3>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - // uninitialized point object, a null-point - liblas::LASPoint const& p = reader.GetPoint(); - ensure(p == liblas::LASPoint()); - } - - // Test ReadPoint and GetPoint pair - template<> - template<> - void to::test<4>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - // read 1st point - reader.ReadNextPoint(); - test_file10_point1(reader.GetPoint()); - - // read 2nd point - reader.ReadNextPoint(); - test_file10_point2(reader.GetPoint()); - - // read and skip 3rd point - reader.ReadNextPoint(); - - // read 4th point - reader.ReadNextPoint(); - test_file10_point4(reader.GetPoint()); - - // read and count remaining points from 5 to 8 - unsigned short c = 0; - while (reader.ReadNextPoint()) - { - ++c; - } - ensure_equals(c, 4); - } - - // Test ReadPointAt and GetPoint pair - template<> - template<> - void to::test<5>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - // read 1st point - reader.ReadPointAt(0); - test_file10_point1(reader.GetPoint()); - - // read 4th point - reader.ReadPointAt(3); - test_file10_point4(reader.GetPoint()); - - // read back to 2nd point - reader.ReadPointAt(1); - test_file10_point2(reader.GetPoint()); - } - - // Test operator[] and GetPoint pair - template<> - template<> - void to::test<6>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - // read 1st point - test_file10_point1(reader[0]); - - // read 4th point - test_file10_point4(reader[3]); - - // read back to 2nd point - test_file10_point2(reader[1]); - } - - // Test GetStream method - template<> - template<> - void to::test<7>() - { - std::ifstream ifs; - ifs.open(file10_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - std::istream& is = reader.GetStream(); - - ensure_equals(ifs, is); - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasspatialreference_test.cpp work/liblas-src-1.2.1/test/unit/lasspatialreference_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasspatialreference_test.cpp 2009-10-03 01:01:50.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/lasspatialreference_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,286 +0,0 @@ -// $Id: lasspatialreference_test.cpp 1102 2009-03-16 14:57:12Z hobu $ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include "common.hpp" - -namespace tut -{ - struct lasspatialreference_data - { - liblas::LASSpatialReference m_default; - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_lasspatialreference("liblas::LASSpatialReference"); - - // Test default constructor - template<> - template<> - void to::test<1>() - { - ensure_equals(m_default.GetProj4(), ""); - ensure_equals(m_default.GetWKT(), ""); - } - -// // Test copy constructor -// template<> -// template<> -// void to::test<2>() -// { -// using liblas::LASSpatialReference; -// -// LASSpatialReference copy_of_default(m_default); -// test_default_header(copy_of_default); -// -// std::string sig("LASF and garbage"); -// -// LASHeader h1; -// -// h1.SetFileSignature(sig); -// ensure_not(h1.GetFileSignature() == sig); -// ensure_equals(h1.GetFileSignature().size(), 4); -// ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); -// -// LASHeader h2(h1); -// -// ensure_not(h2.GetFileSignature() == sig); -// ensure_equals(h2.GetFileSignature().size(), 4); -// ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); -// } -// -// -// // Test assignment operator -// template<> -// template<> -// void to::test<3>() -// { -// using liblas::LASHeader; -// -// LASHeader copy_of_default; -// copy_of_default = m_default; -// test_default_header(copy_of_default); -// -// } -// -// // Test Get/SetFileSignature -// template<> -// template<> -// void to::test<4>() -// { -// using liblas::LASHeader; -// -// std::string sig("LASF and garbage"); -// -// LASHeader h1; -// h1.SetFileSignature(sig); -// -// ensure_not(h1.GetFileSignature() == sig); -// ensure_equals(h1.GetFileSignature().size(), 4); -// ensure_equals(h1.GetFileSignature(), LASHeader::FileSignature); -// -// LASHeader h2; -// h2 = h1; -// -// ensure_not(h2.GetFileSignature() == sig); -// ensure_equals(h2.GetFileSignature().size(), 4); -// ensure_equals(h2.GetFileSignature(), LASHeader::FileSignature); -// } -// -// // Test Get/SetFileSourceId -// template<> -// template<> -// void to::test<5>() -// { -// using liblas::LASHeader; -// using liblas::uint16_t; -// -// uint16_t const id1 = 1; -// uint16_t const id2 = 65535; -// uint16_t const overflowed = 0; -// -// LASHeader h1; -// h1.SetFileSourceId(id1); -// ensure_equals(h1.GetFileSourceId(), id1); -// h1.SetFileSourceId(id2); -// ensure_equals(h1.GetFileSourceId(), id2); -// -// #ifdef _MSC_VER -// # pragma warning(push) -// # pragma warning(disable: 4305) // truncation from 'int' to 'liblas::uint16_t' -// # pragma warning(disable: 4309) // conditional expression is constant. -// #endif -// // Unsigned overflow -// // Likely compiler warning: truncation from int to liblas::uint16_t -// h1.SetFileSourceId(id2 + 1); -// ensure_equals(h1.GetFileSourceId(), overflowed); -// -// #ifdef _MSC_VER -// # pragma warning(push) -// #endif -// } -// -// // Test GetReserved -// template<> -// template<> -// void to::test<6>() -// { -// liblas::LASHeader h; -// ensure_equals(h.GetReserved(), 0); -// } -// -// // Test Set/GetProjectId -// template<> -// template<> -// void to::test<7>() -// { -// std::string strid("030B4A82-1B7C-11CF-9D53-00AA003C9CB6"); -// liblas::guid id(strid.c_str()); -// -// liblas::LASHeader h; -// h.SetProjectId(id); -// -// ensure_not(h.GetProjectId().is_null()); -// ensure_equals(h.GetProjectId(), id); -// } -// -// // Test handling minor/major version -// template<> -// template<> -// void to::test<8>() -// { -// liblas::LASHeader h; -// -// h.SetVersionMajor(1); -// h.SetVersionMinor(0); -// ensure_equals(h.GetVersionMajor(), 1); -// ensure_equals(h.GetVersionMinor(), 0); -// -// h.SetVersionMajor(1); -// h.SetVersionMinor(1); -// ensure_equals(h.GetVersionMajor(), 1); -// ensure_equals(h.GetVersionMinor(), 1); -// -// try -// { -// h.SetVersionMajor(2); -// ensure("std::out_of_range not thrown", false); -// } -// catch (std::out_of_range const& e) -// { -// ensure(e.what(), true); -// } -// -// try -// { -// h.SetVersionMinor(3); -// ensure("std::out_of_range not thrown", false); -// } -// catch (std::out_of_range const& e) -// { -// ensure(e.what(), true); -// } -// } -// -// // Test Get/SetSystemId -// template<> -// template<> -// void to::test<9>() -// { -// using liblas::LASHeader; -// -// std::string sysid1("Short Sys Id"); // 12 bytes -// std::string::size_type const len1 = sysid1.size(); -// std::string sysid2("Long System Identifier - XXX YYY"); // 32 bytes -// std::string::size_type const len2 = sysid2.size(); -// -// LASHeader h; -// -// h.SetSystemId(sysid1); -// ensure_equals(h.GetSystemId(), sysid1); -// ensure_equals(h.GetSystemId().size(), len1); -// ensure_equals(h.GetSystemId(true).size(), 32); -// -// h.SetSystemId(sysid2); -// ensure_equals(h.GetSystemId(), sysid2); -// ensure_equals(h.GetSystemId().size(), len2); -// ensure_equals(h.GetSystemId(true).size(), 32); -// } -// -// // Test Get/SetSoftwareId -// template<> -// template<> -// void to::test<10>() -// { -// using liblas::LASHeader; -// -// std::string softid1("Short Soft Id"); // 13 bytes -// std::string::size_type const len1 = softid1.size(); -// std::string softid2("Long Software Identifier - XX YY"); // 32 bytes -// std::string::size_type const len2 = softid2.size(); -// -// LASHeader h; -// h.SetSoftwareId(softid1); -// ensure_equals(h.GetSoftwareId(), softid1); -// ensure_equals(h.GetSoftwareId().size(), len1); -// ensure_equals(h.GetSoftwareId(true).size(), 32); -// -// h.SetSoftwareId(softid2); -// ensure_equals(h.GetSoftwareId(), softid2); -// ensure_equals(h.GetSoftwareId().size(), len2); -// ensure_equals(h.GetSoftwareId(true).size(), 32); -// } -// -// // Test GetPointRecordsByReturnCount -// template<> -// template<> -// void to::test<11>() -// { -// liblas::LASHeader h; -// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); -// -// h.SetPointRecordsByReturnCount(0, 100); -// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); -// ensure_equals(h.GetPointRecordsByReturnCount().at(0), 100); -// -// h.SetPointRecordsByReturnCount(1, 101); -// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); -// ensure_equals(h.GetPointRecordsByReturnCount().at(1), 101); -// -// h.SetPointRecordsByReturnCount(2, 102); -// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); -// ensure_equals(h.GetPointRecordsByReturnCount().at(2), 102); -// -// h.SetPointRecordsByReturnCount(3, 103); -// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); -// ensure_equals(h.GetPointRecordsByReturnCount().at(3), 103); -// -// h.SetPointRecordsByReturnCount(4, 104); -// ensure_equals(h.GetPointRecordsByReturnCount().size(), 5); -// ensure_equals(h.GetPointRecordsByReturnCount().at(4), 104); -// -// try -// { -// // 5 is out of range -// h.SetPointRecordsByReturnCount(5, 500); -// ensure("std::out_of_range not thrown", false); -// } -// catch (std::out_of_range const& e) -// { -// ensure(e.what(), true); -// } -// } - -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasvariablerecord_test.cpp work/liblas-src-1.2.1/test/unit/lasvariablerecord_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/lasvariablerecord_test.cpp 2009-10-03 01:01:50.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/lasvariablerecord_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,108 +0,0 @@ -// $Id: lasvariablerecord_test.cpp 712 2008-05-14 22:47:43Z hobu $ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include - -namespace tut -{ - struct lasvariablerecord_data - { - liblas::LASVariableRecord m_default; - - void test_default(liblas::LASVariableRecord const& h) - { - ensure_equals("wrong default reserved bytes", - h.GetReserved(), liblas::uint16_t()); - - ensure_equals("wrong default record identifier", - h.GetRecordId(), liblas::uint16_t()); - - ensure_equals("wrong default record length", - h.GetRecordLength(), liblas::uint16_t()); - - ensure_equals("wrong default user identifier", - h.GetUserId(true).c_str(), std::string()); - - ensure_equals("wrong default description", - h.GetDescription(true).c_str(), std::string()); - } - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_lasvariablerecord("liblas::LASVariableRecord"); - - // Test default constructor - template<> - template<> - void to::test<1>() - { - test_default(m_default); - } - - // Test copy constructor - template<> - template<> - void to::test<2>() - { - liblas::LASVariableRecord hdr_copy(m_default); - test_default(hdr_copy); - } - - // Test assignment operator - template<> - template<> - void to::test<3>() - { - liblas::LASVariableRecord hdr_copy; - test_default(hdr_copy); - - hdr_copy = m_default; - test_default(hdr_copy); - } - - // Test equal function - template<> - template<> - void to::test<4>() - { - liblas::LASVariableRecord hdr; - ensure("two default headers not equal", m_default.equal(hdr)); - - liblas::LASVariableRecord hdr_copy(m_default); - ensure("copy of default header not equal", hdr.equal(m_default)); - } - - // Test equal-to operator - template<> - template<> - void to::test<5>() - { - liblas::LASVariableRecord hdr; - ensure("two default headers not equal", m_default == hdr); - - liblas::LASVariableRecord hdr_copy(m_default); - ensure("copy of default header not equal", hdr == m_default); - } - - // Test not-equal-to operator - template<> - template<> - void to::test<6>() - { - liblas::LASVariableRecord hdr; - ensure_not("two default headers not equal", m_default != hdr); - - liblas::LASVariableRecord hdr_copy(m_default); - ensure_not("copy of default header not equal", hdr != m_default); - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/laswriter_test.cpp work/liblas-src-1.2.1/test/unit/laswriter_test.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/laswriter_test.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/laswriter_test.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,243 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "liblas_test.hpp" -#include "common.hpp" - -namespace tut -{ - struct laswriter_data - { - std::string tmpfile_; - std::string file10_; - - laswriter_data() : - tmpfile_(g_test_data_path + "//tmp.las"), - file10_(g_test_data_path + "//TO_core_last_clip.las") - {} - - ~laswriter_data() - { - // remove temporary file after each test case - int const rc = std::remove(tmpfile_.c_str()); - ensure_equals(rc, 0); - } - }; - - typedef test_group tg; - typedef tg::object to; - - tg test_group_laswriter("liblas::LASWriter"); - - // Test user-declared constructor - template<> - template<> - void to::test<1>() - { - // Create new LAS file using default header block - { - std::ofstream ofs; - ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); - - // LAS 1.2, Point Format 0 - liblas::LASHeader header; - liblas::LASWriter writer(ofs, header); - - ensure_equals(writer.GetVersion(), liblas::eLASVersion12); - - liblas::LASHeader const& hdr_default = writer.GetHeader(); - test_default_header(hdr_default); - } - - // Read previously created LAS file and check its header block - { - std::ifstream ifs; - ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - ensure_equals(reader.GetVersion(), liblas::eLASVersion12); - - liblas::LASHeader const& hdr_default = reader.GetHeader(); - test_default_header(hdr_default); - } - } - - // Test WritePoint method - template<> - template<> - void to::test<2>() - { - { - std::ofstream ofs; - ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); - - // LAS 1.1, Point Format 0 - liblas::LASHeader header; - liblas::LASWriter writer(ofs, header); - - liblas::LASPoint point; - - // Write 1st point - point.SetCoordinates(10, 20, 30); - point.SetIntensity(5); - point.SetReturnNumber(1); - point.SetNumberOfReturns(1); - point.SetScanDirection(1); - point.SetFlightLineEdge(1); - point.SetClassification(7); - point.SetScanAngleRank(90); - point.SetUserData(0); - point.SetPointSourceID(1); - - writer.WritePoint(point); - - // write 2nd point - point.SetCoordinates(40, 50, 60); - point.SetPointSourceID(2); - writer.WritePoint(point); - - // write 3rd point - point.SetCoordinates(70, 80, 90); - point.SetPointSourceID(3); - writer.WritePoint(point); - } - - // Read previously create LAS file with 3 point records - { - std::ifstream ifs; - ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - liblas::LASPoint point; // reusable cache - - // read 1st point - reader.ReadNextPoint(); - point = reader.GetPoint(); - ensure_distance(point.GetX(), 10.0, 0.1); - ensure_distance(point.GetY(), 20.0, 0.1); - ensure_distance(point.GetZ(), 30.0, 0.1); - ensure_equals(point.GetIntensity(), 5); - ensure_equals(point.GetReturnNumber(), 1); - ensure_equals(point.GetNumberOfReturns(), 1); - ensure_equals(point.GetScanDirection(), 1); - ensure_equals(point.GetFlightLineEdge(), 1); - ensure_equals(point.GetClassification(), 7); - ensure_equals(point.GetScanAngleRank(), 90); - ensure_equals(point.GetUserData(), 0); - ensure_equals(point.GetPointSourceID(), 1); - - // read 2nd point - reader.ReadNextPoint(); - point = reader.GetPoint(); - ensure_distance(point.GetX(), 40.0, 0.1); - ensure_distance(point.GetY(), 50.0, 0.1); - ensure_distance(point.GetZ(), 60.0, 0.1); - ensure_equals(point.GetIntensity(), 5); - ensure_equals(point.GetReturnNumber(), 1); - ensure_equals(point.GetNumberOfReturns(), 1); - ensure_equals(point.GetScanDirection(), 1); - ensure_equals(point.GetFlightLineEdge(), 1); - ensure_equals(point.GetClassification(), 7); - ensure_equals(point.GetScanAngleRank(), 90); - ensure_equals(point.GetUserData(), 0); - ensure_equals(point.GetPointSourceID(), 2); - - // read 3rd point - reader.ReadNextPoint(); - point = reader.GetPoint(); - ensure_distance(point.GetX(), 70.0, 0.1); - ensure_distance(point.GetY(), 80.0, 0.1); - ensure_distance(point.GetZ(), 90.0, 0.1); - ensure_equals(point.GetIntensity(), 5); - ensure_equals(point.GetReturnNumber(), 1); - ensure_equals(point.GetNumberOfReturns(), 1); - ensure_equals(point.GetScanDirection(), 1); - ensure_equals(point.GetFlightLineEdge(), 1); - ensure_equals(point.GetClassification(), 7); - ensure_equals(point.GetScanAngleRank(), 90); - ensure_equals(point.GetUserData(), 0); - ensure_equals(point.GetPointSourceID(), 3); - } - } - - - // Test WriteHeader method - template<> - template<> - void to::test<3>() - { - { - std::ofstream ofs; - ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); - - liblas::LASHeader header; - liblas::LASWriter writer(ofs, header); - - // test initially written header - liblas::LASHeader const& hdr_default = writer.GetHeader(); - test_default_header(hdr_default); - - // update some header data and overwrite header block - header.SetFileSourceId(65535); - header.SetSystemId("Unit Test libLAS System"); - header.SetSoftwareId("Unit Test libLAS Software"); - header.SetCreationDOY(100); - header.SetCreationYear(2008); - header.SetScale(1.123, 2.123, 3.123); - header.SetOffset(4.321, 5.321, 6.321); - - writer.WriteHeader(header); - } - - // read and check updated header block - { - std::ifstream ifs; - ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary); - liblas::LASReader reader(ifs); - - liblas::LASHeader const& header = reader.GetHeader(); - ensure_equals(header.GetFileSourceId(), 65535); - ensure_equals(header.GetSystemId(), std::string("Unit Test libLAS System")); - ensure_equals(header.GetSoftwareId(), std::string("Unit Test libLAS Software")); - ensure_equals(header.GetCreationDOY(), 100); - ensure_equals(header.GetCreationYear(), 2008); - ensure_equals(header.GetScaleX(), 1.123); - ensure_equals(header.GetScaleY(), 2.123); - ensure_equals(header.GetScaleZ(), 3.123); - ensure_equals(header.GetOffsetX(), 4.321); - ensure_equals(header.GetOffsetY(), 5.321); - ensure_equals(header.GetOffsetZ(), 6.321); - } - } - - // Test GetStream method - template<> - template<> - void to::test<4>() - { - std::ofstream ofs; - ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary); - - liblas::LASHeader header; - liblas::LASWriter writer(ofs, header); - - std::ostream& os = writer.GetStream(); - - ensure_equals(ofs, os); // same streams - } -} - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/liblas_test_suite.cpp work/liblas-src-1.2.1/test/unit/liblas_test_suite.cpp --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/liblas_test_suite.cpp 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/liblas_test_suite.cpp 1970-01-01 08:00:00.000000000 +0800 @@ -1,53 +0,0 @@ -// $Id$ -// -// (C) Copyright Mateusz Loskot 2008, mateusz@loskot.net -// Distributed under the BSD License -// (See accompanying file LICENSE.txt or copy at -// http://www.opensource.org/licenses/bsd-license.php) -// -#include -#include -#include -#include - -namespace tut -{ - test_runner_singleton runner; - - // full path to trunk/test/data - std::string g_test_data_path; -} - -int main(int argc, char* argv[]) -{ - if (1 == argc) - { - tut::g_test_data_path = "../data"; // default path - } - else if (2 == argc) - { - tut::g_test_data_path = argv[1]; - } - else - { - std::cout << "Usage: liblas_test \n"; - return 1; - } - - std::cout << "libLAS Test Suite:\n=================="; - - tut::reporter reporter; - tut::runner.get().set_callback(&reporter); - - try - { - tut::runner.get().run_tests(); - } - catch (std::exception const& e) - { - std::cerr << "TUT raised exception: " << e.what() << std::endl; - return 1; - } - - return 0; -} diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/Makefile.am work/liblas-src-1.2.1/test/unit/Makefile.am --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/Makefile.am 2009-10-03 01:01:59.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/Makefile.am 1970-01-01 08:00:00.000000000 +0800 @@ -1,35 +0,0 @@ -if GDAL_IS_CONFIG -GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -endif - -if GEOTIFF_IS_CONFIG -GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -endif - -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail - - -INCLUDES = -I. -I../../include - -TESTS = liblas_test - -check_PROGRAMS = liblas_test - -liblas_test_LDADD = \ - $(top_builddir)/src/liblas.la \ - $(NULL) - -liblas_test_SOURCES = \ - common.cpp \ - guid_test.cpp \ - laserror_test.cpp \ - lasfile_test.cpp \ - lasheader_test.cpp \ - lasspatialreference_test.cpp \ - laspoint_test.cpp \ - lasreader_iterator_test.cpp \ - lasreader_test.cpp \ - lasvariablerecord_test.cpp \ - laswriter_test.cpp \ - liblas_test_suite.cpp - diff -ruN /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/Makefile.in work/liblas-src-1.2.1/test/unit/Makefile.in --- /usr/ports/devel/liblas12/work/liblas-src-1.2.1/test/unit/Makefile.in 2009-10-03 01:02:37.000000000 +0800 +++ work/liblas-src-1.2.1/test/unit/Makefile.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,553 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -TESTS = liblas_test$(EXEEXT) -check_PROGRAMS = liblas_test$(EXEEXT) -subdir = test/unit -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -am_liblas_test_OBJECTS = common.$(OBJEXT) guid_test.$(OBJEXT) \ - laserror_test.$(OBJEXT) lasfile_test.$(OBJEXT) \ - lasheader_test.$(OBJEXT) lasspatialreference_test.$(OBJEXT) \ - laspoint_test.$(OBJEXT) lasreader_iterator_test.$(OBJEXT) \ - lasreader_test.$(OBJEXT) lasvariablerecord_test.$(OBJEXT) \ - laswriter_test.$(OBJEXT) liblas_test_suite.$(OBJEXT) -liblas_test_OBJECTS = $(am_liblas_test_OBJECTS) -liblas_test_DEPENDENCIES = $(top_builddir)/src/liblas.la -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(liblas_test_SOURCES) -DIST_SOURCES = $(liblas_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GDAL_INC = @GDAL_INC@ -GDAL_PREFIX = @GDAL_PREFIX@ -GEOTIFF_INC = @GEOTIFF_INC@ -GEOTIFF_PREFIX = @GEOTIFF_PREFIX@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE_VERSION = @RELEASE_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -@GDAL_IS_CONFIG_TRUE@GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1 -@GEOTIFF_IS_CONFIG_TRUE@GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 -AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail -INCLUDES = -I. -I../../include -liblas_test_LDADD = \ - $(top_builddir)/src/liblas.la \ - $(NULL) - -liblas_test_SOURCES = \ - common.cpp \ - guid_test.cpp \ - laserror_test.cpp \ - lasfile_test.cpp \ - lasheader_test.cpp \ - lasspatialreference_test.cpp \ - laspoint_test.cpp \ - lasreader_iterator_test.cpp \ - lasreader_test.cpp \ - lasvariablerecord_test.cpp \ - laswriter_test.cpp \ - liblas_test_suite.cpp - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/unit/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu test/unit/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -liblas_test$(EXEEXT): $(liblas_test_OBJECTS) $(liblas_test_DEPENDENCIES) - @rm -f liblas_test$(EXEEXT) - $(CXXLINK) $(liblas_test_OBJECTS) $(liblas_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guid_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laserror_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasfile_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasheader_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laspoint_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasreader_iterator_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasreader_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasspatialreference_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lasvariablerecord_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laswriter_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblas_test_suite.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: